diff --git a/Android.bp b/Android.bp
index bf7b5d8df1e1f..938b18f3220b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -140,6 +140,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/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
index b16fdc4b4236e..4b29f71e07726 100644
--- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
+++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
@@ -3231,9 +3231,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/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
index 8694f9c8aa75e..28da5ddcf79f0 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -5559,7 +5559,7 @@ private void decrementAlarmCount(int uid, int decrement) {
             }
         }
         if (oldCount < decrement) {
-            Slog.wtf(TAG, "Attempt to decrement existing alarm count " + oldCount + " by "
+            Slog.w(TAG, "Attempt to decrement existing alarm count " + oldCount + " by "
                     + decrement + " for uid " + uid);
         }
     }
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/core/api/test-current.txt b/core/api/test-current.txt
index 33da82e21f43a..3e28164ed0843 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1749,7 +1749,9 @@ package android.hardware.display {
     ctor public AmbientDisplayConfiguration(android.content.Context);
     method public boolean alwaysOnAvailable();
     method public boolean alwaysOnAvailableForUser(int);
+    method public boolean alwaysOnChargingEnabledSetting(int);
     method public boolean alwaysOnEnabled(int);
+    method public boolean alwaysOnEnabledSetting(int);
     method public void disableDozeSettings(int);
     method public void disableDozeSettings(boolean, int);
     method public void restoreDozeSettings(int);
diff --git a/core/api/test-lint-baseline.txt b/core/api/test-lint-baseline.txt
index 8fb5905e8a554..60a9763dbdaf4 100644
--- a/core/api/test-lint-baseline.txt
+++ b/core/api/test-lint-baseline.txt
@@ -2045,6 +2045,10 @@ UnflaggedApi: android.content.pm.UserInfo#isPrivateProfile():
     New API must be flagged with @FlaggedApi: method android.content.pm.UserInfo.isPrivateProfile()
 UnflaggedApi: android.credentials.CredentialProviderInfo#isPrimary():
     New API must be flagged with @FlaggedApi: method android.credentials.CredentialProviderInfo.isPrimary()
+UnflaggedApi: android.hardware.display.AmbientDisplayConfiguration#alwaysOnChargingEnabledSetting(int):
+    New API must be flagged with @FlaggedApi: method android.hardware.display.AmbientDisplayConfiguration.alwaysOnChargingEnabledSetting(int)
+UnflaggedApi: android.hardware.display.AmbientDisplayConfiguration#alwaysOnEnabledSetting(int):
+    New API must be flagged with @FlaggedApi: method android.hardware.display.AmbientDisplayConfiguration.alwaysOnEnabledSetting(int)
 UnflaggedApi: android.hardware.input.InputManager#addUniqueIdAssociationByPort(String, String):
     New API must be flagged with @FlaggedApi: method android.hardware.input.InputManager.addUniqueIdAssociationByPort(String,String)
 UnflaggedApi: android.hardware.input.InputManager#removeUniqueIdAssociationByPort(String):
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 a54346bbbd2d4..e6d137749f6a8 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -247,6 +247,7 @@
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.FastPrintWriter;
 import com.android.internal.util.Preconditions;
+import com.android.internal.util.crdroid.FontController;
 import com.android.internal.util.function.pooled.PooledLambda;
 import com.android.org.conscrypt.TrustedCertificateStore;
 import com.android.server.am.MemInfoDumpProto;
@@ -287,6 +288,9 @@
 import java.util.Objects;
 import java.util.TimeZone;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
@@ -402,6 +406,19 @@ public final class ActivityThread extends ClientTransactionHandler
     @UnsupportedAppUsage
     final H mH = new H();
     final Executor mExecutor = new HandlerExecutor(mH);
+
+    /**
+    * A single thread executor is sufficient, as we don't need to parallelize
+    * dumps within the same process. Using a single thread ensures dumps
+    * are processed in the order they are received.
+    */
+    private static final ExecutorService sDumpExecutor = Executors.newSingleThreadExecutor(
+            new ThreadFactory() {
+                @Override
+                public Thread newThread(Runnable r) {
+                    return new Thread(r, "dump-thread");
+                }
+            });
     /**
      * Maps from activity token to local record of running activities in this process.
      *
@@ -1499,12 +1516,15 @@ public void dumpService(ParcelFileDescriptor pfd, IBinder servicetoken, String[]
                 data.fd = pfd.dup();
                 data.token = servicetoken;
                 data.args = args;
-                sendMessage(H.DUMP_SERVICE, data, 0, 0, true /*async*/);
             } catch (IOException e) {
                 Slog.w(TAG, "dumpService failed", e);
             } finally {
                 IoUtils.closeQuietly(pfd);
             }
+            // Submit the actual dump work to the dedicated executor.
+            sDumpExecutor.execute(() -> {
+                handleDumpService(data);
+            });
         }
 
         // This function exists to make sure all receiver dispatching is
@@ -1571,7 +1591,10 @@ public void dumpHeap(boolean managed, boolean mallocInfo, boolean runGc, String
                 IoUtils.closeQuietly(fd);
             }
             dhd.finishCallback = finishCallback;
-            sendMessage(H.DUMP_HEAP, dhd, 0, 0, true /*async*/);
+            // Submit the actual dump work to the dedicated executor.
+            sDumpExecutor.execute(() -> {
+                handleDumpHeap(dhd);
+            });
         }
 
         public void attachAgent(String agent) {
@@ -1612,12 +1635,15 @@ public void dumpResources(ParcelFileDescriptor fd, RemoteCallback callback) {
             try {
                 data.fd = fd.dup();
                 data.finishCallback = callback;
-                sendMessage(H.DUMP_RESOURCES, data, 0, 0, false /*async*/);
             } catch (IOException e) {
                 Slog.w(TAG, "dumpResources failed", e);
             } finally {
                 IoUtils.closeQuietly(fd);
             }
+            // Submit the actual dump work to the dedicated executor.
+            sDumpExecutor.execute(() -> {
+                handleDumpResources(data);
+            });
         }
 
         public void dumpActivity(ParcelFileDescriptor pfd, IBinder activitytoken,
@@ -1628,12 +1654,15 @@ public void dumpActivity(ParcelFileDescriptor pfd, IBinder activitytoken,
                 data.token = activitytoken;
                 data.prefix = prefix;
                 data.args = args;
-                sendMessage(H.DUMP_ACTIVITY, data, 0, 0, true /*async*/);
             } catch (IOException e) {
                 Slog.w(TAG, "dumpActivity failed", e);
             } finally {
                 IoUtils.closeQuietly(pfd);
             }
+            // Submit the actual dump work to the dedicated executor.
+            sDumpExecutor.execute(() -> {
+                handleDumpActivity(data);
+            });
         }
 
         public void dumpProvider(ParcelFileDescriptor pfd, IBinder providertoken,
@@ -1643,12 +1672,15 @@ public void dumpProvider(ParcelFileDescriptor pfd, IBinder providertoken,
                 data.fd = pfd.dup();
                 data.token = providertoken;
                 data.args = args;
-                sendMessage(H.DUMP_PROVIDER, data, 0, 0, true /*async*/);
             } catch (IOException e) {
                 Slog.w(TAG, "dumpProvider failed", e);
             } finally {
                 IoUtils.closeQuietly(pfd);
             }
+            // Submit the actual dump work to the dedicated executor.
+            sDumpExecutor.execute(() -> {
+                handleDumpProvider(data);
+            });
         }
 
         @NeverCompile
@@ -1995,12 +2027,15 @@ public void dumpGfxInfo(ParcelFileDescriptor pfd, String[] args) {
                 data.fd = pfd.dup();
                 data.token = null;
                 data.args = args;
-                sendMessage(H.DUMP_GFXINFO, data, 0, 0, true /*async*/);
             } catch (IOException e) {
                 Slog.w(TAG, "dumpGfxInfo failed", e);
             } finally {
                 IoUtils.closeQuietly(pfd);
             }
+            // Submit the actual dump work to the dedicated executor.
+            sDumpExecutor.execute(() -> {
+                handleDumpGfxInfo(data);
+            });
         }
 
         @Override
@@ -2434,7 +2469,6 @@ class H extends Handler {
         public static final int BIND_SERVICE            = 121;
         @UnsupportedAppUsage
         public static final int UNBIND_SERVICE          = 122;
-        public static final int DUMP_SERVICE            = 123;
         public static final int LOW_MEMORY              = 124;
         public static final int PROFILER_CONTROL        = 127;
         public static final int CREATE_BACKUP_AGENT     = 128;
@@ -2445,8 +2479,6 @@ class H extends Handler {
         public static final int DISPATCH_PACKAGE_BROADCAST = 133;
         @UnsupportedAppUsage
         public static final int SCHEDULE_CRASH          = 134;
-        public static final int DUMP_HEAP               = 135;
-        public static final int DUMP_ACTIVITY           = 136;
         public static final int SLEEPING                = 137;
         public static final int SET_CORE_SETTINGS       = 138;
         public static final int UPDATE_PACKAGE_COMPATIBILITY_INFO = 139;
@@ -2472,8 +2504,6 @@ class H extends Handler {
         public static final int ATTACH_STARTUP_AGENTS = 162;
         public static final int UPDATE_UI_TRANSLATION_STATE = 163;
         public static final int SET_CONTENT_CAPTURE_OPTIONS_CALLBACK = 164;
-        public static final int DUMP_GFXINFO = 165;
-        public static final int DUMP_RESOURCES = 166;
         public static final int TIMEOUT_SERVICE = 167;
         public static final int PING = 168;
 
@@ -2496,7 +2526,6 @@ String codeToString(int code) {
                     case GC_WHEN_IDLE: return "GC_WHEN_IDLE";
                     case BIND_SERVICE: return "BIND_SERVICE";
                     case UNBIND_SERVICE: return "UNBIND_SERVICE";
-                    case DUMP_SERVICE: return "DUMP_SERVICE";
                     case LOW_MEMORY: return "LOW_MEMORY";
                     case PROFILER_CONTROL: return "PROFILER_CONTROL";
                     case CREATE_BACKUP_AGENT: return "CREATE_BACKUP_AGENT";
@@ -2505,8 +2534,6 @@ String codeToString(int code) {
                     case REMOVE_PROVIDER: return "REMOVE_PROVIDER";
                     case DISPATCH_PACKAGE_BROADCAST: return "DISPATCH_PACKAGE_BROADCAST";
                     case SCHEDULE_CRASH: return "SCHEDULE_CRASH";
-                    case DUMP_HEAP: return "DUMP_HEAP";
-                    case DUMP_ACTIVITY: return "DUMP_ACTIVITY";
                     case SET_CORE_SETTINGS: return "SET_CORE_SETTINGS";
                     case UPDATE_PACKAGE_COMPATIBILITY_INFO:
                         return "UPDATE_PACKAGE_COMPATIBILITY_INFO";
@@ -2528,11 +2555,9 @@ String codeToString(int code) {
                     case UPDATE_UI_TRANSLATION_STATE: return "UPDATE_UI_TRANSLATION_STATE";
                     case SET_CONTENT_CAPTURE_OPTIONS_CALLBACK:
                         return "SET_CONTENT_CAPTURE_OPTIONS_CALLBACK";
-                    case DUMP_GFXINFO: return "DUMP GFXINFO";
                     case INSTRUMENT_WITHOUT_RESTART: return "INSTRUMENT_WITHOUT_RESTART";
                     case FINISH_INSTRUMENTATION_WITHOUT_RESTART:
                         return "FINISH_INSTRUMENTATION_WITHOUT_RESTART";
-                    case DUMP_RESOURCES: return "DUMP_RESOURCES";
                     case TIMEOUT_SERVICE: return "TIMEOUT_SERVICE";
                     case PING: return "PING";
                     case TIMEOUT_SERVICE_FOR_TYPE: return "TIMEOUT_SERVICE_FOR_TYPE";
@@ -2703,12 +2728,6 @@ public void handleMessage(Message msg) {
                         Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
                     }
                     break;
-                case DUMP_SERVICE:
-                    handleDumpService((DumpComponentInfo)msg.obj);
-                    break;
-                case DUMP_GFXINFO:
-                    handleDumpGfxInfo((DumpComponentInfo) msg.obj);
-                    break;
                 case LOW_MEMORY:
                     Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "lowMemory");
                     handleLowMemory();
@@ -2748,18 +2767,6 @@ public void handleMessage(Message msg) {
                     throwRemoteServiceException(message, msg.arg1, extras);
                     break;
                 }
-                case DUMP_HEAP:
-                    handleDumpHeap((DumpHeapData) msg.obj);
-                    break;
-                case DUMP_RESOURCES:
-                    handleDumpResources((DumpResourcesData) msg.obj);
-                    break;
-                case DUMP_ACTIVITY:
-                    handleDumpActivity((DumpComponentInfo)msg.obj);
-                    break;
-                case DUMP_PROVIDER:
-                    handleDumpProvider((DumpComponentInfo)msg.obj);
-                    break;
                 case SET_CORE_SETTINGS:
                     Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "setCoreSettings");
                     handleSetCoreSettings((Bundle) msg.obj);
@@ -4529,7 +4536,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);
@@ -5360,7 +5367,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),
@@ -5391,7 +5398,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),
@@ -5499,7 +5506,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());
@@ -6947,6 +6954,8 @@ public void handleConfigurationChanged(Configuration config, int deviceId) {
         mConfigurationController.handleConfigurationChanged(config);
         updateDeviceIdForNonUIContexts(deviceId);
 
+        FontController.OnConfigurationChanged(getApplication().getResources());
+
         // These are only done to maintain @UnsupportedAppUsage and should be removed someday.
         mCurDefaultDisplayDpi = mConfigurationController.getCurDefaultDisplayDpi();
         mConfiguration = mConfigurationController.getConfiguration();
@@ -7695,6 +7704,9 @@ private void handleBindApplication(AppBindData data) {
         data.info = getPackageInfo(data.appInfo, mCompatibilityInfo, null /* baseLoader */,
                 false /* securityViolation */, true /* includeCode */,
                 false /* registerPackage */, isSdkSandbox);
+
+        FontController.OnConfigurationChanged(data.info.getResources());
+
         if (isSdkSandbox) {
             data.info.setSdkSandboxStorage(data.sdkSandboxClientAppVolumeUuid,
                     data.sdkSandboxClientAppPackage);
@@ -8287,11 +8299,6 @@ public IContentProvider acquireProvider(
             }
         }
         if (holder == null) {
-            if (UserManager.get(c).isUserUnlocked(userId)) {
-                Slog.e(TAG, "Failed to find provider info for " + auth);
-            } else {
-                Slog.w(TAG, "Failed to find provider info for " + auth + " (user not unlocked)");
-            }
             return null;
         }
 
@@ -8828,7 +8835,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();
             }
@@ -8846,8 +8855,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/AppLockData.aidl b/core/java/android/app/AppLockData.aidl
new file mode 100644
index 0000000000000..073d1efd25055
--- /dev/null
+++ b/core/java/android/app/AppLockData.aidl
@@ -0,0 +1,19 @@
+/*
+ * 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 android.app;
+
+parcelable AppLockData;
\ No newline at end of file
diff --git a/core/java/android/app/AppLockData.java b/core/java/android/app/AppLockData.java
new file mode 100644
index 0000000000000..cb3352575c9cf
--- /dev/null
+++ b/core/java/android/app/AppLockData.java
@@ -0,0 +1,109 @@
+/*
+ * 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 android.app;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Class to hold package level information about an
+ * application for app lock.
+ *
+ * @hide
+ */
+public final class AppLockData implements Parcelable {
+
+    public static final Parcelable.Creator<AppLockData> CREATOR =
+            new Parcelable.Creator<AppLockData>() {
+
+        @Override
+        public AppLockData createFromParcel(Parcel in) {
+            return new AppLockData(in);
+        }
+
+        @Override
+        public AppLockData[] newArray(int size) {
+            return new AppLockData[size];
+        }
+    };
+
+    private final String mPackageName;
+    private final boolean mShouldProtectApp;
+    private final boolean mShouldRedactNotification;
+    private final boolean mHideFromLauncher;
+
+    /** @hide */
+    public AppLockData(
+        @NonNull final String packageName,
+        final boolean shouldProtectApp,
+        final boolean shouldRedactNotification,
+        final boolean hideFromLauncher
+    ) {
+        mPackageName = packageName;
+        mShouldProtectApp = shouldProtectApp;
+        mShouldRedactNotification = shouldRedactNotification;
+        mHideFromLauncher = hideFromLauncher;
+    }
+
+    private AppLockData(final Parcel in) {
+        mPackageName = in.readString();
+        mShouldProtectApp = in.readBoolean();
+        mShouldRedactNotification = in.readBoolean();
+        mHideFromLauncher = in.readBoolean();
+    }
+
+    @NonNull
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    public boolean getShouldProtectApp() {
+        return mShouldProtectApp;
+    }
+
+    public boolean getShouldRedactNotification() {
+        return mShouldRedactNotification;
+    }
+
+    public boolean getHideFromLauncher() {
+        return mHideFromLauncher;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(final Parcel parcel, final int flags) {
+        parcel.writeString(mPackageName);
+        parcel.writeBoolean(mShouldProtectApp);
+        parcel.writeBoolean(mShouldRedactNotification);
+        parcel.writeBoolean(mHideFromLauncher);
+    }
+
+    @Override
+    @NonNull
+    public String toString() {
+        return "AppLockData[ packageName = " + mPackageName +
+            ", shouldProtectApp = " + mShouldProtectApp +
+            ", shouldRedactNotification = " + mShouldRedactNotification +
+            ", hideFromLauncher = " + mHideFromLauncher + " ]";
+    }
+}
diff --git a/core/java/android/app/AppLockManager.java b/core/java/android/app/AppLockManager.java
new file mode 100644
index 0000000000000..2fecb7260380c
--- /dev/null
+++ b/core/java/android/app/AppLockManager.java
@@ -0,0 +1,281 @@
+/*
+ * 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 android.app;
+
+import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.annotation.SystemService;
+import android.annotation.RequiresPermission;
+import android.annotation.UserHandleAware;
+import android.content.Context;
+import android.os.RemoteException;
+
+import java.util.List;
+
+/**
+ * @hide
+ */
+@SystemService(Context.APP_LOCK_SERVICE)
+public final class AppLockManager {
+
+    /** @hide */
+    public static final long DEFAULT_TIMEOUT = 10 * 1000;
+
+    /** @hide */
+    public static final boolean DEFAULT_BIOMETRICS_ALLOWED = true;
+
+    /** @hide */
+    public static final boolean DEFAULT_PROTECT_APP = false;
+
+    /** @hide */
+    public static final boolean DEFAULT_REDACT_NOTIFICATION = false;
+
+    /** @hide */
+    public static final boolean DEFAULT_HIDE_IN_LAUNCHER = false;
+
+    /**
+     * Intent action for starting credential activity in SystemUI.
+     * @hide
+     */
+    public static final String ACTION_UNLOCK_APP = "android.app.action.UNLOCK_APP";
+
+    /**
+     * Intent extra to indicate whether usage of biometrics is allowed.
+     * @hide
+     */
+    public static final String EXTRA_ALLOW_BIOMETRICS = "android.app.AppLockManager.ALLOW_BIOMETRICS";
+
+    /**
+     * Intent extra for the name of the application to unlock.
+     * @hide
+     */
+    public static final String EXTRA_PACKAGE_LABEL = "android.app.AppLockManager.PACKAGE_LABEL";
+
+    private final Context mContext;
+    private final IAppLockManagerService mService;
+
+    /** @hide */
+    AppLockManager(Context context, IAppLockManagerService service) {
+        mContext = context;
+        mService = service;
+    }
+
+    /**
+     * Set whether app should be protected by app lock
+     * in locked state. Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param packageName the package name.
+     * @param shouldProtectApp true to hide notification content.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public void setShouldProtectApp(@NonNull String packageName, boolean shouldProtectApp) {
+        try {
+            mService.setShouldProtectApp(packageName, shouldProtectApp, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Get the current auto lock timeout.
+     *
+     * @param userId the user id given by the caller.
+     * @return the timeout in milliseconds if configuration for
+     *     current user exists, -1 otherwise.
+     * @hide
+     */
+    @UserHandleAware
+    public long getTimeout() {
+        try {
+            return mService.getTimeout(mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Set auto lock timeout.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param timeout the timeout in milliseconds. Must be >= 5.
+     * @param userId the user id given by the caller.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public void setTimeout(long timeout) {
+        try {
+            mService.setTimeout(timeout, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Get all the packages protected with app lock.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @return a unique list of {@link AppLockData} of the protected apps.
+     * @hide
+     */
+    @UserHandleAware
+    @NonNull
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public List<AppLockData> getPackageData() {
+        try {
+            return mService.getPackageData(mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Set whether notification content should be redacted for a package
+     * in locked state. Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param packageName the package name.
+     * @param shouldRedactNotification true to hide notification content.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public void setShouldRedactNotification(@NonNull String packageName, boolean shouldRedactNotification) {
+        try {
+            mService.setShouldRedactNotification(packageName, shouldRedactNotification, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Set whether to allow unlocking with biometrics.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param biometricsAllowed whether to use biometrics.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public void setBiometricsAllowed(boolean biometricsAllowed) {
+        try {
+            mService.setBiometricsAllowed(biometricsAllowed, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Check whether biometrics is allowed for unlocking.
+     *
+     * @return true if biometrics will be used for unlocking, false otherwise.
+     * @hide
+     */
+    @UserHandleAware
+    public boolean isBiometricsAllowed() {
+        try {
+            return mService.isBiometricsAllowed(mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Unlock a package following authentication with credentials.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param packageName the name of the package to unlock.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public void unlockPackage(@NonNull String packageName) {
+        try {
+            mService.unlockPackage(packageName, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Hide or unhide an application from launcher.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param packageName the name of the package to hide or unhide.
+     * @param hide whether to hide or not.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    public void setPackageHidden(@NonNull String packageName, boolean hide) {
+        try {
+            mService.setPackageHidden(packageName, hide, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Get the list of applications hidden from launcher.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @return list of package names of the hidden apps.
+     * @hide
+     */
+    @UserHandleAware
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    @NonNull
+    public List<String> getHiddenPackages() {
+        try {
+            return mService.getHiddenPackages(mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Check whether package is protected by app lock
+     *
+     * @return true if package is protected by app lock, false otherwise.
+     * @hide
+     */
+    @UserHandleAware
+    public boolean isPackageProtected(@NonNull String packageName) {
+        try {
+            return mService.isPackageProtected(packageName, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * Check whether package is hidden by app lock
+     *
+     * @return true if package is hidden by app lock, false otherwise.
+     * @hide
+     */
+    @UserHandleAware
+    public boolean isPackageHidden(@NonNull String packageName) {
+        try {
+            return mService.isPackageHidden(packageName, mContext.getUserId());
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+}
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 7c70daa8c3e8b..b42b34f2cb0fd 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -836,8 +836,115 @@ 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> PTENSOR_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_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(PTENSOR_CODENAMES,
+                "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.product.device");
+        IS_TENSOR_DEVICE = PTENSOR_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 = "com.google.android.apps.photos".equals(pkg)
+                && (Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.PI_PHOTOS_SPOOF, 1) == 1);
+            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) && !IS_TENSOR_DEVICE) {
+            return false;
+        }
+
+        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)
diff --git a/core/java/android/app/ConfigurationController.java b/core/java/android/app/ConfigurationController.java
index f491e3d274dba..c6a4d2ad321b4 100644
--- a/core/java/android/app/ConfigurationController.java
+++ b/core/java/android/app/ConfigurationController.java
@@ -231,7 +231,7 @@ private void handleConfigurationChangedInner(@Nullable Configuration config,
             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);
                 }
             }
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl
index 60be285dd2628..54ec1baf718c2 100644
--- a/core/java/android/app/IActivityManager.aidl
+++ b/core/java/android/app/IActivityManager.aidl
@@ -1042,4 +1042,18 @@ interface IActivityManager {
      */
     @EnforcePermission("INTERACT_ACROSS_USERS_FULL")
     IBinder refreshIntentCreatorToken(in Intent intent);
+
+    /**
+     *  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);
 }
diff --git a/core/java/android/app/IAppLockManagerService.aidl b/core/java/android/app/IAppLockManagerService.aidl
new file mode 100644
index 0000000000000..6e14f4c86f17f
--- /dev/null
+++ b/core/java/android/app/IAppLockManagerService.aidl
@@ -0,0 +1,50 @@
+/*
+ * 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 android.app;
+
+import android.app.AppLockData;
+
+/**
+ * Interface for managing app lock.
+ * @hide
+ */
+interface IAppLockManagerService {
+
+    void setShouldProtectApp(in String packageName, in boolean secure, in int userId);
+
+    long getTimeout(in int userId);
+
+    void setTimeout(in long timeout, in int userId);
+
+    List<AppLockData> getPackageData(in int userId);
+
+    void setShouldRedactNotification(in String packageName, in boolean secure, in int userId);
+
+    void setBiometricsAllowed(in boolean biometricsAllowed, in int userId);
+
+    boolean isBiometricsAllowed(in int userId);
+
+    void unlockPackage(in String packageName, in int userId);
+
+    void setPackageHidden(in String packageName, boolean hide, in int userId);
+
+    List<String> getHiddenPackages(in int userId);
+
+    boolean isPackageProtected(in String packageName, in int userId);
+
+    boolean isPackageHidden(in String packageName, in int userId);
+}
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index d90db96819aa3..47ccffea5e3f9 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -78,6 +78,8 @@
 import java.util.StringJoiner;
 import java.util.concurrent.TimeoutException;
 
+import com.android.internal.util.crdroid.PixelPropsUtils;
+
 /**
  * Base class for implementing application instrumentation code.  When running
  * with instrumentation turned on, this class will be instantiated for you
@@ -1349,6 +1351,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;
     }
     
@@ -1366,6 +1369,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/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 5bd84b03f1495..d9ac45c61b787 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -228,6 +228,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;
@@ -258,7 +260,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;
@@ -295,6 +296,7 @@
 import com.android.internal.policy.PhoneLayoutInflater;
 import com.android.internal.util.Preconditions;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -324,10 +326,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;
 
@@ -1060,6 +1062,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
@@ -1798,6 +1812,18 @@ public AdvancedProtectionManager createService(ContextImpl ctx)
                     });
         }
 
+        registerService(Context.APP_LOCK_SERVICE, AppLockManager.class,
+                new CachedServiceFetcher<AppLockManager>() {
+                    @Override
+                    public AppLockManager createService(ContextImpl ctx)
+                            throws ServiceNotFoundException {
+                        IBinder binder = ServiceManager.getServiceOrThrow(
+                                Context.APP_LOCK_SERVICE);
+                        return new AppLockManager(ctx,
+                            IAppLockManagerService.Stub.asInterface(binder));
+                    }
+                });
+
         // DO NOT do a flag check like this unless the flag is read-only.
         // (because this code is executed during preload in zygote.)
         // If the flag is mutable, the check should be inside CachedServiceFetcher.
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 64affb91bdac6..e4c864dcf4623 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -50,6 +50,7 @@
 import android.annotation.UserIdInt;
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.AppLockManager;
 import android.app.BroadcastOptions;
 import android.app.GameManager;
 import android.app.GrammaticalInflectionManager;
@@ -6704,6 +6705,24 @@ public final <T> T getSystemService(@NonNull Class<T> serviceClass) {
      */
     public static final String DISPLAY_HASH_SERVICE = "display_hash";
 
+    /**
+     * {@link AppLockManager}.
+     *
+     * @see #getSystemService(String)
+     * @hide
+     */
+    public static final String APP_LOCK_SERVICE = "app_lock";
+
+    /**
+     * 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}.
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 05bfcc9bb86ce..0d7c77b5ceeb0 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -4526,6 +4526,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/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 5db6de7c1f44b..6de3848d06d19 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;
     }
 
     /**
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index a5f4fcd7bb3fe..d9695dc1f2e61 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -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 656ad0001293b..11a4aec87cab3 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 */
@@ -502,11 +502,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 290bc10b64a65..7e556022f37f5 100644
--- a/core/java/android/content/res/StringBlock.java
+++ b/core/java/android/content/res/StringBlock.java
@@ -109,7 +109,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;
@@ -192,7 +192,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 e9122fc57629f..7bb9c7f618046 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -844,6 +844,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 +860,9 @@ public void endTransaction() {
         acquireReference();
         try {
             getThreadSession().endTransaction(null);
+        } catch (SQLiteDatabaseCorruptException ex) {
+            onCorruption();
+            throw ex;
         } finally {
             releaseReference();
         }
@@ -974,6 +980,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/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 322d16189f802..a3e2bb6e8a9ab 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -175,6 +175,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
@@ -206,6 +210,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
@@ -416,6 +431,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.
@@ -580,6 +606,10 @@ private int cameraInit(int cameraId, Context context, int rotationOverride) {
         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) {
@@ -1226,7 +1256,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;
@@ -1737,7 +1783,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);
                 }
@@ -1967,6 +2017,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;
     }
 
     /**
@@ -2091,6 +2158,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.
      *
@@ -2104,6 +2192,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.
      *
@@ -2368,6 +2607,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";
@@ -2415,6 +2658,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.
          */
@@ -2491,6 +2739,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
@@ -2533,6 +2789,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
@@ -2585,6 +2848,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
@@ -2621,11 +2889,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
@@ -3445,8 +3717,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);
@@ -3616,6 +3891,7 @@ public String getSceneMode() {
          * @see #getSceneMode()
          */
         public void setSceneMode(String value) {
+            if(getSupportedSceneModes() == null) return;
             set(KEY_SCENE_MODE, value);
         }
 
@@ -3653,6 +3929,7 @@ public String getFlashMode() {
          * @see #getFlashMode()
          */
         public void setFlashMode(String value) {
+	    if(getSupportedFlashModes() == null) return;
             set(KEY_FLASH_MODE, value);
         }
 
@@ -4337,6 +4614,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);
             }
         }
@@ -4407,7 +4685,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;
@@ -4433,7 +4711,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;
@@ -4470,5 +4748,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 57fb3a51328b8..8acfa018afbca 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -27,15 +27,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;
@@ -54,6 +59,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
@@ -143,6 +150,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) {
@@ -166,6 +177,12 @@ public SystemSensorManager(Context context, Looper mainLooper) {
             mFullSensorsList.add(sensor);
             mHandleToSensor.put(sensor.getHandle(), sensor);
         }
+
+        parsePackageList();
+
+        SettingsObserver observer = new SettingsObserver(
+                new Handler(mMainLooper));
+        observer.observe();
     }
 
     /** @hide */
@@ -238,6 +255,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,
@@ -255,6 +342,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<>();
@@ -336,6 +438,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 42ab4db96ae65..e99c3a3555c67 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -2540,8 +2540,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
@@ -2591,6 +2594,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>() {
@@ -2865,6 +2874,14 @@ public void setTorchMode(
                     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,
@@ -3288,6 +3305,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 ad55ec715272e..46fec6d0fdb14 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 063f5545dd71f..b8d9148338b02 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,11 +43,13 @@
  */
 @TestApi
 public class AmbientDisplayConfiguration {
-    private static final String TAG = "AmbientDisplayConfig";
+    private static final IntentFilter sIntentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+
     private final Context mContext;
     private final boolean mAlwaysOnByDefault;
     private final boolean mPickupGestureEnabledByDefault;
     private final boolean mScreenOffUdfpsAvailable;
+    private final boolean mDozeEnabledByDefault;
 
     /** Copied from android.provider.Settings.Secure since these keys are hidden. */
     private static final String[] DOZE_SETTINGS = {
@@ -55,7 +60,8 @@ public class AmbientDisplayConfiguration {
             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 */
@@ -74,6 +80,8 @@ public AmbientDisplayConfiguration(Context context) {
                 mContext.getResources().getBoolean(R.bool.config_dozePickupGestureEnabled);
         mScreenOffUdfpsAvailable =
                 mContext.getResources().getBoolean(R.bool.config_screen_off_udfps_enabled);
+        mDozeEnabledByDefault =
+                mContext.getResources().getBoolean(R.bool.config_doze_enabled_by_default);
     }
 
     /** @hide */
@@ -81,9 +89,14 @@ public boolean enabled(int user) {
         return pulseOnNotificationEnabled(user)
                 || pulseOnLongPressEnabled(user)
                 || alwaysOnEnabled(user)
+                || edgeLightEnabled(user)
+                || isAmbientTickerEnabled(user)
                 || wakeLockScreenGestureEnabled(user)
                 || wakeDisplayGestureEnabled(user)
                 || pickupGestureEnabled(user)
+                || tiltGestureEnabled(user)
+                || handwaveGestureEnabled(user)
+                || pocketGestureEnabled(user)
                 || tapGestureEnabled(user)
                 || doubleTapGestureEnabled(user)
                 || quickPickupSensorEnabled(user)
@@ -92,7 +105,7 @@ public boolean enabled(int user) {
 
     /** @hide */
     public boolean pulseOnNotificationEnabled(int user) {
-        return boolSettingDefaultOn(Settings.Secure.DOZE_ENABLED, user)
+        return boolSetting(Settings.Secure.DOZE_ENABLED, user, mDozeEnabledByDefault ? 1 : 0)
                 && pulseOnNotificationAvailable();
     }
 
@@ -102,6 +115,11 @@ public boolean pulseOnNotificationAvailable() {
                 && ambientDisplayAvailable();
     }
 
+    /** @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,
@@ -114,6 +132,40 @@ 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 boolSettingDefaultOn(Settings.Secure.DOZE_TAP_SCREEN_GESTURE, user)
@@ -151,11 +203,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 */
@@ -232,8 +283,36 @@ 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);
+    }
+
+    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);
+    }
+
+    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)) {
+            final Intent intent = mContext.registerReceiver(null, sIntentFilter, Context.RECEIVER_NOT_EXPORTED);
+            if (intent != null) {
+                int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+                boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
+                            status == BatteryManager.BATTERY_STATUS_FULL;
+                int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+                boolean isPlugged = plugged == BatteryManager.BATTERY_PLUGGED_AC || 
+                            plugged == BatteryManager.BATTERY_PLUGGED_USB ||
+                            plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
+                return isPlugged && isCharging;
+            }
+        }
+        return false;
     }
 
     /**
diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java
index f73bbdb55441d..6854d8726b866 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.ScreenCapture;
 
+import com.libremobileos.freeform.ILMOFreeformDisplayCallback;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
@@ -464,6 +468,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 8e782d1b190db..de3bf3107c939 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -437,6 +437,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/media/ImageReader.java b/core/java/android/media/ImageReader.java
index 530d48d3e60b0..76a6b1504a4eb 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;
 
@@ -901,7 +902,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/os/BaseBundle.java b/core/java/android/os/BaseBundle.java
index dd9e5697056c0..2e7a1aeaa061b 100644
--- a/core/java/android/os/BaseBundle.java
+++ b/core/java/android/os/BaseBundle.java
@@ -512,6 +512,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 b7b5af48e0353..421443c49c765 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/StrictMode.java b/core/java/android/os/StrictMode.java
index fe2be327a5a24..ca302c99c7463 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -1524,9 +1524,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,16 +1559,8 @@ public static void initVmDefaults(ApplicationInfo ai) {
             builder.penaltyDeathOnFileUriExposure();
         }
 
-        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)) {
@@ -2918,7 +2910,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/permission/PermissionUsageHelper.java b/core/java/android/permission/PermissionUsageHelper.java
index 11fa379f6eae3..868c28f417f81 100644
--- a/core/java/android/permission/PermissionUsageHelper.java
+++ b/core/java/android/permission/PermissionUsageHelper.java
@@ -56,6 +56,7 @@
 import android.os.UserHandle;
 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;
@@ -81,11 +82,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"
      */
@@ -101,9 +97,20 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
     private static final long DEFAULT_RUNNING_TIME_MS = 5000L;
     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);
+    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) {
@@ -116,6 +123,11 @@ private static long getRunningThreshold(Long now) {
                 RUNNING_ACCESS_TIME_MS, DEFAULT_RUNNING_TIME_MS);
     }
 
+    private static final List<String> LOCATION_OPS = List.of(
+            OPSTR_COARSE_LOCATION,
+            OPSTR_FINE_LOCATION
+    );
+
     private static final List<String> MIC_OPS = List.of(
             OPSTR_PHONE_CALL_MICROPHONE,
             OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO,
@@ -283,9 +295,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 (shouldShowLocationIndicator()) {
+            ops.addAll(LOCATION_OPS);
         }
 
         Map<String, List<OpUsage>> rawUsages = getOpUsagesByDevice(ops, deviceId);
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/Settings.java b/core/java/android/provider/Settings.java
index 082688c47e645..77529fc82feda 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.crdroid.DeviceConfigUtils;
+
 /**
  * The Settings provider contains global system-level device preferences.
  */
@@ -2993,6 +2995,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
 
     /**
@@ -5777,6 +5794,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.
@@ -5787,11 +5815,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.
          *
@@ -6598,59 +6641,803 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          * </ul>
          *  @hide
          */
-        public static final String SCREEN_FLASH_NOTIFICATION = "screen_flash_notification";
+        public static final String SCREEN_FLASH_NOTIFICATION = "screen_flash_notification";
+
+        /**
+         * Setting to enable CV (proprietary)
+         *
+         * @hide
+         */
+        public static final String CV_ENABLED =
+                "cv_enabled";
+
+        /**
+         * Setting to set enable/disable CV dynamic mode.
+         * Setting should be boolean (0 or 1)
+         *
+         * @hide
+         */
+        public static final String CV_DYNAMIC_ENABLED =
+                "cv_dynamic_enabled";
+
+        /**
+         * Setting to set CV preferred intensity
+         * Setting should be integer (0-10)
+         *
+         * @hide
+         */
+        public static final String CV_PREFERRED_INTENSITY = "cv_preferred_intensity";
+
+        /**
+         * Integer property that specifes the color for screen flash notification as a
+         * packed 32-bit color.
+         *
+         * @see android.graphics.Color#argb
+         * @hide
+         */
+        public static final String SCREEN_FLASH_NOTIFICATION_COLOR =
+                "screen_flash_notification_color_global";
+
+        /**
+         * Volume keys control cursor in text fields (default is 0)
+         * 0 - Disabled
+         * 1 - Volume up/down moves cursor left/right
+         * 2 - Volume up/down moves cursor right/left
+         * @hide
+         */
+        @Readable
+        public static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";
+
+        /**
+         * 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
+         * it to PRIVATE_SETTINGS below. Also add a validator that can validate
+         * the setting value. See an example above.
+         */
+
+        /**
+         * Whether the phone vibrates on call connect
+         * @hide
+         */
+        @Readable
+        public static final String VIBRATE_ON_CONNECT = "vibrate_on_connect";
+
+        /**
+         * Whether the phone vibrates on call waiting
+         * @hide
+         */
+        @Readable
+        public static final String VIBRATE_ON_CALLWAITING = "vibrate_on_callwaiting";
+
+        /**
+         * Whether the phone vibrates on disconnect
+         * @hide
+         */
+        @Readable
+        public static final String VIBRATE_ON_DISCONNECT = "vibrate_on_disconnect";
+
+        /**
+         * 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
+         */
+        @Readable
+        public static final String FLASHLIGHT_ON_CALL = "flashlight_on_call";
+
+        /**
+         * Whether flashlight_on_call ignores DND (Zen Mode)
+         * @hide
+         */
+        @Readable
+        public static final String FLASHLIGHT_ON_CALL_IGNORE_DND = "flashlight_on_call_ignore_dnd";
+
+        /**
+         * Rate in Hz in which to blink flashlight_on_call
+         * @hide
+         */
+        @Readable
+        public static final String FLASHLIGHT_ON_CALL_RATE = "flashlight_on_call_rate";
+
+        /**
+         * 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 RINGTONE_VIBRATION_PATTERN = "ringtone_vibration_pattern";
+
+        /**
+         * Custom vibration pattern
+         * format: ms,ms,ms each a range from 0 to 1000 ms
+         * @hide
+         */
+        @Readable
+        public static final String CUSTOM_RINGTONE_VIBRATION_PATTERN = "custom_ringtone_vibration_pattern";
+
+        /**
+         * Whether to show seconds next to clock in status bar
+         * 0 - hide (default)
+         * 1 - show
+         * @hide
+         */
+        public static final String STATUS_BAR_CLOCK_SECONDS = "status_bar_clock_seconds";
+
+        /**
+         * Shows custom date before clock time
+         * 0 - No Date
+         * 1 - Small Date
+         * 2 - Normal Date
+         * @hide
+         */
+        public static final String STATUS_BAR_CLOCK_DATE_DISPLAY = "status_bar_clock_date_display";
+
+        /**
+         * Sets the date string style
+         * 0 - Regular style
+         * 1 - Lowercase
+         * 2 - Uppercase
+         * @hide
+         */
+        public static final String STATUS_BAR_CLOCK_DATE_STYLE = "status_bar_clock_date_style";
+
+        /**
+         * Position of date
+         * 0 - Left of clock
+         * 1 - Right of clock
+         * @hide
+         */
+        public static final String STATUS_BAR_CLOCK_DATE_POSITION = "status_bar_clock_date_position";
+
+        /**
+         * Stores the java DateFormat string for the date
+         * @hide
+         */
+        public static final String STATUS_BAR_CLOCK_DATE_FORMAT = "status_bar_clock_date_format";
+
+        /**
+         * Statusbar clock background
+         * 0 - hide accented chip  (default)
+         * 1 - show accented chip
+         * @hide
+         */
+        public static final String STATUSBAR_CLOCK_CHIP = "statusbar_clock_chip";
+
+        /**
+         * Double tap on lockscreen to sleep
+         * @hide
+         */
+        public static final String DOUBLE_TAP_SLEEP_LOCKSCREEN = "double_tap_sleep_lockscreen";
+
+        /**
+         * Whether StatusBar icons should use app icon
+         * @hide
+         */
+        public static final String STATUSBAR_COLORED_ICONS = "statusbar_colored_icons";
+
+        /**
+         * Show the pending notification counts as overlays on the status bar
+         * @hide
+         */
+        public static final String STATUSBAR_NOTIF_COUNT = "statusbar_notif_count";
+
+        /**
+         * Whether to show the battery bar
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR = "statusbar_battery_bar";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_COLOR = "statusbar_battery_bar_color";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_THICKNESS =
+                "statusbar_battery_bar_thickness";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_STYLE = "statusbar_battery_bar_style";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_ANIMATE = "statusbar_battery_bar_animate";
+
+        /**
+         * @hide
+         */
+        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";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_ENABLE_CHARGING_COLOR =
+                "statusbar_battery_bar_enable_charging_color";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_BLEND_COLOR = "statusbar_battery_bar_blend_color";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_BLEND_COLOR_REVERSE =
+                "statusbar_battery_bar_blend_color_reverse";
+
+        /**
+         * Enable/disable Bluetooth Battery bar
+         * @hide
+         */
+        public static final String BLUETOOTH_SHOW_BATTERY = "bluetooth_show_battery";
+
+        /**
+         * Statusbar logo
+         * @hide
+         */
+        public static final String STATUS_BAR_LOGO = "status_bar_logo";
+
+        /**
+         * Position of Status bar logo
+         * 0 - Left (default)
+         * 1 - Right
+         * @hide
+         */
+        public static final String STATUS_BAR_LOGO_POSITION = "status_bar_logo_position";
+
+        /**
+         * Statusbar logo custom style
+         * @hide
+         */
+        public static final String STATUS_BAR_LOGO_STYLE = "status_bar_logo_style";
+
+        /**
+         * Network traffic indicator
+         * 0 = Disabled
+         * 1 = Enabled
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_ENABLED = "network_traffic_enabled";
+
+        /**
+         * Network traffic indicator mode
+         * 0 = Display both up- and down-stream traffic
+         * 1 = Display up-stream traffic only
+         * 2 = Display down-stream traffic only
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_MODE = "network_traffic_mode";
+
+        /**
+         * Whether or not to hide the network traffic indicator when there is no activity
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_AUTOHIDE = "network_traffic_autohide";
+
+        /**
+         * Threshold below which network traffic would be hidden
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD = "network_traffic_autohide_threshold";
+
+        /**
+         * Measurement unit preference for network traffic
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_UNITS = "network_traffic_units";
+
+        /**
+         * Specify refresh duration for network traffic
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_REFRESH_INTERVAL = "network_traffic_refresh_interval";
+
+        /**
+         * Whether to hide arrows for network traffic
+         * @hide
+         */
+        public static final String NETWORK_TRAFFIC_HIDEARROW = "network_traffic_hidearrow";
+
+        /**
+         * Whether to display cross sign for a data disabled connection
+         * @hide
+         */
+        public static final String DATA_DISABLED_ICON = "data_disabled_icon";
+
+        /**
+         * Whether to display 4G icon instead LTE
+         * @hide
+         */
+        public static final String SHOW_FOURG_ICON = "show_fourg_icon";
+
+        /**
+         * @hide
+         */
+        public static final String WIFI_STANDARD_ICON = "wifi_standard_icon";
+
+        /**
+         * Whether to control brightness from status bar
+         * 0 = 0ff, 1 = on
+         * @hide
+         */
+        public static final String STATUS_BAR_BRIGHTNESS_CONTROL = "status_bar_brightness_control";
+
+        /**
+         * @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 show Bluetooth dialog or toggle bluetooth using Bluetooth tile
+         * @hide
+         */
+        public static final String QS_BT_SHOW_DIALOG = "qs_bt_show_dialog";
+
+        /**
+         * 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";
+
+        /**
+         * @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";
+
+        /**
+         * @hide
+         */
+        public static final String UDFPS_ICON = "udfps_icon";
+
+        /**
+         * 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";
+
+        /**
+         * Whether to show the carrier name on the lockscreen
+         * @hide
+         */
+        public static final String LOCKSCREEN_SHOW_CARRIER = "lockscreen_show_carrier";
+
+        /**
+         * Disable hw buttons
+         * @hide
+         */
+        public static final String HARDWARE_KEYS_DISABLE = "hardware_keys_disable";
+
+        /**
+         * 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";
+
+        /**
+         * 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";
+
+        /**
+         * Customize Brightness slider shape.
+         * @hide
+         */
+        public static final String QS_BRIGHTNESS_SLIDER_SHAPE = "qs_brightness_slider_shape";
+
+        /**
+         * 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 AMBIENT_MEDIA_ART_ENABLED = "ambient_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";
+
+        /**
+         * 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";
+
+        /**
+         * 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";
+
+        /**
+         * GameSpace: List of added games by user
+         * @hide
+         */
+        @Readable
+        public static final String GAMESPACE_GAME_LIST = "gamespace_game_list";
+
+        /**
+         * GameSpace: Whether fullscreen intent will be suppressed while in game session
+         * @hide
+         */
+        @Readable
+        public static final String GAMESPACE_SUPPRESS_FULLSCREEN_INTENT = "gamespace_suppress_fullscreen_intent";
+
+        /**
+         * Current status of whether gestures are locked
+         * @hide
+         */
+        public static final String LOCK_GESTURE_STATUS = "lock_gesture_status";
+
+        /**
+         * 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";
+
+        /**
+         * 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";
+
+        /**
+         * 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";
+
+        /**
+         * Whether to enable Smart Pixels
+         * @hide
+         */
+        public static final String SMART_PIXELS_ENABLE = "smart_pixels_enable";
+
+        /**
+         * Smart Pixels pattern
+         * @hide
+         */
+        public static final String SMART_PIXELS_PATTERN = "smart_pixels_pattern";
+
+        /**
+         * Smart Pixels Shift Timeout
+         * @hide
+         */
+        public static final String SMART_PIXELS_SHIFT_TIMEOUT = "smart_pixels_shift_timeout";
 
         /**
-         * Setting to enable CV (proprietary)
-         *
+         * Whether Smart Pixels should enable on power saver mode
          * @hide
          */
-        public static final String CV_ENABLED =
-                "cv_enabled";
+        public static final String SMART_PIXELS_ON_POWER_SAVE = "smart_pixels_on_power_save";
 
         /**
-         * Setting to set enable/disable CV dynamic mode.
-         * Setting should be boolean (0 or 1)
-         *
+         * Defines the screen-off animation to display
          * @hide
          */
-        public static final String CV_DYNAMIC_ENABLED =
-                "cv_dynamic_enabled";
+        public static final String SCREEN_OFF_ANIMATION = "screen_off_animation";
 
         /**
-         * Setting to set CV preferred intensity
-         * Setting should be integer (0-10)
-         *
+         * Whether to show rotation suggestion
          * @hide
          */
-        public static final String CV_PREFERRED_INTENSITY = "cv_preferred_intensity";
+        @Readable
+        public static final String ENABLE_ROTATION_BUTTON = "enable_rotation_button";
 
         /**
-         * Integer property that specifes the color for screen flash notification as a
-         * packed 32-bit color.
-         *
-         * @see android.graphics.Color#argb
+         * Adaptive playback
+         * Automatically pause media when the volume is muted and
+         * will resume automatically when volume is restored.
+         *   0 = disabled
+         *   1 = enabled
          * @hide
          */
-        public static final String SCREEN_FLASH_NOTIFICATION_COLOR =
-                "screen_flash_notification_color_global";
+        public static final String ADAPTIVE_PLAYBACK_ENABLED = "adaptive_playback_enabled";
 
         /**
-         * Volume keys control cursor in text fields (default is 0)
-         * 0 - Disabled
-         * 1 - Volume up/down moves cursor left/right
-         * 2 - Volume up/down moves cursor right/left
+         * Adaptive playback's timeout in ms
          * @hide
          */
-        @Readable
-        public static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";
+        public static final String ADAPTIVE_PLAYBACK_TIMEOUT = "adaptive_playback_timeout";
 
         /**
-         * 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
-         * it to PRIVATE_SETTINGS below. Also add a validator that can validate
-         * the setting value. See an example above.
+         * @hide
          */
+        public static final String SCREENSHOT_SHUTTER_SOUND = "screenshot_shutter_sound";
 
         /**
          * Keys we no longer back up under the current schema, but want to continue to
@@ -6700,6 +7487,7 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
             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);
@@ -6827,6 +7615,7 @@ public static void getCloneToManagedProfileSettings(Set<String> outKeySet) {
         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);
         }
@@ -10557,6 +11346,28 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
         @Readable
         public static final String DOZE_ALWAYS_ON = "doze_always_on";
 
+        /**
+         * 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
+         */
+        @Readable
+        public static final String DOZE_ALWAYS_ON_AUTO_MODE = "doze_always_on_auto_mode";
+
+        /**
+         * 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
+         */
+        @Readable
+        public static final String DOZE_ALWAYS_ON_AUTO_TIME = "doze_always_on_auto_time";
+
         /**
          * Indicates whether ambient wallpaper is visible with AOD.
          * <p>
@@ -10564,6 +11375,7 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
          *
          * @hide
          */
+        @Readable
         public static final String DOZE_ALWAYS_ON_WALLPAPER_ENABLED =
                 "doze_always_on_wallpaper_enabled";
 
@@ -10572,7 +11384,7 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
          * @hide
          */
         @Readable
-        public static final String DOZE_PICK_UP_GESTURE = "doze_pulse_on_pick_up";
+        public static final String DOZE_PICK_UP_GESTURE = "doze_pick_up_gesture";
 
         /**
          * Whether the device should pulse on long press gesture.
@@ -10624,6 +11436,36 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
         @Readable
         public static final String SUPPRESS_DOZE = "suppress_doze";
 
+        /**
+         * Pulse notifications on tilt
+         * @hide
+         */
+        public static final String DOZE_TILT_GESTURE = "doze_tilt_gesture";
+
+        /**
+         * Pulse notifications on hand wave
+         * @hide
+         */
+        public static final String DOZE_HANDWAVE_GESTURE = "doze_handwave_gesture";
+
+        /**
+         * Pulse notifications on removal from pocket
+         * @hide
+         */
+        public static final String DOZE_POCKET_GESTURE = "doze_pocket_gesture";
+
+        /**
+         * Wake up instead of pulsing notifications
+         * @hide
+         */
+        public static final String RAISE_TO_WAKE_GESTURE = "raise_to_wake_gesture";
+
+        /**
+         * Vibrate when pulsing notifications on gesture
+         * @hide
+         */
+        public static final String DOZE_GESTURE_VIBRATE = "doze_gesture_vibrate";
+
         /**
          * Gesture that skips media.
          * @hide
@@ -12538,9 +13380,15 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
          */
         public static final String VOLUME_DIALOG_DISMISS_TIMEOUT = "volume_dialog_dismiss_timeout";
 
+        /**
+         * Volume dialog haptic feedback
+         * @hide
+         */
+        public static final String VOLUME_DIALOG_HAPTIC_FEEDBACK = "volume_dialog_haptic_feedback";
+
         /**
          * What behavior should be invoked when the volume hush gesture is triggered
-         * One of VOLUME_HUSH_OFF, VOLUME_HUSH_VIBRATE, VOLUME_HUSH_MUTE.
+         * One of VOLUME_HUSH_OFF, VOLUME_HUSH_VIBRATE, VOLUME_HUSH_MUTE, VOLUME_HUSH_CYCLE.
          *
          * @hide
          */
@@ -12557,6 +13405,8 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
         /** @hide */
         @SystemApi
         public static final int VOLUME_HUSH_MUTE = 2;
+        /** @hide */
+        public static final int VOLUME_HUSH_CYCLE = 3;
 
         /**
          * The number of times (integer) the user has manually enabled battery saver.
@@ -13231,6 +14081,229 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
         public static final String HBM_SETTING_KEY =
                 "com.android.server.display.HBM_SETTING_KEY";
 
+        /**
+         * User selectable keybox data.
+         * @hide
+         */
+        @Readable
+        public static final String KEYBOX_DATA = "keybox_data";
+
+        /**
+         * Store vboot key.
+         * @hide
+         */
+        @Readable
+        public static final String VBOOT_KEY = "vboot_key";
+
+        /**
+         * Store vboot hash.
+         * @hide
+         */
+        @Readable
+        public static final String VBOOT_HASH = "vboot_hash";
+
+        /**
+         * Whether to use PIF spoof for google apps
+         * @hide
+         */
+        @Readable
+        public static final String PI_ENABLE_SPOOF = "pi_enable_spoof";
+
+        /**
+         * Whether to disable GMS cert chain with custom keybox
+         * @hide
+         */
+        @Readable
+        public static final String PI_GMS_CERT_CHAIN = "pi_gms_cert_chain";
+
+        /**
+         * Whether to use PIF spoof for games
+         * @hide
+         */
+        @Readable
+        public static final String PI_GAMES_SPOOF = "pi_games_spoof";
+
+        /**
+         * Whether to use PIF spoof for photos
+         * @hide
+         */
+        @Readable
+        public static final String PI_PHOTOS_SPOOF = "pi_photos_spoof";
+
+        /**
+         * Whether to use PIF spoof for netflix
+         * @hide
+         */
+        @Readable
+        public static final String PI_NETFLIX_SPOOF = "pi_netflix_spoof";
+
+        /**
+         * Whether to show privacy indicator for location
+         * @hide
+         */
+        public static final String ENABLE_LOCATION_PRIVACY_INDICATOR = "enable_location_privacy_indicator";
+
+        /**
+         * Whether to show privacy indicator for camera
+         * @hide
+         */
+        public static final String ENABLE_CAMERA_PRIVACY_INDICATOR = "enable_camera_privacy_indicator";
+
+        /**
+         * Whether to show privacy indicator for media projection
+         * @hide
+         */
+        public static final String ENABLE_PROJECTION_PRIVACY_INDICATOR = "enable_projection_privacy_indicator";
+
+        /**
+         * Whether to allow swipe down on lockscreen to view Quick Panel
+         * @hide
+         */
+        public static final String ENABLE_LOCKSCREEN_QUICK_SETTINGS = "enable_lockscreen_quick_settings";
+
+        /**
+         * Pulse lockscreen music visualizer
+         * @hide
+         */
+        public static final String LOCKSCREEN_PULSE_ENABLED = "lockscreen_pulse_enabled";
+
+        /**
+         * Pulse lockscreen music visualizer on ambient display
+         * @hide
+         */
+        public static final String AMBIENT_PULSE_ENABLED = "ambient_pulse_enabled";
+
+        /**
+         * @hide
+         */
+        public static final String PULSE_BAR_COUNT = "pulse_bar_count";
+
+        /**
+         * @hide
+         */
+        public static final String PULSE_ROUNDED_BARS = "pulse_rounded_bars";
+
+        /**
+         * @hide
+         */
+        public static final String PULSE_COLOR = "pulse_color";
+
+        /**
+         * @hide
+         */
+        public static final String PULSE_RENDERER = "pulse_renderer";
+
+        /**
+         * Inverse navigation bar layout
+         * @hide
+         */
+        public static final String NAVBAR_INVERSE_LAYOUT = "navbar_inverse_layout";
+
+        /**
+         * Whether to show or hide the arrow for back gesture
+         * @hide
+         */
+        public static final String BACK_GESTURE_ARROW = "back_gesture_arrow";
+
+        /**
+         * Whether or not to vibrate when back gesture is used
+         * @hide
+         */
+        public static final String BACK_GESTURE_HAPTIC = "back_gesture_haptic";
+
+        /**
+         * Which navigation bar layout to use
+         * 0 = Normal (Default)
+         * 1 = Compact
+         * 2 = Left-leaning
+         * 3 = Right-leaning
+         * @hide
+         */
+        public static final String NAVBAR_LAYOUT_MODE = "navbar_layout_mode";
+
+        /**
+         * Show navigation space below IME
+         * @hide
+         */
+        public static final String NAVBAR_IME_SPACE = "navbar_ime_space";
+
+        /**
+         * Our GameSpace can't write to device_config directly [GTS]
+         * Use this as intermediate to pass device_config property
+         * from our GameSpace to com.android.server.app.GameManagerService
+         * so we can set the device_config property from there.
+         * @hide
+         */
+        public static final String GAME_OVERLAY = "game_overlay";
+
+        /**
+         * Whether to show an overlay in the bottom corner of the screen on copying stuff
+         * into the clipboard.
+         * @hide
+         */
+        public static final String SHOW_CLIPBOARD_OVERLAY = "show_clipboard_overlay";
+
+        /**
+         * Whether to enable DOZE only when charging
+         * @hide
+         */
+        public static final String DOZE_ON_CHARGE = "doze_on_charge";
+
+        /**
+         * Whether to pulse ambient on new music tracks
+         * @hide
+         */
+        public static final String PULSE_ON_NEW_TRACKS = "pulse_on_new_tracks";
+
+        /**
+         * Whether to show media squiggle animation
+         * @hide
+         */
+        public static final String MEDIA_SQUIGGLE_ANIMATION = "media_squiggle_animation";
+
+        /**
+         * Control whether the process CPU info meter should be shown.
+         * @hide
+         */
+        public static final String SHOW_CPU_OVERLAY = "show_cpu_overlay";
+
+        /**
+         * Control whether the process FPS info meter should be shown.
+         * @hide
+         */
+        public static final String SHOW_FPS_OVERLAY = "show_fps_overlay";
+
+        /**
+         * Whether to enable clipboard auto clear
+         * @hide
+         */
+        public static final String CLIPBOARD_AUTO_CLEAR_ENABLED = "clipboard_auto_clear_enabled";
+
+        /**
+         * Timeout length for clipboard auto clear
+         * @hide
+         */
+        public static final String CLIPBOARD_AUTO_CLEAR_TIMEOUT = "clipboard_auto_clear_timeout";
+
+        /**
+         * 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 VPN_ENFORCE_DNS = "vpn_enforce_dns";
+
+        /**
+         * 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 VPN_ENFORCE_DNS_STORE = "vpn_enforce_dns_store";
+
         /**
          * Keys we no longer back up under the current schema, but want to continue to
          * process when restoring historical backup datasets.
@@ -13518,11 +14591,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
@@ -13745,6 +14817,7 @@ public static void setLocationProviderEnabled(ContentResolver cr,
          *
          * @hide
          */
+        @Readable
         public static final String CHARGE_OPTIMIZATION_MODE = "charge_optimization_mode";
 
         /**
@@ -17404,6 +18477,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.
          */
@@ -19030,6 +20127,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.
@@ -20239,6 +21362,12 @@ public static boolean putFloat(ContentResolver cr, String name, float value) {
          */
         public static final String RESTRICTED_NETWORKING_MODE = "restricted_networking_mode";
 
+        /**
+         * Control whether application downgrade is allowed.
+         * @hide
+         */
+        public static final String PM_DOWNGRADE_ALLOWED = "pm_downgrade_allowed";
+
         /**
          * Setting indicating whether Low Power Standby is enabled, if supported.
          *
@@ -21635,6 +22764,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(),
@@ -21656,7 +22788,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;
         }
 
         /**
@@ -21706,6 +22840,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());
@@ -21747,6 +22884,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);
         }
 
         /**
diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java
index 79957f4115973..949959861dec2 100644
--- a/core/java/android/service/notification/StatusBarNotification.java
+++ b/core/java/android/service/notification/StatusBarNotification.java
@@ -86,10 +86,13 @@ public class StatusBarNotification implements Parcelable {
     private final Map<Integer, Context> mContextForDisplayId =
             Collections.synchronizedMap(new ArrayMap<>());
 
+    private boolean mIsContentSecure;
+
     /** @hide */
     public StatusBarNotification(String pkg, String opPkg, int id,
             String tag, int uid, int initialPid, Notification notification, UserHandle user,
-            String overrideGroupKey, long postTime) {
+            String overrideGroupKey, long postTime,
+            boolean isContentSecure) {
         if (pkg == null) throw new NullPointerException();
         if (notification == null) throw new NullPointerException();
 
@@ -105,6 +108,7 @@ public StatusBarNotification(String pkg, String opPkg, int id,
         this.overrideGroupKey = overrideGroupKey;
         this.key = key();
         this.groupKey = groupKey();
+        mIsContentSecure = isContentSecure;
     }
 
     /**
@@ -152,6 +156,7 @@ public StatusBarNotification(Parcel in) {
         }
         this.key = key();
         this.groupKey = groupKey();
+        mIsContentSecure = in.readBoolean();
     }
 
     /**
@@ -256,6 +261,7 @@ public void writeToParcel(Parcel out, int flags) {
         } else {
             out.writeInt(0);
         }
+        out.writeBoolean(mIsContentSecure);
     }
 
     public int describeContents() {
@@ -297,7 +303,8 @@ public StatusBarNotification clone() {
     public StatusBarNotification cloneShallow(Notification notification) {
         StatusBarNotification result = new StatusBarNotification(this.pkg, this.opPkg,
                 this.id, this.tag, this.uid, this.initialPid,
-                notification, this.user, this.overrideGroupKey, this.postTime);
+                notification, this.user, this.overrideGroupKey,
+                this.postTime, mIsContentSecure);
         result.setInstanceId(this.mInstanceId);
         return result;
     }
@@ -606,4 +613,24 @@ private String shortenTag(String logTag) {
         return logTag.substring(0, MAX_LOG_TAG_LENGTH - hash.length() - 1) + "-"
                 + hash;
     }
+
+    /**
+     * Set whether the notification content is secure.
+     *
+     * @param isContentSecure whether the content is secure.
+     * @hide
+     */
+    public void setIsContentSecure(boolean isContentSecure) {
+        mIsContentSecure = isContentSecure;
+    }
+
+    /**
+     * Check whether the notification content is secure.
+     *
+     * @return true if content is secure, false otherwise.
+     * @hide
+     */
+    public boolean getIsContentSecure() {
+        return mIsContentSecure;
+    }
 }
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 9554d257730aa..98cabc7accac7 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -566,7 +566,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/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/view/InputDevice.java b/core/java/android/view/InputDevice.java
index 25eb9be3c5d9a..57384b47207a0 100644
--- a/core/java/android/view/InputDevice.java
+++ b/core/java/android/view/InputDevice.java
@@ -354,6 +354,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 fbe983368b2e1..d90542c5ebbed 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/LayoutInflater.java b/core/java/android/view/LayoutInflater.java
index 333fd537a6f3f..a58680ea408e9 100644
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -689,67 +689,80 @@ 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;
+            try {
+                view = tryCreateViewDirect(prefixedName, viewContext, attrs);
+            } catch (Exception e) {
+                view = null;
+            }
+            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 +1257,62 @@ 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);
+        }
+
+        return null;
+    }
 }
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 1c6bd4268ca29..4dde26ebc11e3 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -23133,6 +23133,11 @@ protected void onDetachedFromWindowInternal() {
         cleanupDraw();
         mCurrentAnimation = null;
 
+        if (mScrollCache != null && mScrollCache.state == ScrollabilityCache.ON
+                && mAttachInfo != null) {
+            mAttachInfo.mHandler.removeCallbacks(mScrollCache);
+        }
+
         if ((mViewFlags & TOOLTIP) == TOOLTIP) {
             removeCallbacks(mTooltipInfo.mShowTooltipRunnable);
             removeCallbacks(mTooltipInfo.mHideTooltipRunnable);
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index 0d01a2b602946..35c01ddb6d9b6 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -274,7 +274,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.009f;
 
     /**
      * Max distance in dips to overscroll for edge effects
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 802573733d22b..23a66e97a990d 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2923,7 +2923,7 @@ private void resetTouchState() {
      * Returns true if the flag was previously set.
      */
     private static boolean resetCancelNextUpFlag(@NonNull View view) {
-        if ((view.mPrivateFlags & PFLAG_CANCEL_NEXT_UP_EVENT) != 0) {
+        if (view != null && (view.mPrivateFlags & PFLAG_CANCEL_NEXT_UP_EVENT) != 0) {
             view.mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT;
             return true;
         }
@@ -4324,6 +4324,12 @@ protected void dispatchDraw(@NonNull Canvas canvas) {
 
             final int childIndex = getAndVerifyPreorderedIndex(childrenCount, i, customOrder);
             final View child = getAndVerifyPreorderedView(preorderedList, children, childIndex);
+            if (child == null) {
+                Log.e(View.VIEW_LOG_TAG, "dispatchDraw: child view is null"
+                        + " curIndex=" + i + ", pkg =" +  mContext.getPackageName()
+                        + " mChildrenCount=" + mChildrenCount);
+                return;
+            }
             if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE || child.getAnimation() != null) {
                 more |= drawChild(canvas, child, drawingTime);
             }
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 40d6318c831f9..484a7a1a288a4 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -106,8 +106,14 @@
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
 import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
+import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;
 import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL;
 import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
 import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
 import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
 import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS;
@@ -313,6 +319,7 @@
 import java.util.Objects;
 import java.util.OptionalInt;
 import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -352,6 +359,19 @@ public final class ViewRootImpl implements ViewParent,
     private static final int LOGTAG_INPUT_FOCUS = 62001;
     private static final int LOGTAG_VIEWROOT_DRAW_EVENT = 60004;
 
+    private static final Set<Integer> NO_VOTE_WINDOW_TYPES = Set.of(
+        TYPE_INPUT_METHOD,
+        TYPE_INPUT_METHOD_DIALOG,
+        TYPE_KEYGUARD_DIALOG,
+        TYPE_NAVIGATION_BAR,
+        TYPE_NAVIGATION_BAR_PANEL,
+        TYPE_STATUS_BAR,
+        TYPE_SYSTEM_ALERT,
+        TYPE_SYSTEM_DIALOG,
+        TYPE_TOAST,
+        TYPE_VOLUME_OVERLAY
+    );
+
     /**
      * This change disables the {@code DRAW_WAKE_LOCK}, an internal wakelock acquired per-frame
      * duration display DOZE. It was added to allow animation during AOD. This wakelock consumes
@@ -921,7 +941,7 @@ default void onConfigurationChanged(@NonNull Configuration overrideConfig,
     int mLastTouchPointerId;
     /** Tracks last {@link MotionEvent#getToolType(int)} with {@link MotionEvent#ACTION_UP}. **/
     private int mLastClickToolType;
-
+    private CharSequence mLastBackKeyDownTitle;
     private boolean mProfileRendering;
     private Choreographer.FrameCallback mRenderProfiler;
     private boolean mRenderProfilingEnabled;
@@ -3512,6 +3532,10 @@ int dipToPx(int dip) {
         return (int) (displayMetrics.density * dip + 0.5f);
     }
 
+    private boolean isNoVoteWindowType() {
+        return NO_VOTE_WINDOW_TYPES.contains(mWindowAttributes.type);
+    }
+
     private void performTraversals() {
         mLastPerformTraversalsSkipDrawReason = null;
 
@@ -3860,9 +3884,7 @@ private void performTraversals() {
                     if (surfaceControlChanged && mDisplayDecorationCached) {
                         updateDisplayDecoration();
                     }
-                    if (surfaceControlChanged
-                            && mWindowAttributes.type
-                            == WindowManager.LayoutParams.TYPE_STATUS_BAR) {
+                    if (surfaceControlChanged && isNoVoteWindowType()) {
                         mTransaction.setDefaultFrameRateCompatibility(mSurfaceControl,
                             Surface.FRAME_RATE_COMPATIBILITY_NO_VOTE).apply();
                     }
@@ -7752,12 +7774,14 @@ private int doOnBackKeyEvent(KeyEvent keyEvent) {
                 }
             } else if (topCallback != null) {
                 if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
-                    if (!keyEvent.isCanceled()) {
+                    if (!keyEvent.isCanceled() && getTitle()!= null && getTitle().equals(mLastBackKeyDownTitle)) {
                         dispatcher.tryInvokeSystemNavigationObserverCallback();
                         topCallback.onBackInvoked();
                     } else {
                         Log.d(mTag, "Skip onBackInvoked(), reason: keyEvent.isCanceled=true");
                     }
+                } else {
+                    mLastBackKeyDownTitle = getTitle();
                 }
             }
             // Do not cancel the keyEvent if no callback can handle the back event.
@@ -7909,6 +7933,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);
@@ -8391,7 +8420,6 @@ private boolean updatePointerIcon(MotionEvent event) {
         }
         if (x < 0 || x >= mView.getWidth() || y < 0 || y >= mView.getHeight()) {
             // E.g. when moving window divider with mouse
-            Slog.d(mTag, "updatePointerIcon called with position out of bounds");
             return false;
         }
 
@@ -13713,4 +13741,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/animation/AnimationUtils.java b/core/java/android/view/animation/AnimationUtils.java
index 8a407c3252f0c..f2d49ffc7d253 100644
--- a/core/java/android/view/animation/AnimationUtils.java
+++ b/core/java/android/view/animation/AnimationUtils.java
@@ -103,9 +103,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;
     }
 
     /**
@@ -150,7 +148,9 @@ public static void lockAnimationClock(long vsyncMillis) {
      */
     @TestApi
     public static void unlockAnimationClock() {
-        sAnimationState.get().animationClockLocked = false;
+        AnimationState state = sAnimationState.get();
+        state.animationClockLocked = false;
+        state.mExpectedPresentationTimeNanos = 0L;
     }
 
     /**
@@ -185,11 +185,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();
     }
 
     /**
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index a5cc414fa2c68..ebd5b136304b9 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -3336,6 +3336,7 @@ private boolean startInputInner(@StartInputReason int startInputReason,
             @SoftInputModeFlags int softInputMode,
             @WindowManager.LayoutParams.Flags int windowFlags) {
         final View view;
+        final ViewRootImpl viewRoot;
         synchronized (mH) {
             view = getServedViewLocked();
 
@@ -3374,13 +3375,14 @@ private boolean startInputInner(@StartInputReason int startInputReason,
 
         if (windowGainingFocus == null) {
             windowGainingFocus = view.getWindowToken();
-            if (windowGainingFocus == null) {
+            viewRoot = view.getViewRootImpl();
+            if (windowGainingFocus == null && viewRoot == null) {
                 Log.e(TAG, "ABORT input: ServedView must be attached to a Window");
                 return false;
             }
             startInputFlags = getStartInputFlags(view, startInputFlags);
-            softInputMode = view.getViewRootImpl().mWindowAttributes.softInputMode;
-            windowFlags = view.getViewRootImpl().mWindowAttributes.flags;
+            softInputMode = viewRoot.mWindowAttributes.softInputMode;
+            windowFlags = viewRoot.mWindowAttributes.flags;
         }
 
         // Okay we are now ready to call into the served view and have it
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index dcacebd7feb72..5bf25d4c6a837 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -699,6 +699,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];
@@ -1015,6 +1016,7 @@ private void initAbsListView() {
         mVerticalScrollFactor = configuration.getScaledVerticalScrollFactor();
         mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
         mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
+        mDecacheThreshold = mMaximumVelocity / 2;
         mOverscrollDistance = configuration.getScaledOverscrollDistance();
         mOverflingDistance = configuration.getScaledOverflingDistance();
 
@@ -4255,6 +4257,10 @@ private void onTouchUp(MotionEvent ev) {
                                     }
                                     mSelector.setHotspot(x, ev.getY());
                                 }
+                                if (!mDataChanged && !mIsDetaching
+                                        && isAttachedToWindow()) {
+                                    performClick.run();
+                                }
                                 if (mTouchModeReset != null) {
                                     removeCallbacks(mTouchModeReset);
                                 }
@@ -4265,10 +4271,6 @@ public void run() {
                                         mTouchMode = TOUCH_MODE_REST;
                                         child.setPressed(false);
                                         setPressed(false);
-                                        if (!mDataChanged && !mIsDetaching
-                                                && isAttachedToWindow()) {
-                                            performClick.run();
-                                        }
                                     }
                                 };
                                 postDelayed(mTouchModeReset,
@@ -4969,7 +4971,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);
                 }
@@ -4989,6 +4991,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);
@@ -5069,6 +5076,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);
@@ -5077,7 +5088,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/ListView.java b/core/java/android/widget/ListView.java
index a328c78f37386..be5cec9beaca6 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -264,8 +264,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/OverScroller.java b/core/java/android/widget/OverScroller.java
index df209fb876bab..6afe6248addeb 100644
--- a/core/java/android/widget/OverScroller.java
+++ b/core/java/android/widget/OverScroller.java
@@ -541,6 +541,9 @@ static class SplineOverScroller {
         // Current position
         private int mCurrentPosition;
 
+        // last frame position
+        private int mLastPosition;
+
         // Final position
         private int mFinal;
 
@@ -912,7 +915,7 @@ boolean update() {
             final long time = AnimationUtils.currentAnimationTimeMillis();
             final long currentTime = time - mStartTime;
 
-            if (currentTime == 0) {
+            if (currentTime <= 0) {
                 // Skip work but report that we're still going if we have a nonzero duration.
                 return mDuration > 0;
             }
@@ -959,7 +962,16 @@ boolean update() {
             }
 
             mCurrentPosition = mStart + (int) Math.round(distance);
-
+            int deltaDistance = mCurrentPosition - mLastPosition;
+            if (!mFinished && deltaDistance == 0) {
+                int direction = mFinal > mStart ? 1 : -1;
+                mCurrentPosition += direction;
+                if ((direction > 0 && mCurrentPosition > mFinal) ||
+                    (direction < 0 && mCurrentPosition < mFinal)) {
+                    mCurrentPosition = mFinal;
+                }
+            }
+            mLastPosition = mCurrentPosition;
             return true;
         }
     }
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 e0e9e0b471d5f..35b7f01c6c084 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -869,6 +869,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;
@@ -4378,6 +4379,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:
@@ -4390,6 +4392,7 @@ private void readTextAppearance(Context context, TypedArray appearance,
                     }
                     if (attributes.mFontTypeface == null) {
                         attributes.mFontFamily = appearance.getString(attr);
+                        mFontFamily = attributes.mFontFamily;
                     }
                     attributes.mFontFamilyExplicit = true;
                     break;
@@ -4485,6 +4488,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);
@@ -4518,6 +4522,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,
@@ -4659,6 +4667,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/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/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
index f06d2004bbbf0..204498d55c4ad 100644
--- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
+++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
@@ -132,6 +132,11 @@ public final class SystemUiDeviceConfigFlags {
      */
     public static final String PROPERTY_MIC_CAMERA_ENABLED = "camera_mic_icons_enabled";
 
+    /**
+     * Whether to show app ops chip for location.
+     */
+    public static final String PROPERTY_LOCATION_INDICATORS_ENABLED = "location_indicators_enabled";
+
     /**
      * Whether to show privacy chip for media projection.
      */
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/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/PowerStats.java b/core/java/com/android/internal/os/PowerStats.java
index 6c69e2c623ad4..01e3cbded9d0d 100644
--- a/core/java/com/android/internal/os/PowerStats.java
+++ b/core/java/com/android/internal/os/PowerStats.java
@@ -52,12 +52,12 @@ public final class PowerStats {
 
     private static final BatteryStatsHistory.VarintParceler VARINT_PARCELER =
             new BatteryStatsHistory.VarintParceler();
-    private static final byte PARCEL_FORMAT_VERSION = 2;
+    private static final byte PARCEL_FORMAT_VERSION = 3;
 
-    private static final int PARCEL_FORMAT_VERSION_MASK = 0x000000FF;
+    private static final int PARCEL_FORMAT_VERSION_MASK = 0x0000003F;
     private static final int PARCEL_FORMAT_VERSION_SHIFT =
             Integer.numberOfTrailingZeros(PARCEL_FORMAT_VERSION_MASK);
-    private static final int STATS_ARRAY_LENGTH_MASK = 0x0000FF00;
+    private static final int STATS_ARRAY_LENGTH_MASK = 0x0000FFC0;
     private static final int STATS_ARRAY_LENGTH_SHIFT =
             Integer.numberOfTrailingZeros(STATS_ARRAY_LENGTH_MASK);
     public static final int MAX_STATS_ARRAY_LENGTH =
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index f6de3459a1f58..34b12b0344e85 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -167,8 +167,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/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index f385931adbd25..edba6f38fdbf3 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -92,7 +92,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 13b71e71bab4e..dc58171f59f5f 100644
--- a/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java
+++ b/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java
@@ -101,7 +101,8 @@ public AconfigFlags() {
     }
 
     private static boolean useNewStorage() {
-        return newStoragePublicApi() && Flags.useNewAconfigStorage();
+        return newStoragePublicApi() && Flags.useNewAconfigStorage() &&
+                Environment.getMetadataDirectory().exists();
     }
 
     private void loadServerOverrides() {
diff --git a/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java b/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java
index 260619ec0b235..b0353ee85cea8 100644
--- a/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java
+++ b/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java
@@ -74,11 +74,22 @@ public void register() {
             r.registerContentObserver(
                     Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE),
                     false, this, UserHandle.USER_ALL);
+            r.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.BACK_GESTURE_ARROW),
+                    false, this, UserHandle.USER_ALL);
+            r.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.BACK_GESTURE_HAPTIC),
+                    false, this, UserHandle.USER_ALL);
             DeviceConfig.addOnPropertiesChangedListener(
                     DeviceConfig.NAMESPACE_SYSTEMUI,
                     runnable -> mMainHandler.post(runnable),
                     mOnPropertiesChangedListener);
+
+            r.registerContentObserver(
+                    Settings.System.getUriFor(Settings.System.LOCK_GESTURE_STATUS),
+                    false, this, UserHandle.USER_ALL);
         });
+
     }
 
     /**
@@ -160,6 +171,16 @@ public int getRightSensitivityForCallingUser(Resources userRes) {
         return (int) (getUnscaledInset(userRes) * scale);
     }
 
+    public boolean getBackArrowGesture() {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.BACK_GESTURE_ARROW, 1, UserHandle.USER_CURRENT) != 0;
+    }
+
+    public boolean getEdgeHapticEnabled() {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.BACK_GESTURE_HAPTIC, 1, UserHandle.USER_CURRENT) != 0;
+    }
+
     public boolean areNavigationButtonForcedVisible() {
         String SUWTheme = SystemProperties.get("setupwizard.theme", "");
         boolean isExpressiveThemeEnabled = SUWTheme.equals("glif_expressive")
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 72217b0ed2637..40578bf1db781 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;
@@ -2733,6 +2734,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/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/ArtFastDataOutput.java b/core/java/com/android/internal/util/ArtFastDataOutput.java
index 360ddb814aa26..672bdbbcbfcd1 100644
--- a/core/java/com/android/internal/util/ArtFastDataOutput.java
+++ b/core/java/com/android/internal/util/ArtFastDataOutput.java
@@ -84,6 +84,10 @@ public byte[] newByteArray(int bufferSize) {
     public void writeUTF(String s) throws IOException {
         // Attempt to write directly to buffer space if there's enough room,
         // otherwise fall back to chunking into place
+        if (s == null) {
+            return;
+        }
+
         if (mBufferCap - mBufferPos < 2 + s.length()) drain();
 
         // Magnitude of this returned value indicates the number of bytes
diff --git a/core/java/com/android/internal/util/ContrastColorUtil.java b/core/java/com/android/internal/util/ContrastColorUtil.java
index c68f107951ac7..6864f78148f1c 100644
--- a/core/java/com/android/internal/util/ContrastColorUtil.java
+++ b/core/java/com/android/internal/util/ContrastColorUtil.java
@@ -809,8 +809,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..617b682cc802e
--- /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.crdroid.net";
+    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/crdroid/DeviceConfigUtils.java b/core/java/com/android/internal/util/crdroid/DeviceConfigUtils.java
new file mode 100644
index 0000000000000..115c5199def89
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/DeviceConfigUtils.java
@@ -0,0 +1,85 @@
+/*
+ * 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.crdroid;
+
+import android.content.res.Resources;
+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;
+
+public class DeviceConfigUtils {
+
+    private static final String TAG = DeviceConfigUtils.class.getSimpleName();
+
+    private static final boolean DEBUG = false;
+
+    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 (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){
+                if (DEBUG) Log.d(TAG, "shouldAllowDeviceConfigControl, deny, namespace=" + namespace + ", property=" + property);
+                return true;
+            }
+        }
+        if (DEBUG) Log.d(TAG, "shouldAllowDeviceConfigControl, allow, namespace=" + namespace + ", property=" + property);
+        return false;
+    }
+
+    public static void setDefaultProperties(String filterNamespace, String filterProperty) {
+        if (DEBUG) Log.d(TAG, "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);
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/FontController.java b/core/java/com/android/internal/util/crdroid/FontController.java
new file mode 100644
index 0000000000000..9f1846c50a125
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/FontController.java
@@ -0,0 +1,183 @@
+/*
+ * 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.internal.util.crdroid;
+
+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 java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.Set;
+
+public class FontController {
+
+    private static final String TAG = "FontController";
+
+    private static FontController sInstance = null;
+
+    private static final Set<String> OVERRIDE_FONTS = new HashSet<>(Arrays.asList(
+            "google", "sans-serif", "gsf-"
+    ));
+
+    private static final Set<String> EXCLUDED_APPS = new HashSet<>(Arrays.asList(
+            "it.subito",
+            "tv.arte.plus7",
+            "com.google.android.gm"
+    ));
+
+    private static final Map<String, Integer> WEIGHT_MAP = new ArrayMap<>();
+    static {
+        WEIGHT_MAP.put("thin", 100);
+        WEIGHT_MAP.put("extralight", 200);
+        WEIGHT_MAP.put("light", 300);
+        WEIGHT_MAP.put("normal", 400);
+        WEIGHT_MAP.put("regular", 400);
+        WEIGHT_MAP.put("medium", 500);
+        WEIGHT_MAP.put("semibold", 600);
+        WEIGHT_MAP.put("bold", 700);
+        WEIGHT_MAP.put("extrabold", 800);
+        WEIGHT_MAP.put("black", 900);
+    }
+
+    public static FontController get() {
+        if (sInstance == null) {
+            sInstance = new FontController();
+        }
+        return sInstance;
+    }
+
+    private FontController() {}
+
+    public static void OnConfigurationChanged(Resources res) {
+        get().handleOnConfiguration(res);
+    }
+
+    public static Typeface getOverrideTypeface(String fontToOverride) {
+        if (fontToOverride == null) return null;
+
+        String pkgName = getCurrentPackageName();
+        if (pkgName != null && EXCLUDED_APPS.contains(pkgName)) {
+            logger("Excluded app, skipping override: " + pkgName);
+            return null;
+        }
+
+        String currentFont = Typeface.getFontName();
+
+        if (fontToOverride.matches("^" + Pattern.quote(currentFont) + "(-.*)?$")) {
+            logger(fontToOverride + " matches current font root '" + currentFont + "', skipping override!");
+            return null;
+        }
+
+        boolean override = OVERRIDE_FONTS.stream().anyMatch(fontToOverride::contains);
+        if (!override) {
+            logger("Not on override list, skipping override: " + fontToOverride);
+            return null;
+        }
+
+        int adjustment = getFontWeightAdjustment();
+        return TypefaceFactory.create(fontToOverride, currentFont, adjustment);
+    }
+
+    private void handleOnConfiguration(Resources res) {
+        String pkgName = getCurrentPackageName();
+        if (pkgName == null || EXCLUDED_APPS.contains(pkgName)) return;
+        logger("handleOnConfiguration: Changing default font to: " + Typeface.getFontName());
+        Typeface.changeFont(res);
+    }
+
+    private static String getCurrentPackageName() {
+        try {
+            return ActivityThread.currentPackageName();
+        } catch (Exception e) {
+            logger("getCurrentPackageName failed: " + e.getMessage());
+            return null;
+        }
+    }
+
+    private static Resources getResources() {
+        try {
+            return Resources.getSystem();
+        } catch (Exception e) {
+            logger("getResources failed: " + e.getMessage());
+            return null;
+        }
+    }
+
+    private static int getFontWeightAdjustment() {
+        try {
+            Resources res = getResources();
+            if (res == null) return 0;
+            Configuration cfg = res.getConfiguration();
+            return cfg != null ? cfg.fontWeightAdjustment : 0;
+        } catch (Exception e) {
+            logger("getFontWeightAdjustment failed: " + e.getMessage());
+            return 0;
+        }
+    }
+
+    private static void logger(String msg) {
+        if (SystemProperties.getBoolean("persist.sys.ax_font_debug", false)) {
+            Log.d(TAG, msg);
+        }
+    }
+
+    private static class TypefaceFactory {
+
+        public static Typeface create(String fontToOverride, String currentFont, int fontWeightAdjustment) {
+            int weight = resolveWeightByName(fontToOverride);
+
+            if (fontWeightAdjustment != 0) {
+                weight = Math.min(1000, Math.max(100, weight + fontWeightAdjustment));
+            }
+
+            boolean isBold = weight >= 700;
+            boolean isItalic = fontToOverride.contains("italic");
+
+            int style = Typeface.NORMAL;
+            if (isBold && isItalic) style = Typeface.BOLD_ITALIC;
+            else if (isBold) style = Typeface.BOLD;
+            else if (isItalic) style = Typeface.ITALIC;
+
+            Typeface base = Typeface.getSystemDefaultTypeface(currentFont);
+            Typeface result = Typeface.create(base, style);
+            result = Typeface.create(result, weight, isItalic);
+
+            logger("TypefaceFactory.create: fontToOverride=" + fontToOverride +
+                   ", style=" + style +
+                   ", weight=" + weight +
+                   ", adj=" + fontWeightAdjustment +
+                   ", isItalic=" + isItalic +
+                   ", success=" + (result != null));
+
+            return result;
+        }
+
+        private static int resolveWeightByName(String familyName) {
+            for (Map.Entry<String, Integer> entry : WEIGHT_MAP.entrySet()) {
+                if (familyName.contains(entry.getKey())) {
+                    return entry.getValue();
+                }
+            }
+            return 400;
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/IKeyboxProvider.java b/core/java/com/android/internal/util/crdroid/IKeyboxProvider.java
new file mode 100644
index 0000000000000..d0f7c2793fd76
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/IKeyboxProvider.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Paranoid Android
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.internal.util.crdroid;
+
+/**
+ * Interface for keybox providers.
+ *
+ * This interface defines the methods that a keybox provider must implement
+ * to provide access to EC and RSA keys and certificate chains.
+ *
+ * @hide
+ */
+public interface IKeyboxProvider {
+
+    /**
+     * Checks if a valid keybox is available.
+     *
+     * @return true if a valid keybox is available, false otherwise
+     * @hide
+     */
+    boolean hasKeybox();
+
+    /**
+     * Retrieves the EC private key.
+     *
+     * @return the EC private key as a String
+     * @hide
+     */
+    String getEcPrivateKey();
+
+    /**
+     * Retrieves the RSA private key.
+     *
+     * @return the RSA private key as a String
+     * @hide
+     */
+    String getRsaPrivateKey();
+
+    /**
+     * Retrieves the EC certificate chain.
+     *
+     * @return an array of Strings representing the EC certificate chain
+     * @hide
+     */
+    String[] getEcCertificateChain();
+
+    /**
+     * Retrieves the RSA certificate chain.
+     *
+     * @return an array of Strings representing the RSA certificate chain
+     * @hide
+     */
+    String[] getRsaCertificateChain();
+}
diff --git a/core/java/com/android/internal/util/crdroid/ImageHelper.java b/core/java/com/android/internal/util/crdroid/ImageHelper.java
new file mode 100644
index 0000000000000..23ab5215d5e6f
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/ImageHelper.java
@@ -0,0 +1,487 @@
+/*
+* Copyright (C) 2013 SlimRoms Project
+* Copyright (C) 2015 TeamEos Project
+* Copyright (C) 2015-2016 The DirtyUnicorns Project
+* 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.internal.util.crdroid;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.Shader.TileMode;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.renderscript.Element;
+import android.renderscript.Allocation;
+import android.renderscript.ScriptIntrinsicBlur;
+import android.renderscript.RenderScript;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.TypedValue;
+import android.util.Xml;
+
+public class ImageHelper {
+    private static final int VECTOR_WIDTH = 512;
+    private static final int VECTOR_HEIGHT = 512;
+
+    public static Drawable getColoredDrawable(Drawable d, int color) {
+        if (d == null) {
+            return null;
+        }
+        if (d instanceof VectorDrawable) {
+            d.setTint(color);
+            return d;
+        }
+        Bitmap colorBitmap = ((BitmapDrawable) d).getBitmap();
+        Bitmap grayscaleBitmap = toGrayscale(colorBitmap);
+        Paint pp = new Paint();
+        pp.setAntiAlias(true);
+        PorterDuffColorFilter frontFilter =
+            new PorterDuffColorFilter(color, Mode.MULTIPLY);
+        pp.setColorFilter(frontFilter);
+        Canvas cc = new Canvas(grayscaleBitmap);
+        final Rect rect = new Rect(0, 0, grayscaleBitmap.getWidth(), grayscaleBitmap.getHeight());
+        cc.drawBitmap(grayscaleBitmap, rect, rect, pp);
+        return new BitmapDrawable(grayscaleBitmap);
+    }
+
+    public static Bitmap drawableToBitmap (Drawable drawable) {
+        if (drawable == null) {
+            return null;
+        } else if (drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable) drawable).getBitmap();
+        }
+        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
+                drawable.getIntrinsicHeight(), Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+        return bitmap;
+    }
+
+    public static Bitmap getColoredBitmap(Drawable d, int color) {
+        if (d == null) {
+            return null;
+        }
+        Bitmap colorBitmap = ((BitmapDrawable) d).getBitmap();
+        Bitmap grayscaleBitmap = toGrayscale(colorBitmap);
+        Paint pp = new Paint();
+        pp.setAntiAlias(true);
+        PorterDuffColorFilter frontFilter =
+            new PorterDuffColorFilter(color, Mode.MULTIPLY);
+        pp.setColorFilter(frontFilter);
+        Canvas cc = new Canvas(grayscaleBitmap);
+        final Rect rect = new Rect(0, 0, grayscaleBitmap.getWidth(), grayscaleBitmap.getHeight());
+        cc.drawBitmap(grayscaleBitmap, rect, rect, pp);
+        return grayscaleBitmap;
+    }
+
+    public static Bitmap toGrayscale(Bitmap bmpOriginal) {
+        int width, height;
+        height = bmpOriginal.getHeight();
+        width = bmpOriginal.getWidth();
+        try {
+            bmpOriginal = RGB565toARGB888(bmpOriginal);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Bitmap bmpGrayscale = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas c = new Canvas(bmpGrayscale);
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        ColorMatrix cm = new ColorMatrix();
+        final Rect rect = new Rect(0, 0, width, height);
+        cm.setSaturation(0);
+
+        ColorMatrixColorFilter f = new ColorMatrixColorFilter(cm);
+        paint.setColorFilter(f);
+        c.drawBitmap(bmpOriginal, rect, rect, paint);
+        return bmpGrayscale;
+    }
+
+    public static int dpToPx(Context context, int dp) {
+        return (int) ((dp * context.getResources().getDisplayMetrics().density) + 0.5);
+    }
+
+    public static Drawable resize(Context context, Drawable image, int size) {
+        if (image == null || context == null) {
+            return null;
+        }
+        if (image instanceof VectorDrawable) {
+            return image;
+        } else {
+            int newSize = dpToPx(context, size);
+            Bitmap bitmap = ((BitmapDrawable) image).getBitmap();
+            Bitmap scaledBitmap = Bitmap.createBitmap(newSize, newSize, Config.ARGB_8888);
+
+            float ratioX = newSize / (float) bitmap.getWidth();
+            float ratioY = newSize / (float) bitmap.getHeight();
+            float middleX = newSize / 2.0f;
+            float middleY = newSize / 2.0f;
+
+            final Paint paint = new Paint(Paint.FILTER_BITMAP_FLAG);
+            paint.setAntiAlias(true);
+
+            Matrix scaleMatrix = new Matrix();
+            scaleMatrix.setScale(ratioX, ratioY, middleX, middleY);
+
+            Canvas canvas = new Canvas(scaledBitmap);
+            canvas.setMatrix(scaleMatrix);
+            canvas.drawBitmap(bitmap, middleX - bitmap.getWidth() / 2,
+                    middleY - bitmap.getHeight() / 2, paint);
+            return new BitmapDrawable(context.getResources(), scaledBitmap);
+        }
+    }
+
+    public static Bitmap getRoundedCornerBitmap(Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+        Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(),
+                Config.ARGB_8888);
+        Canvas canvas = new Canvas(output);
+
+        final int color = 0xff424242;
+        final Paint paint = new Paint();
+        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
+        final RectF rectF = new RectF(rect);
+        final float roundPx = 24;
+        paint.setAntiAlias(true);
+        canvas.drawARGB(0, 0, 0, 0);
+        paint.setColor(color);
+        canvas.drawRoundRect(rectF, roundPx, roundPx, paint);
+        paint.setXfermode(new PorterDuffXfermode(Mode.SRC_IN));
+        canvas.drawBitmap(bitmap, rect, rect, paint);
+        return output;
+    }
+
+    public static Bitmap getCircleBitmap(Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+
+        Bitmap output = Bitmap.createBitmap(width, height,
+                Config.ARGB_8888);
+        Canvas canvas = new Canvas(output);
+
+        BitmapShader shader = new BitmapShader(bitmap,  TileMode.CLAMP, TileMode.CLAMP);
+        final Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setShader(shader);
+
+        canvas.drawCircle(width/2, height/2, width/2, paint);
+
+        return output;
+    }
+
+    public static Drawable getVector(Resources res, int resId) {
+        return getVector(res, resId, 0, 0, false);
+    }
+
+    public static Drawable getVector(Resources res, int resId, int width, int height) {
+        return getVector(res, resId, width, height, false);
+    }
+
+    public static Drawable getVector(Resources res, int resId, boolean toBitmapDrawable) {
+        return getVector(res, resId, 0, 0, toBitmapDrawable);
+    }
+
+    public static Drawable getVector(Resources res, int resId, int width, int height,
+            boolean toBitmapDrawable) {
+        if (width <= 0) {
+            width = VECTOR_WIDTH;
+        }
+        if (height <= 0) {
+            width = VECTOR_HEIGHT;
+        }
+
+        VectorDrawable vectorDrawable = new VectorDrawable();
+        vectorDrawable.setBounds(0, 0, width, height);
+        try {
+            XmlPullParser parser = res.getXml(resId);
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.START_TAG &&
+                    type != XmlPullParser.END_DOCUMENT) {
+                // Empty loop
+            }
+
+            if (type != XmlPullParser.START_TAG) {
+//                Log.e("ImageHelper VectorLoader", "No start tag found");
+            }
+
+            vectorDrawable.inflate(res, parser, attrs);
+
+            if (!toBitmapDrawable) {
+                return vectorDrawable;
+            }
+
+            return new BitmapDrawable(res, drawableToBitmap(vectorDrawable));
+        } catch (Exception e) {
+//            Log.e("ImageHelper VectorLoader", "Error loading resource ID " + String.valueOf(resId) + " Try loading as a non vector");
+            return null;
+        }
+    }
+
+    /**
+     * @param context callers context
+     * @param uri Uri to handle
+     * @return A bitmap from the requested uri
+     * @throws IOException
+     *
+     * @Credit: StackOverflow
+     *             http://stackoverflow.com/questions/35909008/pick-image
+     *             -from-gallery-or-google-photos-failing
+     */
+    public static Bitmap getBitmapFromUri(Context context, Uri uri) throws IOException {
+        if (context == null || uri == null) {
+            return null;
+        }
+        ParcelFileDescriptor parcelFileDescriptor =
+                context.getContentResolver().openFileDescriptor(uri, "r");
+        FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
+        Bitmap image = BitmapFactory.decodeFileDescriptor(fileDescriptor);
+        parcelFileDescriptor.close();
+        return image;
+    }
+
+    /**
+     * @param storageDir Desired location in storage as a File
+     * @param fileName Name of bitmap file to store
+     * @param bitmap the bitmap to store
+     * @return the Uri of the bitmap
+     */
+    public static Uri addBitmapToStorage(File storageDir, String fileName, Bitmap bitmap) {
+        if (storageDir == null || fileName == null || bitmap == null) {
+            return null;
+        }
+        File imageFile = new File(storageDir, fileName);
+        try {
+            FileOutputStream fos = new FileOutputStream(imageFile);
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (Exception e) {
+            return null;
+        }
+        return Uri.fromFile(imageFile);
+    }
+
+    public static Bitmap getBlurredImage(Context context, Bitmap image) {
+        return getBlurredImage(context, image, 3.5f);
+    }
+
+    public static Bitmap getBlurredImage(Context context, Bitmap image, float radius) {
+        try {
+            image = RGB565toARGB888(image);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Bitmap bitmap = Bitmap.createBitmap(
+                image.getWidth(), image.getHeight(),
+                Bitmap.Config.ARGB_8888);
+        RenderScript renderScript = RenderScript.create(context);
+        Allocation blurInput = Allocation.createFromBitmap(renderScript, image);
+        Allocation blurOutput = Allocation.createFromBitmap(renderScript, bitmap);
+
+        ScriptIntrinsicBlur blur = ScriptIntrinsicBlur.create(renderScript,
+                Element.U8_4(renderScript));
+        blur.setInput(blurInput);
+        blur.setRadius(radius); // radius must be 0 < r <= 25
+        blur.forEach(blurOutput);
+        blurOutput.copyTo(bitmap);
+        renderScript.destroy();
+
+        return bitmap;
+    }
+
+    public static Bitmap getGrayscaleBlurredImage(Context context, Bitmap image) {
+        return getGrayscaleBlurredImage(context, image, 3.5f);
+    }
+
+    public static Bitmap getGrayscaleBlurredImage(Context context, Bitmap image, float radius) {
+        Bitmap finalImage = Bitmap.createBitmap(
+                image.getWidth(), image.getHeight(),
+                Bitmap.Config.ARGB_8888);
+        finalImage = toGrayscale(getBlurredImage(context, image, radius));
+        return finalImage;
+    }
+
+    private static Bitmap RGB565toARGB888(Bitmap img) throws Exception {
+        int numPixels = img.getWidth() * img.getHeight();
+        int[] pixels = new int[numPixels];
+
+        //Get JPEG pixels.  Each int is the color values for one pixel.
+        img.getPixels(pixels, 0, img.getWidth(), 0, 0, img.getWidth(), img.getHeight());
+
+        //Create a Bitmap of the appropriate format.
+        Bitmap result = Bitmap.createBitmap(img.getWidth(), img.getHeight(), Bitmap.Config.ARGB_8888);
+
+        //Set RGB pixels.
+        result.setPixels(pixels, 0, result.getWidth(), 0, 0, result.getWidth(), result.getHeight());
+        return result;
+    }
+
+    public static Bitmap getCompressedBitmap(String imagePath) {
+        float maxHeight = 1920.0f;
+        float maxWidth = 1080.0f;
+        Bitmap scaledBitmap = null;
+        Bitmap bmp = null;
+        ByteArrayOutputStream out = null;
+
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(imagePath, options);
+
+            int actualHeight = options.outHeight;
+            int actualWidth = options.outWidth;
+            float imgRatio = (float) actualWidth / (float) actualHeight;
+            float maxRatio = maxWidth / maxHeight;
+
+            if (actualHeight > maxHeight || actualWidth > maxWidth) {
+                if (imgRatio < maxRatio) {
+                    imgRatio = maxHeight / actualHeight;
+                    actualWidth = (int) (imgRatio * actualWidth);
+                    actualHeight = (int) maxHeight;
+                } else if (imgRatio > maxRatio) {
+                    imgRatio = maxWidth / actualWidth;
+                    actualHeight = (int) (imgRatio * actualHeight);
+                    actualWidth = (int) maxWidth;
+                } else {
+                    actualHeight = (int) maxHeight;
+                    actualWidth = (int) maxWidth;
+                }
+            }
+
+            options.inSampleSize = calculateInSampleSize(options, actualWidth, actualHeight);
+            options.inJustDecodeBounds = false;
+            options.inDither = false;
+            options.inPurgeable = true;
+            options.inInputShareable = true;
+            options.inTempStorage = new byte[16 * 1024];
+
+            bmp = BitmapFactory.decodeFile(imagePath, options);
+            if (bmp == null) return null; // Exit if the bitmap is null
+
+            scaledBitmap = Bitmap.createBitmap(actualWidth, actualHeight, Bitmap.Config.ARGB_8888);
+
+            float ratioX = actualWidth / (float) options.outWidth;
+            float ratioY = actualHeight / (float) options.outHeight;
+            float middleX = actualWidth / 2.0f;
+            float middleY = actualHeight / 2.0f;
+
+            Matrix scaleMatrix = new Matrix();
+            scaleMatrix.setScale(ratioX, ratioY, middleX, middleY);
+
+            Canvas canvas = new Canvas(scaledBitmap);
+            canvas.setMatrix(scaleMatrix);
+            canvas.drawBitmap(bmp, middleX - bmp.getWidth() / 2, middleY - bmp.getHeight() / 2, new Paint(Paint.FILTER_BITMAP_FLAG));
+
+            ExifInterface exif = new ExifInterface(imagePath);
+            int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
+            Matrix matrix = new Matrix();
+            if (orientation == 6) {
+                matrix.postRotate(90);
+            } else if (orientation == 3) {
+                matrix.postRotate(180);
+            } else if (orientation == 8) {
+                matrix.postRotate(270);
+            }
+            scaledBitmap = Bitmap.createBitmap(scaledBitmap, 0, 0, scaledBitmap.getWidth(), scaledBitmap.getHeight(), matrix, true);
+
+            out = new ByteArrayOutputStream();
+            scaledBitmap.compress(Bitmap.CompressFormat.JPEG, 90, out);
+
+            byte[] byteArray = out.toByteArray();
+
+            // Free resources
+            if (bmp != null) bmp.recycle();
+            if (scaledBitmap != null && scaledBitmap != bmp) scaledBitmap.recycle();
+            if (out != null) out.close();
+
+            return BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            // Ensure all resources are released
+            if (bmp != null) bmp.recycle();
+            if (scaledBitmap != null && scaledBitmap != bmp) scaledBitmap.recycle();
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return null;
+    }
+
+    private static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+            final int heightRatio = Math.round((float) height / (float) reqHeight);
+            final int widthRatio = Math.round((float) width / (float) reqWidth);
+            inSampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
+        }
+        final float totalPixels = width * height;
+        final float totalReqPixelsCap = reqWidth * reqHeight * 2;
+
+        while (totalPixels / (inSampleSize * inSampleSize) > totalReqPixelsCap) {
+            inSampleSize++;
+        }
+        return inSampleSize;
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/KeyProviderManager.java b/core/java/com/android/internal/util/crdroid/KeyProviderManager.java
new file mode 100644
index 0000000000000..a5609eadadeb6
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/KeyProviderManager.java
@@ -0,0 +1,191 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Paranoid Android
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.internal.util.crdroid;
+
+import android.app.ActivityThread;
+import android.content.Context;
+import android.provider.Settings;
+import android.util.Log;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Manager class for handling keybox providers.
+ * @hide
+ */
+public final class KeyProviderManager {
+    private static final String TAG = "KeyProviderManager";
+
+    private KeyProviderManager() {}
+
+    public static IKeyboxProvider getProvider() {
+        return new DefaultKeyboxProvider();
+    }
+
+    public static boolean isKeyboxAvailable() {
+        return getProvider().hasKeybox();
+    }
+
+    private static class DefaultKeyboxProvider implements IKeyboxProvider {
+        private final Map<String, String> keyboxData = new HashMap<>();
+
+        private DefaultKeyboxProvider() {
+            Context context = getApplicationContext();
+            if (context == null) {
+                Log.e(TAG, "Failed to get application context");
+                return;
+            }
+
+            loadFromXmlSetting(context);
+        }
+
+        private boolean loadFromXmlSetting(Context ctx) {
+            try {
+                String xml = Settings.Secure.getString(ctx.getContentResolver(), Settings.Secure.KEYBOX_DATA);
+                if (xml == null || xml.trim().isEmpty()) return false;
+
+                XmlPullParser p = Xml.newPullParser();
+                p.setInput(new StringReader(xml));
+
+                String currentAlg = null;
+                int certCount = 0;
+                boolean numberOfKeyboxesChecked = false;
+
+                for (int ev = p.next(); ev != XmlPullParser.END_DOCUMENT; ev = p.next()) {
+                    if (ev == XmlPullParser.START_TAG) {
+                        String tag = p.getName();
+                        switch (tag) {
+                            case "NumberOfKeyboxes":
+                                p.next();
+                                numberOfKeyboxesChecked = true;
+                                try {
+                                    int count = Integer.parseInt(p.getText().trim());
+                                    if (count != 1) {
+                                        Log.w(TAG, "Invalid NumberOfKeyboxes: " + count);
+                                        return false;
+                                    }
+                                } catch (NumberFormatException e) {
+                                    Log.w(TAG, "Failed to parse NumberOfKeyboxes", e);
+                                    return false;
+                                }
+                                break;
+
+                            case "Key":
+                                currentAlg = p.getAttributeValue(null, "algorithm");
+                                if ("ecdsa".equalsIgnoreCase(currentAlg)) currentAlg = "EC";
+                                else if ("rsa".equalsIgnoreCase(currentAlg)) currentAlg = "RSA";
+                                else currentAlg = null;
+                                certCount = 0;
+                                break;
+
+                            case "PrivateKey": {
+                                String format = p.getAttributeValue(null, "format");
+                                if (!"pem".equalsIgnoreCase(format)) {
+                                    Log.w(TAG, "Unsupported PrivateKey format: " + format);
+                                    return false;
+                                }
+                                p.next();
+                                if (currentAlg != null) {
+                                    keyboxData.put(currentAlg + ".PRIV", p.getText().trim());
+                                }
+                                break;
+                            }
+
+                            case "Certificate": {
+                                String format = p.getAttributeValue(null, "format");
+                                if (!"pem".equalsIgnoreCase(format)) {
+                                    Log.w(TAG, "Unsupported Certificate format: " + format);
+                                    return false;
+                                }
+                                if (currentAlg != null) {
+                                    p.next();
+                                    certCount++;
+                                    keyboxData.put(currentAlg + ".CERT_" + certCount, p.getText().trim());
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (!numberOfKeyboxesChecked) {
+                    Log.w(TAG, "Missing <NumberOfKeyboxes> in keybox XML");
+                    return false;
+                }
+
+                if (!hasKeybox()) {
+                    Log.w(TAG, "Failed to load keybox from XML setting");
+                    return false;
+                }
+
+                Log.i(TAG, "Loaded keybox from XML setting");
+                return true;
+            } catch (Exception e) {
+                Log.e(TAG, "XML keybox load failed", e);
+                return false;
+            }
+        }
+
+        private static Context getApplicationContext() {
+            try {
+                return ActivityThread.currentApplication().getApplicationContext();
+            } catch (Exception e) {
+                Log.e(TAG, "Error getting application context", e);
+                return null;
+            }
+        }
+
+        @Override
+        public boolean hasKeybox() {
+            if (!keyboxData.containsKey("EC.PRIV") || !keyboxData.containsKey("RSA.PRIV")) {
+                return false;
+            }
+            if (!keyboxData.containsKey("EC.CERT_1") || !keyboxData.containsKey("RSA.CERT_1")) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String getEcPrivateKey() {
+            return keyboxData.get("EC.PRIV");
+        }
+
+        @Override
+        public String getRsaPrivateKey() {
+            return keyboxData.get("RSA.PRIV");
+        }
+
+        @Override
+        public String[] getEcCertificateChain() {
+            return getCertificateChain("EC");
+        }
+
+        @Override
+        public String[] getRsaCertificateChain() {
+            return getCertificateChain("RSA");
+        }
+
+        private String[] getCertificateChain(String prefix) {
+            List<String> dataList = new ArrayList<>();
+            for (String key : keyboxData.keySet()) {
+                if (key.startsWith(prefix + ".CERT_")) {
+                    dataList.add(keyboxData.get(key));
+                }
+            }
+            String[] chain = dataList.toArray(String[]::new);
+            Arrays.sort(chain);
+            return chain;
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/KeyboxChainGenerator.java b/core/java/com/android/internal/util/crdroid/KeyboxChainGenerator.java
new file mode 100644
index 0000000000000..1f760fbcf3883
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/KeyboxChainGenerator.java
@@ -0,0 +1,483 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Neoteric OS
+ * SPDX-FileCopyrightText: 2025 The halogenOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.internal.util.crdroid;
+
+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.hardware.security.keymint.Algorithm;
+import android.hardware.security.keymint.EcCurve;
+import android.hardware.security.keymint.KeyOrigin;
+import android.hardware.security.keymint.KeyParameter;
+import android.hardware.security.keymint.Tag;
+import android.os.Binder;
+import android.os.Build;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.security.keystore.KeyProperties;
+import android.system.keystore2.KeyDescriptor;
+import android.util.Base64;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+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.ASN1Integer;
+import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import com.android.internal.org.bouncycastle.asn1.ASN1OctetString;
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+import com.android.internal.org.bouncycastle.asn1.DERNull;
+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.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.asn1.x509.Time;
+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.IOException;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.cert.Certificate;
+import java.security.spec.ECGenParameterSpec;
+import java.security.spec.RSAKeyGenParameterSpec;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.security.auth.x500.X500Principal;
+
+/**
+ * @hide
+ */
+public final class KeyboxChainGenerator {
+
+    private static final String TAG = "KeyboxChainGenerator";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private static final int ATTESTATION_APPLICATION_ID_PACKAGE_INFOS_INDEX = 0;
+    private static final int ATTESTATION_APPLICATION_ID_SIGNATURE_DIGESTS_INDEX = 1;
+    private static final int ATTESTATION_PACKAGE_INFO_PACKAGE_NAME_INDEX = 0;
+    private static final int ATTESTATION_PACKAGE_INFO_VERSION_INDEX = 1;
+
+    public static List<Certificate> generateCertChain(int uid, KeyDescriptor descriptor, KeyGenParameters params) {
+        dlog("Requested KeyPair with alias: " + descriptor.alias);
+        int size = params.keySize;
+        KeyPair kp;
+        try {
+            if (Objects.equals(params.algorithm, Algorithm.EC)) {
+                dlog("Generating EC keypair of size " + size);
+                kp = buildECKeyPair(params);
+            } else if (Objects.equals(params.algorithm, Algorithm.RSA)) {
+                dlog("Generating RSA keypair of size " + size);
+                kp = buildRSAKeyPair(params);
+            } else {
+                dlog("Unsupported algorithm");
+                return null;
+            }
+
+            X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(
+                    KeyboxUtils.getCertificateHolder(
+                            Objects.equals(params.algorithm, Algorithm.EC)
+                                    ? KeyProperties.KEY_ALGORITHM_EC
+                                    : KeyProperties.KEY_ALGORITHM_RSA
+                    ).getSubject(),
+                    params.certificateSerial,
+                    new Time(params.certificateNotBefore),
+                    new Time(params.certificateNotAfter),
+                    params.certificateSubject,
+                    SubjectPublicKeyInfo.getInstance(
+                            ASN1Sequence.getInstance(kp.getPublic().getEncoded())
+                    )
+            );
+
+            KeyUsage keyUsage = new KeyUsage(KeyUsage.keyCertSign);
+            certBuilder.addExtension(Extension.keyUsage, true, keyUsage);
+            certBuilder.addExtension(createExtension(params, uid));
+
+            ContentSigner contentSigner;
+            if (Objects.equals(params.algorithm, Algorithm.EC)) {
+                contentSigner = new JcaContentSignerBuilder("SHA256withECDSA").build(KeyboxUtils.getPrivateKey(KeyProperties.KEY_ALGORITHM_EC));
+            } else {
+                contentSigner = new JcaContentSignerBuilder("SHA256withRSA").build(KeyboxUtils.getPrivateKey(KeyProperties.KEY_ALGORITHM_RSA));
+            }
+            X509CertificateHolder certHolder = certBuilder.build(contentSigner);
+            Certificate leaf = KeyboxUtils.getCertificateFromHolder(certHolder);
+            List<Certificate> chain = KeyboxUtils.getCertificateChain(leaf.getPublicKey().getAlgorithm());
+            chain.add(0, leaf);
+            dlog("Successfully generated X500 Cert for alias: " + descriptor.alias);
+            return chain;
+        } catch (Throwable t) {
+            Log.e(TAG, Log.getStackTraceString(t));
+        }
+        return null;
+    }
+
+    private static ASN1Encodable[] fromIntList(List<Integer> list) {
+        ASN1Encodable[] result = new ASN1Encodable[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+            result[i] = new ASN1Integer(list.get(i));
+        }
+        return result;
+    }
+
+    private static Extension createExtension(KeyGenParameters params, int uid) {
+        try {
+            Context context = ActivityThread.currentApplication();
+            if (context == null) {
+                Log.e(TAG, "Context is null in createExtension");
+                return null;
+            }
+            SecureRandom secureRandom = new SecureRandom();
+            
+            String key = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.VBOOT_KEY);
+            byte[] verifiedBootKey;
+            if (key == null) {
+                byte[] randomBytes = new byte[32];
+                secureRandom.nextBytes(randomBytes);
+                String encoded = Base64.encodeToString(randomBytes, Base64.NO_WRAP);
+                Settings.Secure.putString(context.getContentResolver(), Settings.Secure.VBOOT_KEY, encoded);
+                verifiedBootKey = randomBytes;
+            } else {
+                verifiedBootKey = Base64.decode(key, Base64.NO_WRAP);
+            }
+
+            String hash = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.VBOOT_HASH);
+            byte[] verifiedBootHash;
+            if (hash == null) {
+                byte[] randomBytes = new byte[32];
+                secureRandom.nextBytes(randomBytes);
+                String encoded = Base64.encodeToString(randomBytes, Base64.NO_WRAP);
+                Settings.Secure.putString(context.getContentResolver(), Settings.Secure.VBOOT_HASH, encoded);
+                verifiedBootHash = randomBytes;
+            } else {
+                verifiedBootHash = Base64.decode(hash, Base64.NO_WRAP);
+            }
+
+            ASN1Encodable[] rootOfTrustEncodables = {
+                    new DEROctetString(verifiedBootKey),
+                    ASN1Boolean.TRUE,
+                    new ASN1Enumerated(0),
+                    new DEROctetString(verifiedBootHash)
+            };
+
+            ASN1Sequence rootOfTrustSeq = new DERSequence(rootOfTrustEncodables);
+
+            var Apurpose = new DERSet(fromIntList(params.purpose));
+            var Aalgorithm = new ASN1Integer(params.algorithm);
+            var AkeySize = new ASN1Integer(params.keySize);
+            var Adigest = new DERSet(fromIntList(params.digest));
+            var AecCurve = new ASN1Integer(params.ecCurve);
+            var AnoAuthRequired = DERNull.INSTANCE;
+            var Aorigin = new ASN1Integer(0);
+
+            // To be loaded
+            var AosVersion = new ASN1Integer(getOsVersion());
+            var AosPatchLevel = new ASN1Integer(getPatchLevel());
+            var AbootPatchlevel = new ASN1Integer(getPatchLevelLong());
+            var AvendorPatchLevel = new ASN1Integer(getPatchLevelLong());
+
+            var purpose = new DERTaggedObject(true, 1, Apurpose);
+            var algorithm = new DERTaggedObject(true, 2, Aalgorithm);
+            var keySize = new DERTaggedObject(true, 3, AkeySize);
+            var digest = new DERTaggedObject(true, 5, Adigest);
+            var ecCurve = new DERTaggedObject(true, 10, AecCurve);
+            var noAuthRequired = new DERTaggedObject(true, 503, AnoAuthRequired);
+            var origin = new DERTaggedObject(true, 702, Aorigin);
+            var rootOfTrust = new DERTaggedObject(true, 704, rootOfTrustSeq);
+            var osVersion = new DERTaggedObject(true, 705, AosVersion);
+            var osPatchLevel = new DERTaggedObject(true, 706, AosPatchLevel);
+            var vendorPatchLevel = new DERTaggedObject(true, 718, AvendorPatchLevel);
+            var bootPatchLevel = new DERTaggedObject(true, 719, AbootPatchlevel);
+
+            ASN1Encodable[] teeEnforcedEncodables;
+
+            // Support device properties attestation
+            if (params.brand != null) {
+                var Abrand = new DEROctetString(params.brand);
+                var Adevice = new DEROctetString(params.device);
+                var Aproduct = new DEROctetString(params.product);
+                var Amanufacturer = new DEROctetString(params.manufacturer);
+                var Amodel = new DEROctetString(params.model);
+                var brand = new DERTaggedObject(true, 710, Abrand);
+                var device = new DERTaggedObject(true, 711, Adevice);
+                var product = new DERTaggedObject(true, 712, Aproduct);
+                var manufacturer = new DERTaggedObject(true, 716, Amanufacturer);
+                var model = new DERTaggedObject(true, 717, Amodel);
+
+                teeEnforcedEncodables = new ASN1Encodable[]{purpose, algorithm, keySize, digest, ecCurve,
+                        noAuthRequired, origin, rootOfTrust, osVersion, osPatchLevel, vendorPatchLevel,
+                        bootPatchLevel, brand, device, product, manufacturer, model};
+            } else {
+                teeEnforcedEncodables = new ASN1Encodable[]{purpose, algorithm, keySize, digest, ecCurve,
+                        noAuthRequired, origin, rootOfTrust, osVersion, osPatchLevel, vendorPatchLevel,
+                        bootPatchLevel};
+            }
+
+            var AcreationDateTime = new ASN1Integer(System.currentTimeMillis());
+            var AapplicationID = createApplicationId(uid);
+
+            var creationDateTime = new DERTaggedObject(true, 701, AcreationDateTime);
+            var applicationID = new DERTaggedObject(true, 709, AapplicationID);
+
+            ASN1Encodable[] softwareEnforced = {creationDateTime, applicationID};
+
+            ASN1OctetString keyDescriptionOctetStr = getAsn1OctetString(teeEnforcedEncodables, softwareEnforced, params);
+
+            return new Extension(new ASN1ObjectIdentifier("1.3.6.1.4.1.11129.2.1.17"), false, keyDescriptionOctetStr);
+        } catch (Throwable t) {
+            Log.e(TAG, Log.getStackTraceString(t));
+        }
+        return null;
+    }
+
+    private static int getOsVersion() {
+        String release = Build.VERSION.RELEASE;
+        int major = 16, minor = 0, patch = 0;
+
+        // Handle cases with additional suffixes like "/BP31"
+        release = release.split("/")[0];
+
+        String[] parts = release.split("\\.");
+        try {
+            if (parts.length > 0) major = Integer.parseInt(parts[0]);
+            if (parts.length > 1) minor = Integer.parseInt(parts[1]);
+            if (parts.length > 2) patch = Integer.parseInt(parts[2]);
+        } catch (NumberFormatException e) {
+            Log.w(TAG, "Unable to parse OS version: " + release);
+        }
+
+        return major * 10000 + minor * 100 + patch;
+    }
+
+    private static int getPatchLevel() {
+        return convertPatchLevel(Build.VERSION.SECURITY_PATCH, false);
+    }
+
+    private static int getPatchLevelLong() {
+        return convertPatchLevel(Build.VERSION.SECURITY_PATCH, true);
+    }
+
+    private static int convertPatchLevel(String patchLevel, boolean longFormat) {
+        try {
+            String[] parts = patchLevel.split("-");
+            int year = Integer.parseInt(parts[0]);
+            int month = Integer.parseInt(parts[1]);
+            if (longFormat) {
+                int day = Integer.parseInt(parts[2]);
+                return year * 10000 + month * 100 + day;
+            } else {
+                return year * 100 + month;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Invalid patch level: " + patchLevel, e);
+            return 202404;
+        }
+    }
+
+    private static ASN1OctetString getAsn1OctetString(ASN1Encodable[] teeEnforcedEncodables, ASN1Encodable[] softwareEnforcedEncodables, KeyGenParameters params) throws IOException {
+        ASN1Integer attestationVersion = new ASN1Integer(100);
+        ASN1Enumerated attestationSecurityLevel = new ASN1Enumerated(1);
+        ASN1Integer keymasterVersion = new ASN1Integer(100);
+        ASN1Enumerated keymasterSecurityLevel = new ASN1Enumerated(1);
+        ASN1OctetString attestationChallenge = new DEROctetString(params.attestationChallenge);
+        ASN1OctetString uniqueId = new DEROctetString(new byte[0]);
+        ASN1Encodable softwareEnforced = new DERSequence(softwareEnforcedEncodables);
+        ASN1Sequence teeEnforced = new DERSequence(teeEnforcedEncodables);
+
+        ASN1Encodable[] keyDescriptionEncodables = {attestationVersion, attestationSecurityLevel, keymasterVersion,
+                keymasterSecurityLevel, attestationChallenge, uniqueId, softwareEnforced, teeEnforced};
+
+        ASN1Sequence keyDescriptionHackSeq = new DERSequence(keyDescriptionEncodables);
+
+        return new DEROctetString(keyDescriptionHackSeq);
+    }
+
+    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<Digest> 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_SIGNATURES);
+            ASN1Encodable[] arr = new ASN1Encodable[2];
+            arr[ATTESTATION_PACKAGE_INFO_PACKAGE_NAME_INDEX] =
+                    new DEROctetString(name.getBytes(StandardCharsets.UTF_8));
+            arr[ATTESTATION_PACKAGE_INFO_VERSION_INDEX] =
+                    new ASN1Integer(info.getLongVersionCode());
+            packageInfoAA[i] = new DERSequence(arr);
+
+            if (info != null && info.signatures != null) {
+                for (Signature s : info.signatures) {
+                    if (s != null) signatures.add(new Digest(dg.digest(s.toByteArray())));
+                }
+            }
+        }
+
+        ASN1Encodable[] signaturesAA = new ASN1Encodable[signatures.size()];
+        int i = 0;
+        for (Digest d : signatures) {
+            signaturesAA[i++] = new DEROctetString(d.digest);
+        }
+
+        ASN1Encodable[] applicationIdAA = new ASN1Encodable[2];
+        applicationIdAA[ATTESTATION_APPLICATION_ID_PACKAGE_INFOS_INDEX] =
+                new DERSet(packageInfoAA);
+        applicationIdAA[ATTESTATION_APPLICATION_ID_SIGNATURE_DIGESTS_INDEX] =
+                new DERSet(signaturesAA);
+
+        return new DEROctetString(new DERSequence(applicationIdAA).getEncoded());
+    }
+
+    record Digest(byte[] digest) {
+        @Override
+        public boolean equals(@Nullable Object o) {
+            if (o instanceof Digest d)
+                return Arrays.equals(digest, d.digest);
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return Arrays.hashCode(digest);
+        }
+    }
+
+    private static KeyPair buildECKeyPair(KeyGenParameters params) throws Exception {
+        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+        Security.addProvider(new BouncyCastleProvider());
+        ECGenParameterSpec spec = new ECGenParameterSpec(params.ecCurveName);
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", BouncyCastleProvider.PROVIDER_NAME);
+        kpg.initialize(spec);
+        return kpg.generateKeyPair();
+    }
+
+    private static KeyPair buildRSAKeyPair(KeyGenParameters params) throws Exception {
+        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+        Security.addProvider(new BouncyCastleProvider());
+        RSAKeyGenParameterSpec spec = new RSAKeyGenParameterSpec(
+                params.keySize, params.rsaPublicExponent);
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", BouncyCastleProvider.PROVIDER_NAME);
+        kpg.initialize(spec);
+        return kpg.generateKeyPair();
+    }
+
+    private static void dlog(String msg) {
+        if (DEBUG) Log.d(TAG, msg);
+    }
+
+    public static class KeyGenParameters {
+        public int keySize;
+        public int algorithm;
+        public BigInteger certificateSerial;
+        public Date certificateNotBefore;
+        public Date certificateNotAfter;
+        public X500Name 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 int securityLevel;
+        public boolean noAuthRequired;
+
+        // Extra fields for response metadata
+        public int osVersion = KeyboxChainGenerator.getOsVersion();
+        public int osPatchLevel = KeyboxChainGenerator.getPatchLevel();
+        public int vendorPatchLevel = KeyboxChainGenerator.getPatchLevelLong();
+        public int bootPatchLevel = KeyboxChainGenerator.getPatchLevelLong();
+        public long creationDateTime = System.currentTimeMillis();
+        public int userId = UserHandle.myUserId();
+        public int origin = KeyOrigin.GENERATED;
+
+        public KeyGenParameters(KeyParameter[] params) {
+            for (KeyParameter kp : params) {
+                switch (kp.tag) {
+                    case Tag.KEY_SIZE -> keySize = kp.value.getInteger();
+                    case Tag.ALGORITHM -> algorithm = kp.value.getAlgorithm();
+                    case Tag.CERTIFICATE_SERIAL -> certificateSerial = new BigInteger(kp.value.getBlob());
+                    case Tag.CERTIFICATE_NOT_BEFORE -> certificateNotBefore = new Date(kp.value.getDateTime());
+                    case Tag.CERTIFICATE_NOT_AFTER -> certificateNotAfter = new Date(kp.value.getDateTime());
+                    case Tag.CERTIFICATE_SUBJECT ->
+                            certificateSubject = new X500Name(new X500Principal(kp.value.getBlob()).getName());
+                    case Tag.RSA_PUBLIC_EXPONENT -> rsaPublicExponent = BigInteger.valueOf(kp.value.getLongInteger());
+                    case Tag.EC_CURVE -> {
+                        ecCurve = kp.value.getEcCurve();
+                        ecCurveName = getEcCurveName(ecCurve);
+                    }
+                    case Tag.PURPOSE -> purpose.add(kp.value.getKeyPurpose());
+                    case Tag.DIGEST -> digest.add(kp.value.getDigest());
+                    case Tag.ATTESTATION_CHALLENGE -> attestationChallenge = kp.value.getBlob();
+                    case Tag.ATTESTATION_ID_BRAND -> brand = kp.value.getBlob();
+                    case Tag.ATTESTATION_ID_DEVICE -> device = kp.value.getBlob();
+                    case Tag.ATTESTATION_ID_PRODUCT -> product = kp.value.getBlob();
+                    case Tag.ATTESTATION_ID_MANUFACTURER -> manufacturer = kp.value.getBlob();
+                    case Tag.ATTESTATION_ID_MODEL -> model = kp.value.getBlob();
+                    case Tag.HARDWARE_TYPE -> securityLevel = kp.value.getSecurityLevel();
+                    case Tag.NO_AUTH_REQUIRED -> noAuthRequired = kp.value.getBoolValue();
+                }
+            }
+        }
+
+        private static String getEcCurveName(int curve) {
+            return switch (curve) {
+                case EcCurve.CURVE_25519 -> "CURVE_25519";
+                case EcCurve.P_224 -> "secp224r1";
+                case EcCurve.P_256 -> "secp256r1";
+                case EcCurve.P_384 -> "secp384r1";
+                case EcCurve.P_521 -> "secp521r1";
+                default -> throw new IllegalArgumentException("unknown curve");
+            };
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/KeyboxImitationHooks.java b/core/java/com/android/internal/util/crdroid/KeyboxImitationHooks.java
new file mode 100644
index 0000000000000..55b235a1cd46e
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/KeyboxImitationHooks.java
@@ -0,0 +1,224 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Paranoid Android
+ * SPDX-FileCopyrightText: 2025 Neoteric OS
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.internal.util.crdroid;
+
+import android.hardware.security.keymint.Algorithm;
+import android.hardware.security.keymint.KeyOrigin;
+import android.hardware.security.keymint.KeyParameter;
+import android.hardware.security.keymint.KeyParameterValue;
+import android.hardware.security.keymint.KeyPurpose;
+import android.hardware.security.keymint.Tag;
+import android.os.Binder;
+import android.system.keystore2.Authorization;
+import android.system.keystore2.IKeystoreSecurityLevel;
+import android.system.keystore2.KeyDescriptor;
+import android.system.keystore2.KeyEntryResponse;
+import android.system.keystore2.KeyMetadata;
+import android.util.Log;
+
+import com.android.internal.util.crdroid.KeyboxChainGenerator.KeyGenParameters;
+
+import java.security.cert.Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @hide
+ */
+public class KeyboxImitationHooks {
+
+    private static final String TAG = "KeyboxImitationHooks";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    public static KeyEntryResponse onGetKeyEntry(KeyDescriptor descriptor) {
+        if (!KeyProviderManager.isKeyboxAvailable()) {
+            return null;
+        }
+
+        KeyEntryResponse spoofed = KeyboxUtils.retrieve(Binder.getCallingUid(), descriptor.alias);
+        if (spoofed != null) {
+            dlog("Key entry spoofed");
+            return spoofed;
+        }
+
+        return null;
+    }
+
+    public static KeyMetadata generateKey(IKeystoreSecurityLevel level, KeyDescriptor descriptor, Collection<KeyParameter> args) {
+        if (!KeyProviderManager.isKeyboxAvailable()) {
+            return null;
+        }
+
+        KeyGenParameters params = new KeyGenParameters(args.toArray(new KeyParameter[args.size()]));
+
+        if (params.attestationChallenge == null) {
+            return null;
+        }
+
+        if (params.purpose == null || !params.purpose.contains(KeyPurpose.SIGN)) {
+            return null;
+        }
+
+        if (!params.noAuthRequired) {
+            return null;
+        }
+
+        if (params.algorithm != Algorithm.EC && params.algorithm != Algorithm.RSA) {
+            Log.w(TAG, "Unsupported algorithm: " + params.algorithm);
+            return null;
+        }
+
+        int uid = Binder.getCallingUid();
+        try {
+            List<Certificate> chain = KeyboxChainGenerator.generateCertChain(uid, descriptor, params);
+            if (chain == null || chain.isEmpty()) {
+                return null;
+            }
+            KeyEntryResponse response = buildResponse(level, chain, params, descriptor);
+            if (response == null) {
+                return null;
+            }
+            KeyboxUtils.append(uid, descriptor.alias, response);
+            return response.metadata;
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to generate key", e);
+            return null;
+        }
+    }
+
+    private static KeyEntryResponse buildResponse(
+            IKeystoreSecurityLevel level,
+            List<Certificate> chain,
+            KeyGenParameters params,
+            KeyDescriptor descriptor
+    ) {
+        try {
+            KeyEntryResponse response = new KeyEntryResponse();
+            KeyMetadata metadata = new KeyMetadata();
+            metadata.keySecurityLevel = params.securityLevel;
+
+            KeyboxUtils.putCertificateChain(metadata, chain.toArray(new Certificate[chain.size()]));
+
+            KeyDescriptor d = new KeyDescriptor();
+            d.domain = descriptor.domain;
+            d.nspace = descriptor.nspace;
+            metadata.key = d;
+
+            List<Authorization> authorizations = new ArrayList<>();
+            Authorization a;
+
+            for (Integer i : params.purpose) {
+                a = new Authorization();
+                a.keyParameter = new KeyParameter();
+                a.keyParameter.tag = Tag.PURPOSE;
+                a.keyParameter.value = KeyParameterValue.keyPurpose(i);
+                a.securityLevel = params.securityLevel;
+                authorizations.add(a);
+            }
+
+            for (Integer i : params.digest) {
+                a = new Authorization();
+                a.keyParameter = new KeyParameter();
+                a.keyParameter.tag = Tag.DIGEST;
+                a.keyParameter.value = KeyParameterValue.digest(i);
+                a.securityLevel = params.securityLevel;
+                authorizations.add(a);
+            }
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.ALGORITHM;
+            a.keyParameter.value = KeyParameterValue.algorithm(params.algorithm);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.KEY_SIZE;
+            a.keyParameter.value = KeyParameterValue.integer(params.keySize);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.EC_CURVE;
+            a.keyParameter.value = KeyParameterValue.ecCurve(params.ecCurve);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.NO_AUTH_REQUIRED;
+            a.keyParameter.value = KeyParameterValue.boolValue(true);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.ORIGIN;
+            a.keyParameter.value = KeyParameterValue.origin(params.origin);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.OS_VERSION;
+            a.keyParameter.value = KeyParameterValue.integer(params.osVersion);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.OS_PATCHLEVEL;
+            a.keyParameter.value = KeyParameterValue.integer(params.osPatchLevel);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.VENDOR_PATCHLEVEL;
+            a.keyParameter.value = KeyParameterValue.integer(params.vendorPatchLevel);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.BOOT_PATCHLEVEL;
+            a.keyParameter.value = KeyParameterValue.integer(params.bootPatchLevel);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.CREATION_DATETIME;
+            a.keyParameter.value = KeyParameterValue.longInteger(params.creationDateTime);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            a = new Authorization();
+            a.keyParameter = new KeyParameter();
+            a.keyParameter.tag = Tag.USER_ID;
+            a.keyParameter.value = KeyParameterValue.integer(params.userId);
+            a.securityLevel = params.securityLevel;
+            authorizations.add(a);
+
+            metadata.authorizations = authorizations.toArray(new Authorization[0]);
+            metadata.modificationTimeMs = System.currentTimeMillis();
+            response.metadata = metadata;
+            response.iSecurityLevel = level;
+            return response;
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to build key entry response", e);
+            return null;
+        }
+    }
+
+    private static void dlog(String msg) {
+        if (DEBUG) Log.d(TAG, msg);
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/KeyboxUtils.java b/core/java/com/android/internal/util/crdroid/KeyboxUtils.java
new file mode 100644
index 0000000000000..bb4205bdeaa18
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/KeyboxUtils.java
@@ -0,0 +1,158 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Neoteric OS
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.internal.util.crdroid;
+
+import android.security.keystore.KeyProperties;
+import android.system.keystore2.KeyEntryResponse;
+import android.system.keystore2.KeyMetadata;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+import com.android.internal.org.bouncycastle.asn1.ASN1Primitive;
+import com.android.internal.org.bouncycastle.asn1.DERNull;
+import com.android.internal.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+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.X9ObjectIdentifiers;
+import com.android.internal.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import com.android.internal.org.bouncycastle.cert.X509CertificateHolder;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+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.concurrent.ConcurrentHashMap;
+
+/**
+ * @hide
+ */
+public class KeyboxUtils {
+
+    private static final ConcurrentHashMap<Key, KeyEntryResponse> response = new ConcurrentHashMap<>();
+    public static record Key(int uid, String alias) {}
+
+    public static byte[] decodePemOrBase64(String input) {
+        String base64 = input
+                .replaceAll("-----BEGIN [^-]+-----", "")
+                .replaceAll("-----END [^-]+-----", "")
+                .replaceAll("\\s+", "");
+        return Base64.getDecoder().decode(base64);
+    }
+
+    public static PrivateKey parsePrivateKey(String encodedKey, String algorithm) throws Exception {
+        byte[] keyBytes = decodePemOrBase64(encodedKey);
+        ASN1Primitive primitive = ASN1Primitive.fromByteArray(keyBytes);
+        if ("EC".equalsIgnoreCase(algorithm)) {
+            try {
+                // Try parsing as PKCS#8
+                PrivateKeyInfo info = PrivateKeyInfo.getInstance(primitive);
+                return KeyFactory.getInstance("EC").generatePrivate(new PKCS8EncodedKeySpec(info.getEncoded()));
+            } catch (Exception e) {
+                // Possibly SEC1 / PKCS#1 EC
+                ASN1Sequence seq = ASN1Sequence.getInstance(primitive);
+                ECPrivateKey ecPrivateKey = ECPrivateKey.getInstance(seq);
+                AlgorithmIdentifier algId = new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, ecPrivateKey.getParameters());
+                PrivateKeyInfo privInfo = new PrivateKeyInfo(algId, ecPrivateKey);
+                PKCS8EncodedKeySpec pkcs8Spec = new PKCS8EncodedKeySpec(privInfo.getEncoded());
+                return KeyFactory.getInstance("EC").generatePrivate(pkcs8Spec);
+            }
+        } else if ("RSA".equalsIgnoreCase(algorithm)) {
+            try {
+                // Try parsing as PKCS#8
+                return KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
+            } catch (Exception e) {
+                // Parse as PKCS#1
+                RSAPrivateKey rsaKey = RSAPrivateKey.getInstance(primitive);
+                AlgorithmIdentifier algId = new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE);
+                PrivateKeyInfo privInfo = new PrivateKeyInfo(algId, rsaKey);
+                PKCS8EncodedKeySpec pkcs8Spec = new PKCS8EncodedKeySpec(privInfo.getEncoded());
+                return KeyFactory.getInstance("RSA").generatePrivate(pkcs8Spec);
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported algorithm: " + algorithm);
+        }
+    }
+
+    public static X509Certificate parseCertificate(String encodedCert) throws Exception {
+        byte[] certBytes = decodePemOrBase64(encodedCert);
+        return (X509Certificate) CertificateFactory
+                .getInstance("X.509")
+                .generateCertificate(new ByteArrayInputStream(certBytes));
+    }
+
+    public static List<Certificate> getCertificateChain(String algorithm) throws Exception {
+        IKeyboxProvider provider = KeyProviderManager.getProvider();
+        String[] certChainPem = KeyProperties.KEY_ALGORITHM_EC.equals(algorithm)
+                ? provider.getEcCertificateChain()
+                : provider.getRsaCertificateChain();
+
+        CertificateFactory factory = CertificateFactory.getInstance("X.509");
+        List<Certificate> certs = new ArrayList<>();
+
+        for (String certPem : certChainPem) {
+            certs.add(parseCertificate(certPem));
+        }
+
+        return certs;
+    }
+
+    public static void putCertificateChain(KeyEntryResponse response, Certificate[] chain) throws Exception {
+        putCertificateChain(response.metadata, chain);
+    }
+
+    public static void putCertificateChain(KeyMetadata metadata, Certificate[] chain) throws Exception {
+        metadata.certificate = chain[0].getEncoded();
+        var output = new ByteArrayOutputStream();
+        for (int i = 1; i < chain.length; i++) {
+            output.write(chain[i].getEncoded());
+        }
+        metadata.certificateChain = output.toByteArray();
+    }
+
+    public static X509Certificate getCertificateFromHolder(X509CertificateHolder holder) throws Exception {
+        CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+        ByteArrayInputStream in = new ByteArrayInputStream(holder.getEncoded());
+        return (X509Certificate) certFactory.generateCertificate(in);
+    }
+
+    public static PrivateKey getPrivateKey(String algorithm) throws Exception {
+        IKeyboxProvider provider = KeyProviderManager.getProvider();
+        String privateKeyEncoded = KeyProperties.KEY_ALGORITHM_EC.equals(algorithm)
+                ? provider.getEcPrivateKey()
+                : provider.getRsaPrivateKey();
+
+        return parsePrivateKey(privateKeyEncoded, algorithm);
+    }
+
+    public static X509CertificateHolder getCertificateHolder(String algorithm) throws Exception {
+        IKeyboxProvider provider = KeyProviderManager.getProvider();
+        String certPem = KeyProperties.KEY_ALGORITHM_EC.equals(algorithm)
+                ? provider.getEcCertificateChain()[0]
+                : provider.getRsaCertificateChain()[0];
+
+        X509Certificate parsedCert = parseCertificate(certPem);
+        return new X509CertificateHolder(parsedCert.getEncoded());
+    }
+
+    public static void append(int uid, String a, KeyEntryResponse c) {
+        response.put(new Key(uid, a), c);
+    }
+
+    public static void remove(int uid, String a) {
+        response.remove(new Key(uid, a));
+    }
+
+    public static KeyEntryResponse retrieve(int uid, String a) {
+        return response.get(new Key(uid, a));
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/OmniJawsClient.java b/core/java/com/android/internal/util/crdroid/OmniJawsClient.java
new file mode 100644
index 0000000000000..f0ad0729c2a8f
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/OmniJawsClient.java
@@ -0,0 +1,407 @@
+/*
+ * 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.crdroid;
+
+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 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"
+    };
+
+    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);
+                    } 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);
+        }
+
+        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 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 + "]";
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/OnTheGoUtils.java b/core/java/com/android/internal/util/crdroid/OnTheGoUtils.java
new file mode 100644
index 0000000000000..8823dfbf768cc
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/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.crdroid;
+
+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/crdroid/PixelPropsUtils.java b/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
new file mode 100644
index 0000000000000..7629279bb08be
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
@@ -0,0 +1,492 @@
+/*
+ * Copyright (C) 2020 The Pixel Experience Project
+ *               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.internal.util.crdroid;
+
+import android.app.ActivityThread;
+import android.app.Application;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Environment;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.internal.R;
+import com.android.internal.util.crdroid.KeyProviderManager;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @hide
+ */
+public final class PixelPropsUtils {
+
+    private static final String TAG = PixelPropsUtils.class.getSimpleName();
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final String DATA_FILE = "gms_certified_props.json";
+
+    private static final Map<String, Object> propsToChangeGeneric = new HashMap<>();
+    private static final Map<String, Object> propsToChangePixel10ProXL = new HashMap<>();
+    private static final Map<String, Object> propsToChangePixelTablet = new HashMap<>();
+    private static final Map<String, Object> propsToChangePixelXL = new HashMap<>();
+    private static final Map<String, Object> propsToChangeROG6 = new HashMap<>();
+    private static final Map<String, Object> propsToChangeROG6D = new HashMap<>();
+    private static final Map<String, Object> propsToChangeLenovoY700 = new HashMap<>();
+    private static final Map<String, Object> propsToChangeOP8P = new HashMap<>();
+    private static final Map<String, Object> propsToChangeOP9P = new HashMap<>();
+    private static final Map<String, Object> propsToChangeMI11TP = new HashMap<>();
+    private static final Map<String, Object> propsToChangeMI13P = new HashMap<>();
+    private static final Map<String, Object> propsToChangeF5 = new HashMap<>();
+    private static final Map<String, Object> propsToChangeBS4 = new HashMap<>();
+    private static final Map<String, Object> propsToChangeS24U = new HashMap<>();
+
+    private static final ArraySet<String> PKGS_RECENT_PIXEL = new ArraySet<>(); // Pixel device
+    private static final ArraySet<String> PKGS_ROG6 = new ArraySet<>(); // ROG Phone 6
+    private static final ArraySet<String> PKGS_ROG6D = new ArraySet<>(); // ROG Phone 6D
+    private static final ArraySet<String> PKGS_LENOVOY700 = new ArraySet<>(); // Lenovo Y700
+    private static final ArraySet<String> PKGS_OP8P = new ArraySet<>(); // OnePlus 8 Pro
+    private static final ArraySet<String> PKGS_OP9P = new ArraySet<>(); //  OnePlus 9 Pro
+    private static final ArraySet<String> PKGS_MI11TP = new ArraySet<>(); // Mi 11T Pro
+    private static final ArraySet<String> PKGS_MI13P = new ArraySet<>(); // Xiaomi 13 Pro
+    private static final ArraySet<String> PKGS_F5 = new ArraySet<>(); // POCO F5
+    private static final ArraySet<String> PKGS_BS4 = new ArraySet<>(); // Black Shark 4
+    private static final ArraySet<String> PKGS_S24U = new ArraySet<>(); // Samsung S24 Ultra
+
+    static {
+        Collections.addAll(PKGS_RECENT_PIXEL,
+            "com.google.android.aicore",
+            "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.nexuslauncher",
+            "com.google.android.apps.photos",
+            "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.wallpaper",
+            "com.google.android.apps.wallpaper.pixel",
+            "com.google.android.apps.weather",
+            "com.google.android.gms",
+            "com.google.android.googlequicksearchbox",
+            "com.google.android.pcs",
+            "com.google.android.settings.intelligence",
+            "com.google.android.wallpaper.effects",
+            "com.google.pixel.livewallpaper",
+            "com.netflix.mediaclient",
+            "com.nhs.online.nhsonline"
+        );
+
+        Collections.addAll(PKGS_ROG6,
+            "com.ea.gp.fifamobile",
+            "com.gameloft.android.ANMP.GloftA9HM",
+            "com.madfingergames.legends",
+            "com.pearlabyss.blackdesertm",
+            "com.pearlabyss.blackdesertm.gl"
+        );
+
+        Collections.addAll(PKGS_ROG6D,
+            "com.proxima.dfm"
+        );
+
+        Collections.addAll(PKGS_LENOVOY700,
+            "com.activision.callofduty.shooter",
+            "com.garena.game.codm",
+            "com.tencent.tmgp.kr.codm",
+            "com.vng.codmvn"
+        );
+
+        Collections.addAll(PKGS_OP8P,
+            "com.netease.lztgglobal",
+            "com.riotgames.league.wildrift",
+            "com.riotgames.league.wildrifttw",
+            "com.riotgames.league.wildriftvn",
+            "com.riotgames.league.teamfighttactics",
+            "com.riotgames.league.teamfighttacticstw",
+            "com.riotgames.league.teamfighttacticsvn"
+        );
+
+        Collections.addAll(PKGS_OP9P,
+            "com.epicgames.fortnite",
+            "com.epicgames.portal",
+            "com.tencent.lolm"
+        );
+
+        Collections.addAll(PKGS_MI11TP,
+            "com.ea.gp.apexlegendsmobilefps",
+            "com.levelinfinite.hotta.gp",
+            "com.supercell.clashofclans",
+            "com.vng.mlbbvn"
+        );
+
+        Collections.addAll(PKGS_MI13P,
+            "com.levelinfinite.sgameGlobal",
+            "com.tencent.tmgp.sgame"
+        );
+
+        Collections.addAll(PKGS_F5,
+            "com.dts.freefiremax",
+            "com.dts.freefireth",
+            "com.mobile.legends"
+        );
+
+        Collections.addAll(PKGS_BS4,
+            "com.proximabeta.mf.uamo"
+        );
+
+        Collections.addAll(PKGS_S24U,
+            "com.blizzard.diablo.immortal",
+            "com.pubg.imobile",
+            "com.pubg.krmobile",
+            "com.rekoo.pubgm",
+            "com.tencent.ig",
+            "com.tencent.tmgp.pubgmhd",
+            "com.vng.pubgmobile"
+        );
+
+        propsToChangeGeneric.put("TYPE", "user");
+        propsToChangeGeneric.put("TAGS", "release-keys");
+        propsToChangePixel10ProXL.put("BRAND", "google");
+        propsToChangePixel10ProXL.put("MANUFACTURER", "Google");
+        propsToChangePixel10ProXL.put("DEVICE", "mustang");
+        propsToChangePixel10ProXL.put("PRODUCT", "mustang");
+        propsToChangePixel10ProXL.put("HARDWARE", "mustang");
+        propsToChangePixel10ProXL.put("MODEL", "Pixel 10 Pro XL");
+        propsToChangePixel10ProXL.put("ID", "BP4A.251205.006");
+        propsToChangePixel10ProXL.put("FINGERPRINT", "google/mustang/mustang:16/BP4A.251205.006/14401865:user/release-keys");
+        propsToChangePixelTablet.put("BRAND", "google");
+        propsToChangePixelTablet.put("MANUFACTURER", "Google");
+        propsToChangePixelTablet.put("DEVICE", "tangorpro");
+        propsToChangePixelTablet.put("PRODUCT", "tangorpro");
+        propsToChangePixelTablet.put("HARDWARE", "tangorpro");
+        propsToChangePixelTablet.put("MODEL", "Pixel Tablet");
+        propsToChangePixelTablet.put("ID", "BP4A.251205.006");
+        propsToChangePixelTablet.put("FINGERPRINT", "google/tangorpro/tangorpro:16/BP4A.251205.006/14401865:user/release-keys");
+        propsToChangePixelXL.put("BRAND", "google");
+        propsToChangePixelXL.put("MANUFACTURER", "Google");
+        propsToChangePixelXL.put("DEVICE", "marlin");
+        propsToChangePixelXL.put("PRODUCT", "marlin");
+        propsToChangePixelXL.put("HARDWARE", "marlin");
+        propsToChangePixelXL.put("MODEL", "Pixel XL");
+        propsToChangePixelXL.put("ID", "QP1A.191005.007.A3");
+        propsToChangePixelXL.put("FINGERPRINT", "google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys");
+        propsToChangeROG6.put("BRAND", "asus");
+        propsToChangeROG6.put("MANUFACTURER", "asus");
+        propsToChangeROG6.put("DEVICE", "AI2201");
+        propsToChangeROG6.put("MODEL", "ASUS_AI2201");
+        propsToChangeROG6D.put("BRAND", "asus");
+        propsToChangeROG6D.put("MANUFACTURER", "asus");
+        propsToChangeROG6D.put("DEVICE", "AI2203_C");
+        propsToChangeROG6D.put("MODEL", "ASUS_AI2203_C");
+        propsToChangeLenovoY700.put("MODEL", "Lenovo TB-9707F");
+        propsToChangeLenovoY700.put("MANUFACTURER", "lenovo");
+        propsToChangeOP8P.put("MODEL", "IN2020");
+        propsToChangeOP8P.put("MANUFACTURER", "OnePlus");
+        propsToChangeOP9P.put("MODEL", "LE2123");
+        propsToChangeOP9P.put("MANUFACTURER", "OnePlus");
+        propsToChangeMI11TP.put("MODEL", "2107113SI");
+        propsToChangeMI11TP.put("MANUFACTURER", "Xiaomi");
+        propsToChangeMI13P.put("BRAND", "Xiaomi");
+        propsToChangeMI13P.put("MANUFACTURER", "Xiaomi");
+        propsToChangeMI13P.put("MODEL", "2210132C");
+        propsToChangeF5.put("MODEL", "23049PCD8G");
+        propsToChangeF5.put("MANUFACTURER", "Xiaomi");
+        propsToChangeBS4.put("MODEL", "2SM-X706B");
+        propsToChangeBS4.put("MANUFACTURER", "blackshark");
+        propsToChangeS24U.put("BRAND", "samsung");
+        propsToChangeS24U.put("MANUFACTURER", "samsung");
+        propsToChangeS24U.put("MODEL", "SM-S928B");
+    }
+
+    private static volatile List<String> sCertifiedProps;
+    private static volatile long sCertPropsMtime = -1;
+
+    public static void setProps(Context context) {
+        final String packageName = context.getPackageName();
+        if (packageName == null || packageName.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Null received in setProps.");
+            return;
+        }
+
+        if (android.os.Process.isIsolated()) {
+            if (DEBUG) Log.d(TAG, "Skipping setProps in isolated process");
+            return;
+        }
+
+        propsToChangeGeneric.forEach((k, v) -> setPropValue(k, v));
+
+        if (PKGS_RECENT_PIXEL.contains(packageName)) {
+            Map<String,Object> propsToChange = null;
+
+            if (packageName.equals("com.google.android.apps.photos")) {
+                if (Settings.Secure.getInt(context.getContentResolver(),
+                        Settings.Secure.PI_PHOTOS_SPOOF, 1) == 1) {
+                    if (DEBUG) Log.d(TAG, "Gphotos spoofing disabled by setting");
+                    propsToChange = propsToChangePixelXL;
+                }
+            } else if (packageName.equals("com.netflix.mediaclient") &&
+                        Settings.Secure.getInt(context.getContentResolver(),
+                        Settings.Secure.PI_NETFLIX_SPOOF, 0) != 1) {
+                    if (DEBUG) Log.d(TAG, "Netflix spoofing disabled by setting");
+                    return;
+            } else if (packageName.equals("com.google.android.gms")) {
+                final String processName = Application.getProcessName().toLowerCase();
+                if (processName.contains("unstable")) {
+                    spoofBuildGms(context);
+                    return;
+                }
+                return;
+            } else if (packageName.equals("com.google.android.settings.intelligence")) {
+                setPropValue("FINGERPRINT", Build.VERSION.INCREMENTAL);
+                return;
+            } else {
+                if (isDeviceTablet(context.getApplicationContext())) {
+                    propsToChange = propsToChangePixelTablet;
+                } else {
+                    propsToChange = propsToChangePixel10ProXL;
+                }
+            }
+
+            if (propsToChange != null) {
+                if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
+                applyProps(propsToChange);
+            }
+        } else if (isGamePackage(packageName)) {
+            if (Settings.Secure.getInt(context.getContentResolver(),
+                    Settings.Secure.PI_GAMES_SPOOF, 0) != 1)
+                return;
+
+            Map<String,Object> propsToChange = null;
+
+            if (PKGS_ROG6.contains(packageName)) {
+                propsToChange = propsToChangeROG6;
+            } else if (PKGS_ROG6D.contains(packageName)) {
+                propsToChange = propsToChangeROG6D;
+            } else if (PKGS_LENOVOY700.contains(packageName)) {
+                propsToChange = propsToChangeLenovoY700;
+            } else if (PKGS_OP8P.contains(packageName)) {
+                propsToChange = propsToChangeOP8P;
+            } else if (PKGS_OP9P.contains(packageName)) {
+                propsToChange = propsToChangeOP9P;
+            } else if (PKGS_MI11TP.contains(packageName)) {
+                propsToChange = propsToChangeMI11TP;
+            } else if (PKGS_MI13P.contains(packageName)) {
+                propsToChange = propsToChangeMI13P;
+            } else if (PKGS_F5.contains(packageName)) {
+                propsToChange = propsToChangeF5;
+            } else if (PKGS_BS4.contains(packageName)) {
+                propsToChange = propsToChangeBS4;
+            } else if (PKGS_S24U.contains(packageName)) {
+                propsToChange = propsToChangeS24U;
+            }
+
+            if (propsToChange != null) {
+                if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
+                applyProps(propsToChange);
+            }
+        }
+    }
+
+    private static boolean isGamePackage(String pkg) {
+        return PKGS_ROG6.contains(pkg)
+            || PKGS_ROG6D.contains(pkg)
+            || PKGS_LENOVOY700.contains(pkg)
+            || PKGS_OP8P.contains(pkg)
+            || PKGS_OP9P.contains(pkg)
+            || PKGS_MI11TP.contains(pkg)
+            || PKGS_MI13P.contains(pkg)
+            || PKGS_F5.contains(pkg)
+            || PKGS_BS4.contains(pkg)
+            || PKGS_S24U.contains(pkg);
+    }
+
+    private static void applyProps(Map<String,Object> props) {
+      for (Map.Entry<String,Object> e : props.entrySet())
+        setPropValue(e.getKey(), e.getValue());
+    }
+
+    private static boolean isDeviceTablet(Context context) {
+        if (context == null) {
+            if (DEBUG) Log.d(TAG, "Null received in isDeviceTablet.");
+            return false;
+        }
+        Configuration config = context.getResources().getConfiguration();
+        boolean isTablet = (config.smallestScreenWidthDp >= 600);
+        return isTablet;
+    }
+
+    private static void setPropValue(String key, Object value) {
+        setPropValue(key, String.valueOf(value));
+    }
+
+    private static void setPropValue(String key, String value) {
+        try {
+            if (DEBUG) Log.d(TAG, "Defining prop " + key + " to " + value);
+            Class<?> clazz = Build.class;
+            if (key.startsWith("VERSION.")) {
+                clazz = Build.VERSION.class;
+                key = key.substring(8);
+            }
+            Field field = clazz.getDeclaredField(key);
+            field.setAccessible(true);
+            // Determine the field type and parse the value accordingly.
+            if (field.getType().equals(Integer.TYPE)) {
+                field.set(null, Integer.parseInt(value));
+            } else if (field.getType().equals(Long.TYPE)) {
+                field.set(null, Long.parseLong(value));
+            } else {
+                field.set(null, value);
+            }
+            field.setAccessible(false);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to set prop " + key, e);
+        }
+    }
+
+    private static void spoofBuildGms(Context context) {
+        if (Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.PI_ENABLE_SPOOF, 1) != 1) {
+            if (DEBUG) Log.d(TAG, "GMS spoofing disabled by setting");
+            return;
+        }
+
+        File dataFile = new File(Environment.getDataSystemDirectory(), DATA_FILE);
+        long mtime = dataFile.exists() ? dataFile.lastModified() : -1;
+
+        if (mtime == sCertPropsMtime && sCertifiedProps != null && !sCertifiedProps.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "New certification props not found, applying existing ones");
+            applyCertifiedProps();
+            return;
+        }
+
+        String savedProps = readFromFile(dataFile);
+        List<String> fresh = new ArrayList<>();
+        if (TextUtils.isEmpty(savedProps)) {
+            if (DEBUG) Log.d(TAG, "Certification props not available! Not applied.");
+            return;
+        }
+        if (DEBUG) Log.d(TAG, "Parsing props fetched by attestation service");
+        try {
+            JSONObject parsedProps = new JSONObject(savedProps);
+            Iterator<String> keys = parsedProps.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                String value = parsedProps.getString(key);
+                fresh.add(key + ":" + value);
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "Error parsing JSON data", e);
+            return;
+        }
+        sCertifiedProps = new ArrayList<>(fresh);
+        sCertPropsMtime = mtime;
+        if (sCertifiedProps != null && !sCertifiedProps.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "New certification props found, applying new ones");
+            applyCertifiedProps();
+        }
+    }
+
+    private static void applyCertifiedProps() {
+        for (String entry : sCertifiedProps) {
+            String[] kv = entry.split(":", 2);
+            if (kv.length == 2) setPropValue(kv[0], kv[1]);
+        }
+    }
+
+    private static String readFromFile(File file) {
+        StringBuilder content = new StringBuilder();
+
+        if (file.exists()) {
+            try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+                String line;
+
+                while ((line = reader.readLine()) != null) {
+                    content.append(line);
+                }
+            } catch (IOException e) {
+                Log.e(TAG, "Error reading from file", e);
+            }
+        }
+        return content.toString();
+    }
+
+    private static boolean isCallerSafetyNet() {
+        for (StackTraceElement e : Thread.currentThread().getStackTrace()) {
+            final String cn = e.getClassName();
+            if (cn != null && (cn.contains("DroidGuard") || cn.contains("droidguard"))) return true;
+        }
+        return false;
+    }
+
+    public static void onEngineGetCertificateChain() {
+        if (android.os.Process.isIsolated()) {
+            if (DEBUG) Log.d(TAG, "Skipping onEngineGetCertificateChain in isolated process");
+            return;
+        }
+
+        Context context = ActivityThread.currentApplication() != null
+                ? ActivityThread.currentApplication().getApplicationContext()
+                : null;
+        if (context == null) {
+            if (DEBUG) Log.d(TAG, "Null received in onEngineGetCertificateChain.");
+            return;
+        }
+
+        boolean isKeyBoxAvailable = KeyProviderManager.isKeyboxAvailable();
+
+        if (!isKeyBoxAvailable && Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.PI_ENABLE_SPOOF, 1) != 1) {
+            if (DEBUG) Log.d(TAG, "onEngineGetCertificateChain disabled by setting");
+            return;
+        }
+
+        // If a keybox is found, don't block key attestation
+        if (isKeyBoxAvailable && Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.PI_GMS_CERT_CHAIN, 0) == 1) {
+            Log.i(TAG, "Key attestation blocking is disabled because a keybox is defined to spoof");
+            return;
+        }
+
+        // Check stack for SafetyNet
+        if (isCallerSafetyNet()) {
+            Log.i(TAG, "Blocked key attestation");
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/ThemeUtils.java b/core/java/com/android/internal/util/crdroid/ThemeUtils.java
new file mode 100644
index 0000000000000..f898586bfbec3
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/ThemeUtils.java
@@ -0,0 +1,234 @@
+/*
+ * 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.crdroid;
+
+import static android.os.UserHandle.USER_SYSTEM;
+
+import android.util.PathParser;
+
+import android.content.ContentResolver;
+import android.content.Context;
+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.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.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 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 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));
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/Utils.java b/core/java/com/android/internal/util/crdroid/Utils.java
new file mode 100644
index 0000000000000..9ae9143e2745f
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/Utils.java
@@ -0,0 +1,133 @@
+/*
+ * 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.crdroid;
+
+import android.app.ActivityThread;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+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 com.android.internal.statusbar.IStatusBarService;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Utils {
+
+    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 List<String> launchablePackages(Context context) {
+        List<String> list = new ArrayList<>();
+
+        Intent filter = new Intent(Intent.ACTION_MAIN, null);
+        filter.addCategory(Intent.CATEGORY_LAUNCHER);
+
+        List<ResolveInfo> apps = context.getPackageManager().queryIntentActivities(filter,
+                PackageManager.GET_META_DATA);
+
+        int numPackages = apps.size();
+        for (int i = 0; i < numPackages; i++) {
+            ResolveInfo app = apps.get(i);
+            list.add(app.activityInfo.packageName);
+        }
+
+        return list;
+    }
+
+    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 boolean ambientAod() {
+        try {
+            Context ctx = ActivityThread.currentApplication() != null
+                    ? ActivityThread.currentApplication().getApplicationContext()
+                    : null;
+            if (ctx == null) return false;
+            return Settings.Secure.getIntForUser(ctx.getContentResolver(),
+                Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED,
+                ctx.getResources().getBoolean(
+                    com.android.internal.R.bool.config_dozeSupportsAodWallpaper) ? 1 : 0,
+                UserHandle.USER_CURRENT) == 1;
+        } catch (Throwable t) {
+            return false;
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/crdroid/cutout/CutoutFullscreenController.java b/core/java/com/android/internal/util/crdroid/cutout/CutoutFullscreenController.java
new file mode 100644
index 0000000000000..6dcd7034f311a
--- /dev/null
+++ b/core/java/com/android/internal/util/crdroid/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.crdroid.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/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index e2a2be596fefc..d3680623f2977 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 2a10918a51619..4f9cc88aacdc3 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/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 2ae2e1865c033..5412f118703e6 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -68,6 +68,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;
@@ -106,6 +118,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;
 
     /*
@@ -157,8 +170,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);
@@ -410,7 +431,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);
 
@@ -439,6 +459,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);
@@ -476,6 +511,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)
 {
@@ -851,7 +936,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));
@@ -1140,6 +1243,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;",
@@ -1199,6 +1306,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");
@@ -1218,6 +1346,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 01c18e4bb4771..ddb65651d6076 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -1029,6 +1029,7 @@ static void convertAudioGainConfigToNative(JNIEnv *env,
     int *nValues = env->GetIntArrayElements(jValues, NULL);
     size_t size = env->GetArrayLength(jValues);
     memcpy(nAudioGainConfig->values, nValues, size * sizeof(int));
+    env->ReleaseIntArrayElements(jValues, nValues, JNI_ABORT);
     env->DeleteLocalRef(jValues);
 }
 
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index 7fdece910bab8..22c333591eb4e 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -123,6 +123,7 @@ bool FileDescriptorAllowlist::IsAllowed(const std::string& path) const {
     static const char* kSystemSystemExtOverlayDir = "/system/system_ext/overlay/";
     static const char* kSystemExtOverlayDir = "/system_ext/overlay";
     static const char* kSystemOdmOverlayDir = "/system/odm/overlay";
+    static const char* kVendorOdmOverlayDir = "/vendor/odm/overlay";
     static const char* kOdmOverlayDir = "/odm/overlay";
     static const char* kSystemOemOverlayDir = "/system/oem/overlay";
     static const char* kOemOverlayDir = "/oem/overlay";
@@ -136,6 +137,7 @@ bool FileDescriptorAllowlist::IsAllowed(const std::string& path) const {
          android::base::StartsWith(path, kSystemSystemExtOverlayDir) ||
          android::base::StartsWith(path, kSystemExtOverlayDir) ||
          android::base::StartsWith(path, kSystemOdmOverlayDir) ||
+         android::base::StartsWith(path, kVendorOdmOverlayDir) ||
          android::base::StartsWith(path, kOdmOverlayDir) ||
          android::base::StartsWith(path, kSystemOemOverlayDir) ||
          android::base::StartsWith(path, kOemOverlayDir)) &&
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1dd541f5baffc..7b6234d7f4896 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" />
@@ -867,6 +868,14 @@
     <!-- Used for long press power torch feature - automatic turn off on timeout -->
     <protected-broadcast android:name="com.android.server.policy.PhoneWindowManager.ACTION_TORCH_OFF" />
 
+    <!-- GameSpace -->
+    <protected-broadcast android:name="io.chaldeaprjkt.gamespace.action.GAME_START" />
+    <protected-broadcast android:name="io.chaldeaprjkt.gamespace.action.GAME_STOP" />
+
+    <!-- App lock -->
+    <protected-broadcast android:name="com.android.server.app.AppLockManagerService.APP_LOCK_TIMEOUT" />
+    <protected-broadcast android:name="android.app.action.UNLOCK_APP" />
+
     <!-- ====================================================================== -->
     <!--                          RUNTIME PERMISSIONS                           -->
     <!-- ====================================================================== -->
@@ -948,6 +957,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                              -->
     <!-- ====================================================================== -->
@@ -9202,6 +9215,11 @@
         android:protectionLevel="internal|role"
         android:featureFlag="com.android.window.flags.enable_window_repositioning_api" />
 
+    <!-- Allows an application to manage app lock
+         @hide -->
+    <permission android:name="android.permission.MANAGE_APP_LOCK"
+                android:protectionLevel="signature|privileged" />
+
     <!-- Attribution for Geofencing service. -->
     <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>
     <!-- Attribution for Country Detector. -->
@@ -9235,7 +9253,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/shade_panel_bg_color.xml b/core/res/res/color-night/shade_panel_bg_color.xml
index b43bcb5a676f8..1b9ebbe8105d7 100644
--- a/core/res/res/color-night/shade_panel_bg_color.xml
+++ b/core/res/res/color-night/shade_panel_bg_color.xml
@@ -15,6 +15,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500"
+    <item android:color="@android:color/system_neutral1_800"
           android:lStar="4" android:alpha="0.32"/>
 </selector>
diff --git a/core/res/res/color-night/shade_panel_fg_color.xml b/core/res/res/color-night/shade_panel_fg_color.xml
index 1bde31999e35d..ac9be20c98885 100644
--- a/core/res/res/color-night/shade_panel_fg_color.xml
+++ b/core/res/res/color-night/shade_panel_fg_color.xml
@@ -15,6 +15,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_accent1_800"
+    <item android:color="@android:color/system_accent1_600"
           android:alpha="0.32"/>
 </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/color/shade_panel_bg_color.xml b/core/res/res/color/shade_panel_bg_color.xml
index b5678f982c7fd..899176d171818 100644
--- a/core/res/res/color/shade_panel_bg_color.xml
+++ b/core/res/res/color/shade_panel_bg_color.xml
@@ -15,6 +15,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500"
+    <item android:color="@android:color/system_neutral1_100"
           android:lStar="98" android:alpha="0.32"/>
 </selector>
diff --git a/core/res/res/color/shade_panel_fg_color.xml b/core/res/res/color/shade_panel_fg_color.xml
index 7080008a0821a..7e8f2a6893a3d 100644
--- a/core/res/res/color/shade_panel_fg_color.xml
+++ b/core/res/res/color/shade_panel_fg_color.xml
@@ -15,6 +15,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_accent1_100"
+    <item android:color="@android:color/system_accent1_200"
           android:alpha="0.32"/>
 </selector>
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_wifi_signal_0.xml b/core/res/res/drawable/ic_wifi_signal_0.xml
index cab8be3d34820..7f98457a4c768 100644
--- a/core/res/res/drawable/ic_wifi_signal_0.xml
+++ b/core/res/res/drawable/ic_wifi_signal_0.xml
@@ -1,25 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2025 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
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+          http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:color/white"
-      android:pathData="M12,4c3.42,0,6.73,1.27,9.3,3.53L12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39 C21.03,4.08,16.75,2,12,2L12,2z" />
-</vector>
\ No newline at end of file
+    android:width="17.0dp"
+    android:height="12.58dp"
+    android:viewportHeight="12.0"
+    android:viewportWidth="16.21">
+
+    <path
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M12.659,7.45C13.199,6.91 13.149,6.01 12.479,5.64C11.179,4.92 9.689,4.51 8.109,4.51C6.529,4.51 5.029,4.92 3.739,5.64C3.069,6.01 3.019,6.91 3.559,7.45C3.999,7.89 4.699,7.94 5.259,7.66C6.119,7.24 7.089,7 8.109,7C9.129,7 10.099,7.24 10.959,7.66C11.519,7.94 12.219,7.89 12.659,7.45Z" />
+
+    <path
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M15.85,4.26C16.36,3.75 16.34,2.91 15.76,2.49C13.61,0.93 10.97,0 8.11,0C5.25,0 2.61,0.92 0.46,2.49C-0.12,2.91 -0.14,3.75 0.37,4.26C0.84,4.73 1.59,4.75 2.13,4.37C3.83,3.19 5.89,2.5 8.11,2.5C10.33,2.5 12.39,3.19 14.09,4.37C14.63,4.75 15.38,4.73 15.85,4.26Z" />
+
+    <path
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M8.109,12C8.938,12 9.609,11.328 9.609,10.5C9.609,9.672 8.938,9 8.109,9C7.281,9 6.609,9.672 6.609,10.5C6.609,11.328 7.281,12 8.109,12Z" />
+
+</vector>
diff --git a/core/res/res/drawable/ic_wifi_signal_1.xml b/core/res/res/drawable/ic_wifi_signal_1.xml
index 54b68aeaaaee3..9c661f4b5d7af 100644
--- a/core/res/res/drawable/ic_wifi_signal_1.xml
+++ b/core/res/res/drawable/ic_wifi_signal_1.xml
@@ -1,28 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2025 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
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+          http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:width="17.0dp"
+    android:height="12.58dp"
+    android:viewportHeight="12.0"
+    android:viewportWidth="16.21">
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2.01c-4.75,0-9.03,2.08-12,5.39L12,22L24,7.4C21.03,4.09,16.75,2.01,12,2.01z M12,18.86L2.7,7.54 C5.27,5.28,8.58,4.01,12,4.01s6.73,1.27,9.3,3.53L12,18.86z" />
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M12.659,7.45C13.199,6.91 13.149,6.01 12.479,5.64C11.179,4.92 9.689,4.51 8.109,4.51C6.529,4.51 5.029,4.92 3.739,5.64C3.069,6.01 3.019,6.91 3.559,7.45C3.999,7.89 4.699,7.94 5.259,7.66C6.119,7.24 7.089,7 8.109,7C9.129,7 10.099,7.24 10.959,7.66C11.519,7.94 12.219,7.89 12.659,7.45Z" />
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M16.42,16.63L12,22l-4.42-5.37c0.15-0.74,0.48-1.43,0.95-1.99C9.35,13.64,10.6,13,12,13s2.65,0.64,3.47,1.64 C15.94,15.2,16.27,15.89,16.42,16.63z" />
-</vector>
\ No newline at end of file
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M15.85,4.26C16.36,3.75 16.34,2.91 15.76,2.49C13.61,0.93 10.97,0 8.11,0C5.25,0 2.61,0.92 0.46,2.49C-0.12,2.91 -0.14,3.75 0.37,4.26C0.84,4.73 1.59,4.75 2.13,4.37C3.83,3.19 5.89,2.5 8.11,2.5C10.33,2.5 12.39,3.19 14.09,4.37C14.63,4.75 15.38,4.73 15.85,4.26Z" />
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M8.109,12C8.938,12 9.609,11.328 9.609,10.5C9.609,9.672 8.938,9 8.109,9C7.281,9 6.609,9.672 6.609,10.5C6.609,11.328 7.281,12 8.109,12Z" />
+
+</vector>
diff --git a/core/res/res/drawable/ic_wifi_signal_2.xml b/core/res/res/drawable/ic_wifi_signal_2.xml
index 52f589502d39a..02c14e18a95ae 100644
--- a/core/res/res/drawable/ic_wifi_signal_2.xml
+++ b/core/res/res/drawable/ic_wifi_signal_2.xml
@@ -1,28 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2025 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
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+          http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:width="17.0dp"
+    android:height="12.58dp"
+    android:viewportHeight="12.0"
+    android:viewportWidth="16.21">
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39C21.03,4.08,16.75,2,12,2z M12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 s6.73,1.27,9.3,3.53L12,18.85z" />
+        android:fillColor="#000"
+        android:pathData="M12.659,7.45C13.199,6.91 13.149,6.01 12.479,5.64C11.179,4.92 9.689,4.51 8.109,4.51C6.529,4.51 5.029,4.92 3.739,5.64C3.069,6.01 3.019,6.91 3.559,7.45C3.999,7.89 4.699,7.94 5.259,7.66C6.119,7.24 7.089,7 8.109,7C9.129,7 10.099,7.24 10.959,7.66C11.519,7.94 12.219,7.89 12.659,7.45Z" />
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18.61,13.95L12,22l-6.61-8.05c0.33-0.61,0.74-1.17,1.22-1.66c1.36-1.42,3.27-2.3,5.39-2.3s4.03,0.88,5.39,2.3 C17.87,12.78,18.28,13.34,18.61,13.95z" />
-</vector>
\ No newline at end of file
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M15.85,4.26C16.36,3.75 16.34,2.91 15.76,2.49C13.61,0.93 10.97,0 8.11,0C5.25,0 2.61,0.92 0.46,2.49C-0.12,2.91 -0.14,3.75 0.37,4.26C0.84,4.73 1.59,4.75 2.13,4.37C3.83,3.19 5.89,2.5 8.11,2.5C10.33,2.5 12.39,3.19 14.09,4.37C14.63,4.75 15.38,4.73 15.85,4.26Z" />
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M8.109,12C8.938,12 9.609,11.328 9.609,10.5C9.609,9.672 8.938,9 8.109,9C7.281,9 6.609,9.672 6.609,10.5C6.609,11.328 7.281,12 8.109,12Z" />
+
+</vector>
diff --git a/core/res/res/drawable/ic_wifi_signal_3.xml b/core/res/res/drawable/ic_wifi_signal_3.xml
index 8e51ed2f53b61..02c14e18a95ae 100644
--- a/core/res/res/drawable/ic_wifi_signal_3.xml
+++ b/core/res/res/drawable/ic_wifi_signal_3.xml
@@ -1,28 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2025 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
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+          http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:width="17.0dp"
+    android:height="12.58dp"
+    android:viewportHeight="12.0"
+    android:viewportWidth="16.21">
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39C21.03,4.08,16.75,2,12,2z M12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 s6.73,1.27,9.3,3.53L12,18.85z" />
+        android:fillColor="#000"
+        android:pathData="M12.659,7.45C13.199,6.91 13.149,6.01 12.479,5.64C11.179,4.92 9.689,4.51 8.109,4.51C6.529,4.51 5.029,4.92 3.739,5.64C3.069,6.01 3.019,6.91 3.559,7.45C3.999,7.89 4.699,7.94 5.259,7.66C6.119,7.24 7.089,7 8.109,7C9.129,7 10.099,7.24 10.959,7.66C11.519,7.94 12.219,7.89 12.659,7.45Z" />
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20.7,11.41L12,22L3.3,11.41c0.38-0.52,0.8-0.99,1.26-1.43C6.49,8.13,9.1,6.99,12,6.99s5.51,1.13,7.44,2.99 C19.9,10.41,20.33,10.89,20.7,11.41z" />
-</vector>
\ No newline at end of file
+        android:fillAlpha="0.45"
+        android:fillColor="#000"
+        android:pathData="M15.85,4.26C16.36,3.75 16.34,2.91 15.76,2.49C13.61,0.93 10.97,0 8.11,0C5.25,0 2.61,0.92 0.46,2.49C-0.12,2.91 -0.14,3.75 0.37,4.26C0.84,4.73 1.59,4.75 2.13,4.37C3.83,3.19 5.89,2.5 8.11,2.5C10.33,2.5 12.39,3.19 14.09,4.37C14.63,4.75 15.38,4.73 15.85,4.26Z" />
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M8.109,12C8.938,12 9.609,11.328 9.609,10.5C9.609,9.672 8.938,9 8.109,9C7.281,9 6.609,9.672 6.609,10.5C6.609,11.328 7.281,12 8.109,12Z" />
+
+</vector>
diff --git a/core/res/res/drawable/ic_wifi_signal_4.xml b/core/res/res/drawable/ic_wifi_signal_4.xml
index 04b63af4a372c..6b183aff40f02 100644
--- a/core/res/res/drawable/ic_wifi_signal_4.xml
+++ b/core/res/res/drawable/ic_wifi_signal_4.xml
@@ -1,25 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2025 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
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+          http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:width="17.0dp"
+    android:height="12.58dp"
+    android:viewportHeight="12.0"
+    android:viewportWidth="16.21">
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M12.659,7.45C13.199,6.91 13.149,6.01 12.479,5.64C11.179,4.92 9.689,4.51 8.109,4.51C6.529,4.51 5.029,4.92 3.739,5.64C3.069,6.01 3.019,6.91 3.559,7.45C3.999,7.89 4.699,7.94 5.259,7.66C6.119,7.24 7.089,7 8.109,7C9.129,7 10.099,7.24 10.959,7.66C11.519,7.94 12.219,7.89 12.659,7.45Z" />
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M24,7.39L12,22L0,7.39C2.97,4.08,7.25,2,12,2S21.03,4.08,24,7.39z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#000"
+        android:pathData="M15.85,4.26C16.36,3.75 16.34,2.91 15.76,2.49C13.61,0.93 10.97,0 8.11,0C5.25,0 2.61,0.92 0.46,2.49C-0.12,2.91 -0.14,3.75 0.37,4.26C0.84,4.73 1.59,4.75 2.13,4.37C3.83,3.19 5.89,2.5 8.11,2.5C10.33,2.5 12.39,3.19 14.09,4.37C14.63,4.75 15.38,4.73 15.85,4.26Z" />
+
+    <path
+        android:fillColor="#000"
+        android:pathData="M8.109,12C8.938,12 9.609,11.328 9.609,10.5C9.609,9.672 8.938,9 8.109,9C7.281,9 6.609,9.672 6.609,10.5C6.609,11.328 7.281,12 8.109,12Z" />
+
+</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/progress_large.xml b/core/res/res/drawable/progress_large.xml
index 4f016bcc2e83e..44b410393182f 100644
--- a/core/res/res/drawable/progress_large.xml
+++ b/core/res/res/drawable/progress_large.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_black_76"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/progress_large_white.xml b/core/res/res/drawable/progress_large_white.xml
index c690ed4e0e9ae..6c2388c680a3f 100644
--- a/core/res/res/drawable/progress_large_white.xml
+++ b/core/res/res/drawable/progress_large_white.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_white_76"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/progress_medium.xml b/core/res/res/drawable/progress_medium.xml
index eb1bd50d17d73..82ad686b67390 100644
--- a/core/res/res/drawable/progress_medium.xml
+++ b/core/res/res/drawable/progress_medium.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_black_48"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/progress_medium_white.xml b/core/res/res/drawable/progress_medium_white.xml
index b4f9b318a902a..886ee05bc9c78 100644
--- a/core/res/res/drawable/progress_medium_white.xml
+++ b/core/res/res/drawable/progress_medium_white.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_white_48"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/progress_small.xml b/core/res/res/drawable/progress_small.xml
index e0ee5e47d8305..1881da3848924 100644
--- a/core/res/res/drawable/progress_small.xml
+++ b/core/res/res/drawable/progress_small.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_black_16"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/progress_small_titlebar.xml b/core/res/res/drawable/progress_small_titlebar.xml
index 8cfba864b5b2c..5bb5cf8749dc4 100644
--- a/core/res/res/drawable/progress_small_titlebar.xml
+++ b/core/res/res/drawable/progress_small_titlebar.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_white_16"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/progress_small_white.xml b/core/res/res/drawable/progress_small_white.xml
index 8cfba864b5b2c..5bb5cf8749dc4 100644
--- a/core/res/res/drawable/progress_small_white.xml
+++ b/core/res/res/drawable/progress_small_white.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_white_16"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/search_spinner.xml b/core/res/res/drawable/search_spinner.xml
index 31a77c30cf2a6..b8c8b09fa882e 100644
--- a/core/res/res/drawable/search_spinner.xml
+++ b/core/res/res/drawable/search_spinner.xml
@@ -21,5 +21,5 @@
     android:drawable="@drawable/spinner_black_20"
     android:pivotX="50%"
     android:pivotY="50%"
-    android:framesCount="12"
-    android:frameDuration="100" />
+    android:framesCount="48"
+    android:frameDuration="25" />
diff --git a/core/res/res/drawable/toast_frame.xml b/core/res/res/drawable/toast_frame.xml
index a8cdef6d05f13..34987394b2ece 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/colorSurface" />
+    <solid android:color="?android:attr/colorBackgroundFloating" />
     <corners android:radius="28dp" />
 </shape>
 
diff --git a/core/res/res/layout/accessibility_button_chooser_item.xml b/core/res/res/layout/accessibility_button_chooser_item.xml
index 33d6fa2862f76..70905ca19192d 100644
--- a/core/res/res/layout/accessibility_button_chooser_item.xml
+++ b/core/res/res/layout/accessibility_button_chooser_item.xml
@@ -45,7 +45,7 @@
         android:textAppearance="?attr/textAppearanceSmall"
         android:textColor="?attr/textColorPrimary"
         android:textSize="12sp"
-        android:fontFamily="sans-serif-condensed"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:gravity="top|center_horizontal"
         android:minLines="2"
         android:maxLines="2"
diff --git a/core/res/res/layout/accessibility_enable_service_warning.xml b/core/res/res/layout/accessibility_enable_service_warning.xml
index 01ef10177c5a3..fc6f498375193 100644
--- a/core/res/res/layout/accessibility_enable_service_warning.xml
+++ b/core/res/res/layout/accessibility_enable_service_warning.xml
@@ -51,7 +51,7 @@
                 android:gravity="center"
                 android:textSize="20sp"
                 android:textColor="?android:attr/textColorPrimary"
-                android:fontFamily="google-sans-medium"/>
+                android:fontFamily="@*android:string/config_headlineFontFamily"/>
 
             <TextView
                 android:id="@+id/accessibility_permissionDialog_description"
@@ -62,7 +62,7 @@
                 android:text="@string/accessibility_service_warning_description"
                 android:textSize="16sp"
                 android:textColor="?android:attr/textColorPrimary"
-                android:fontFamily="sans-serif"/>
+                android:fontFamily="@*android:string/config_bodyFontFamily"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                     android:text="@string/accessibility_service_screen_control_title"
                     android:textSize="16sp"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:fontFamily="sans-serif"/>
+                    android:fontFamily="@*android:string/config_headlineFontFamily"/>
             </LinearLayout>
 
             <TextView
@@ -98,7 +98,7 @@
                 android:text="@string/accessibility_service_screen_control_description"
                 android:textSize="14sp"
                 android:textColor="?android:attr/textColorSecondary"
-                android:fontFamily="sans-serif"/>
+                android:fontFamily="@*android:string/config_bodyFontFamily"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -122,7 +122,7 @@
                     android:text="@string/accessibility_service_action_perform_title"
                     android:textSize="16sp"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:fontFamily="sans-serif"/>
+                    android:fontFamily="@*android:string/config_headlineFontFamily"/>
             </LinearLayout>
 
             <TextView
@@ -134,7 +134,7 @@
                 android:text="@string/accessibility_service_action_perform_description"
                 android:textSize="14sp"
                 android:textColor="?android:attr/textColorSecondary"
-                android:fontFamily="sans-serif" />
+                android:fontFamily="@*android:string/config_bodyFontFamily" />
         </LinearLayout>
 
         <View
diff --git a/core/res/res/layout/accessibility_shortcut_chooser_item.xml b/core/res/res/layout/accessibility_shortcut_chooser_item.xml
index 4d7946b2138bc..20985bed3b255 100644
--- a/core/res/res/layout/accessibility_shortcut_chooser_item.xml
+++ b/core/res/res/layout/accessibility_shortcut_chooser_item.xml
@@ -51,7 +51,7 @@
             android:layout_height="wrap_content"
             android:textSize="20sp"
             android:textColor="?attr/textColorPrimary"
-            android:fontFamily="sans-serif-medium"/>
+            android:fontFamily="@*android:string/config_bodyFontFamily"/>
     </LinearLayout>
 
     <TextView
@@ -60,7 +60,7 @@
         android:layout_height="wrap_content"
         android:textSize="20sp"
         android:textColor="?attr/colorAccent"
-        android:fontFamily="sans-serif-medium"/>
+        android:fontFamily="@*android:string/config_bodyFontFamily"/>
 
 </LinearLayout>
 
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/immersive_mode_cling.xml b/core/res/res/layout/immersive_mode_cling.xml
index 4e869b76b5100..385c7191365ce 100644
--- a/core/res/res/layout/immersive_mode_cling.xml
+++ b/core/res/res/layout/immersive_mode_cling.xml
@@ -44,7 +44,7 @@
             android:text="@string/immersive_cling_title"
             android:textColor="@androidprv:color/materialColorOnSurface"
             android:textSize="24sp"
-            android:fontFamily="google-sans" />
+            android:fontFamily="@*android:string/config_headlineFontFamily" />
 
     <TextView
             android:id="@+id/immersive_cling_description"
@@ -56,7 +56,7 @@
             android:text="@string/immersive_cling_description"
             android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
             android:textSize="14sp"
-            android:fontFamily="google-sans" />
+            android:fontFamily="@*android:string/config_bodyFontFamily" />
 
     <Button
             android:id="@+id/ok"
@@ -76,5 +76,5 @@
             android:textAllCaps="false"
             android:textSize="14sp"
             android:textFontWeight="500"
-            android:fontFamily="google-sans" />
+            android:fontFamily="@*android:string/config_bodyFontFamily" />
 </RelativeLayout>
diff --git a/core/res/res/layout/input_method_switch_dialog_new.xml b/core/res/res/layout/input_method_switch_dialog_new.xml
index 118f93b89237f..3015eca55fa24 100644
--- a/core/res/res/layout/input_method_switch_dialog_new.xml
+++ b/core/res/res/layout/input_method_switch_dialog_new.xml
@@ -72,7 +72,7 @@
             android:background="@drawable/input_method_switch_button"
             android:layout_gravity="end"
             android:text="@string/input_method_switcher_settings_button"
-            android:fontFamily="google-sans-text"
+            android:fontFamily="@*android:string/config_bodyFontFamily"
             android:textAppearance="?attr/textAppearance"
             android:contentDescription="@string/input_method_language_settings"/>
 
diff --git a/core/res/res/layout/input_method_switch_item_header.xml b/core/res/res/layout/input_method_switch_item_header.xml
index 05c73d04d715c..4f9eb1c59aad9 100644
--- a/core/res/res/layout/input_method_switch_item_header.xml
+++ b/core/res/res/layout/input_method_switch_item_header.xml
@@ -30,7 +30,7 @@
         android:layout_marginHorizontal="8dp"
         android:ellipsize="end"
         android:singleLine="true"
-        android:fontFamily="google-sans-text"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:textAppearance="?attr/textAppearance"
         android:accessibilityHeading="true"
         android:textColor="@color/materialColorPrimary"/>
diff --git a/core/res/res/layout/input_method_switch_item_new.xml b/core/res/res/layout/input_method_switch_item_new.xml
index 368860848f5da..236c0d9184468 100644
--- a/core/res/res/layout/input_method_switch_item_new.xml
+++ b/core/res/res/layout/input_method_switch_item_new.xml
@@ -43,7 +43,7 @@
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="1"
             android:singleLine="true"
-            android:fontFamily="google-sans-text"
+            android:fontFamily="@*android:string/config_bodyFontFamily"
             android:textColor="@color/input_method_switch_on_item"
             android:textAppearance="?attr/textAppearanceListItem"/>
 
@@ -55,7 +55,7 @@
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="1"
             android:singleLine="true"
-            android:fontFamily="google-sans-text"
+            android:fontFamily="@*android:string/config_bodyFontFamily"
             android:textColor="@color/materialColorOnSurfaceVariant"
             android:textAppearance="?attr/textAppearanceListItemSecondary"
             android:textAllCaps="true"
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/time_picker_material.xml b/core/res/res/layout/time_picker_material.xml
index 75973798219ef..ee733f1f39e86 100644
--- a/core/res/res/layout/time_picker_material.xml
+++ b/core/res/res/layout/time_picker_material.xml
@@ -44,7 +44,7 @@
         android:paddingTop="20dp"
         android:paddingBottom="20dp"
         android:includeFontPadding="false"
-        android:fontFamily="sans-serif-medium"
+        android:fontFamily="@string/config_bodyFontFamilyMedium"
         android:textSize="34sp"
         android:textColor="@color/white"
         android:text="@string/time_picker_header_text"/>
diff --git a/core/res/res/values-ar-rSA/cr_strings.xml b/core/res/res/values-ar-rSA/cr_strings.xml
new file mode 100644
index 0000000000000..9316266d5694c
--- /dev/null
+++ b/core/res/res/values-ar-rSA/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">نسخ رابط سجل العُطل</string>
+    <string name="url_copy_success">تم نسخ الرابط بنجاح</string>
+    <string name="url_copy_failed">حدث خطأ أثناء نسخ رابط السجل</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">مرر مجدداً لفتح الإيماءات</string>
+    <!-- App lock -->
+    <string name="unlock_application">افتح <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-az-rAZ/cr_strings.xml b/core/res/res/values-az-rAZ/cr_strings.xml
new file mode 100644
index 0000000000000..b63903f5cd339
--- /dev/null
+++ b/core/res/res/values-az-rAZ/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Çökmə jurnal URL-sini kopyala</string>
+    <string name="url_copy_success">URL uğurla kopyalandı</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+    <!-- App lock -->
+    <string name="unlock_application">Unlock <xliff:g id="label" example="Telegram">%1$s</xliff:g></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">Telefonunu istifadə et:</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>
+    <!-- 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-be-rBY/cr_strings.xml b/core/res/res/values-be-rBY/cr_strings.xml
new file mode 100644
index 0000000000000..5a13bd9288eed
--- /dev/null
+++ b/core/res/res/values-be-rBY/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Капіяваць спасылку журнала памылкі</string>
+    <string name="url_copy_success">Спасылка паспяхова скапіявана</string>
+    <string name="url_copy_failed">Адбылася памылка падчас загрузкі лога на Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Правядзіце яшчэ раз, каб разблакіраваць жэсты</string>
+    <!-- App lock -->
+    <string name="unlock_application">Разблакіраваць <xliff:g id="label" example="Telegram">%1$s</xliff:g></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">Calls and notifications will ring</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-bg-rBG/cr_strings.xml b/core/res/res/values-bg-rBG/cr_strings.xml
new file mode 100644
index 0000000000000..5198e0726e7f6
--- /dev/null
+++ b/core/res/res/values-bg-rBG/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Копиране на URL адреса на регистъра за сривове</string>
+    <string name="url_copy_success">URL aдресът е копиран успешно</string>
+    <string name="url_copy_failed">Възникна грешка при качването на лога в Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+    <!-- App lock -->
+    <string name="unlock_application">Unlock <xliff:g id="label" example="Telegram">%1$s</xliff:g></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">За да използвате телефона:</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>
+    <!-- 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/cr_strings.xml b/core/res/res/values-ca-rES/cr_strings.xml
new file mode 100644
index 0000000000000..9229a9489bbb0
--- /dev/null
+++ b/core/res/res/values-ca-rES/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copiar URL del registre d\'errors</string>
+    <string name="url_copy_success">URL copiada amb èxit</string>
+    <string name="url_copy_failed">Hi ha hagut un error mentre es carregava el registre a Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+    <!-- App lock -->
+    <string name="unlock_application">Desbloqueja <xliff:g id="label" example="Telegram">%1$s</xliff:g></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">Per a utilitzar el vostre telèfon:</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>
+    <!-- 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/cr_strings.xml b/core/res/res/values-cs-rCZ/cr_strings.xml
new file mode 100644
index 0000000000000..409b8e7c46a68
--- /dev/null
+++ b/core/res/res/values-cs-rCZ/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Kopírovat URL protokolu o\u00a0selhání</string>
+    <string name="url_copy_success">URL byla úspěšně zkopírována</string>
+    <string name="url_copy_failed">Při nahrávání protokolu o\u00a0selhání na Pasty došlo k\u00a0chybě</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Opětovným přejetím odemknete gesta</string>
+    <!-- App lock -->
+    <string name="unlock_application">Odemknout <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Režim v kapse je aktivní</string>
+    <string name="pocket_mode_illustration_description">Ilustrace telefonu v kapse</string>
+    <string name="pocket_mode_instructions_header">Pro použití telefonu:</string>
+    <string name="pocket_mode_instruction_step1">1. Ujistěte se, že modrá plocha (senzor přiblížení) zobrazená výše je nepřekrytá a prostá nečistot nebo prachu.</string>
+    <string name="pocket_mode_instruction_step2">2. Chcete-li ukončit režim v kapse, stiskněte a podržte tlačítko napájení.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Volání a oznámení budou vyzvánět</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added">Aplikace <xliff:g id="name" example="MyApp">%s</xliff:g> byla přidána do GameSpace</string>
+</resources>
diff --git a/core/res/res/values-de-rDE/cr_strings.xml b/core/res/res/values-de-rDE/cr_strings.xml
new file mode 100644
index 0000000000000..708fe2f57dc04
--- /dev/null
+++ b/core/res/res/values-de-rDE/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">URL des Absturzberichts kopieren</string>
+    <string name="url_copy_success">URL erfolgreich kopiert</string>
+    <string name="url_copy_failed">Beim Hochladen des Absturzberichts zu Pasty ist ein Fehler aufgetreten</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Erneut wischen, um Gesten zu verwenden</string>
+    <!-- App lock -->
+    <string name="unlock_application"><xliff:g id="label" example="Telegram">%1$s</xliff:g> entsperren</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Taschenmodus aktiv</string>
+    <string name="pocket_mode_illustration_description">Abbildung des Telefons in der Tasche</string>
+    <string name="pocket_mode_instructions_header">Um das Gerät zu verwenden:</string>
+    <string name="pocket_mode_instruction_step1">1. Dafür sorgen, dass der blau dargestellte Bereich (Näherungssensor) frei von Schmutz und Staub ist.</string>
+    <string name="pocket_mode_instruction_step2">2. Ein-/Austaste gedrückt halten zum Beenden des Taschenmodus.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Bei Anrufen und Benachrichtigungen klingeln</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> wurde dem Spielmodus hinzugefügt</string>
+</resources>
diff --git a/core/res/res/values-el-rGR/cr_strings.xml b/core/res/res/values-el-rGR/cr_strings.xml
new file mode 100644
index 0000000000000..16a028be3830c
--- /dev/null
+++ b/core/res/res/values-el-rGR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Σύρετε ξανά για να ξεκλειδώσετε τις χειρονομίες</string>
+    <!-- App lock -->
+    <string name="unlock_application">Ξεκλείδωμα <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-es-rES/cr_strings.xml b/core/res/res/values-es-rES/cr_strings.xml
new file mode 100644
index 0000000000000..dbe5177e0711d
--- /dev/null
+++ b/core/res/res/values-es-rES/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copiar URL del registro de errores</string>
+    <string name="url_copy_success">URL copiada satisfactoriamente</string>
+    <string name="url_copy_failed">Se ha producido un error cargando el registro a Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Desliza nuevamente para desbloquear los gestos</string>
+    <!-- App lock -->
+    <string name="unlock_application">Desbloquear <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Modo juego activado</string>
+    <string name="pocket_mode_illustration_description">Ilustración del teléfono en el bolsillo</string>
+    <string name="pocket_mode_instructions_header">Para usar su teléfono:</string>
+    <string name="pocket_mode_instruction_step1">1. Asegúrate de que el área azul (sensor de proximidad) mostrado abajo no está obstruido y se encuentra libre de polvo o suciedad.</string>
+    <string name="pocket_mode_instruction_step2">2. Presiona y mantén el botón de encendido para salir del modo bolsillo.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Sonarán las llamadas y las notificaciones</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> añadido a Espacio de Juego</string>
+</resources>
diff --git a/core/res/res/values-et-rEE/cr_strings.xml b/core/res/res/values-et-rEE/cr_strings.xml
new file mode 100644
index 0000000000000..0d198765652b7
--- /dev/null
+++ b/core/res/res/values-et-rEE/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Kopeeri rikke logi URL</string>
+    <string name="url_copy_success">URL kopeeritud</string>
+    <string name="url_copy_failed">Logi Pasty\'sse üleslaadimisel esines viga</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Liigutuste avamiseks pühkige uuesti</string>
+    <!-- App lock -->
+    <string name="unlock_application">Lukusta <xliff:g id="label" example="Telegram">%1$s</xliff:g> lahti</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Taskurežiim on sees</string>
+    <string name="pocket_mode_illustration_description">Taskus oleva telefoni illustratsioon</string>
+    <string name="pocket_mode_instructions_header">Telefoni kasutamiseks:</string>
+    <string name="pocket_mode_instruction_step1">1. Kinnitage, et sinine ala (kauguse sensor), mis on näidatud üleval, on takistusteta ja vaba mustusest ja tolmust.</string>
+    <string name="pocket_mode_instruction_step2">2. Vajuta ja hoia toitenuppu, et väljuda tasku režiimist.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</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-fa-rIR/cr_strings.xml b/core/res/res/values-fa-rIR/cr_strings.xml
new file mode 100644
index 0000000000000..351f7d4ea7de8
--- /dev/null
+++ b/core/res/res/values-fa-rIR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">کپی کردن آدرس گزارش خرابی</string>
+    <string name="url_copy_success">آدرس با موفقیت کپی شد</string>
+    <string name="url_copy_failed">هنگام بارگزاری گزارش در Pasty خطایی روی داد</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">با کشیدن دوباره، حرکات را فعال کنید</string>
+    <!-- App lock -->
+    <string name="unlock_application">بازگشایی <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-fi-rFI/cr_strings.xml b/core/res/res/values-fi-rFI/cr_strings.xml
new file mode 100644
index 0000000000000..6858a24a47985
--- /dev/null
+++ b/core/res/res/values-fi-rFI/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Kopioi kaatumislokin URL-osoite</string>
+    <string name="url_copy_success">URL-osoite kopioitu onnistuneesti</string>
+    <string name="url_copy_failed">Virhe ladatessa lokia Pasty-palvelimelle</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+    <!-- App lock -->
+    <string name="unlock_application">Avaa <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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/cr_strings.xml b/core/res/res/values-fr-rFR/cr_strings.xml
new file mode 100644
index 0000000000000..726135ca78123
--- /dev/null
+++ b/core/res/res/values-fr-rFR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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 pendant l\'envoi du rapport</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Balayez à nouveau pour déverrouiller les gestes</string>
+    <!-- App lock -->
+    <string name="unlock_application">Déverrouiller <xliff:g id="label" example="Telegram">%1$s</xliff:g></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">Les appels et les notifications sonnent</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> ajouté au mode immersif</string>
+</resources>
diff --git a/core/res/res/values-hu-rHU/cr_strings.xml b/core/res/res/values-hu-rHU/cr_strings.xml
new file mode 100644
index 0000000000000..fe8b1c1e8eeb0
--- /dev/null
+++ b/core/res/res/values-hu-rHU/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Az összeomlási napló URL-jének másolása</string>
+    <string name="url_copy_success">Az URL sikeresen másolva</string>
+    <string name="url_copy_failed">Hiba történt a napló Pasty-feltöltése során</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Csúsztasson újból a vezérlések feloldásához</string>
+    <!-- App lock -->
+    <string name="unlock_application">Feloldja a következőt: <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">A Zsebmód aktív</string>
+    <string name="pocket_mode_illustration_description">A zsebben lévő telefon illusztrációja</string>
+    <string name="pocket_mode_instructions_header">A telefonja használatához:</string>
+    <string name="pocket_mode_instruction_step1">1. Győződjön meg arról, hogy a közelségérzékelő kék területe nincs takarásban, ill. szennyeződés- és pormentes.</string>
+    <string name="pocket_mode_instruction_step2">2. Tartsa lenyomva a bekapcsológombot a Zsebmódból való lkilépéshez.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">A hívások és az értesítések rezegni fognak</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> hozzáadva a Játéktérhez</string>
+</resources>
diff --git a/core/res/res/values-in-rID/cr_strings.xml b/core/res/res/values-in-rID/cr_strings.xml
new file mode 100644
index 0000000000000..bf693b67e7d54
--- /dev/null
+++ b/core/res/res/values-in-rID/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Salin URL log kerusakan</string>
+    <string name="url_copy_success">URL berhasil disalin</string>
+    <string name="url_copy_failed">Terjadi kesalahan pada saat mengunggah log ke Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Usap lagi untuk membuka kunci gestur</string>
+    <!-- App lock -->
+    <string name="unlock_application">Buka <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Mode saku aktif</string>
+    <string name="pocket_mode_illustration_description">Ilustrasi telepon di saku</string>
+    <string name="pocket_mode_instructions_header">Untuk mengaktifkan perangkat Anda:</string>
+    <string name="pocket_mode_instruction_step1">1. Pastikan area hijau (sensor jarak) yang ditunjukkan di atas tidak terhalang dan bebas dari kotoran atau debu.</string>
+    <string name="pocket_mode_instruction_step2">2. Tekan dan tahan tombol daya untuk keluar dari mode saku.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</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/cr_strings.xml b/core/res/res/values-it-rIT/cr_strings.xml
new file mode 100644
index 0000000000000..4396a83330cba
--- /dev/null
+++ b/core/res/res/values-it-rIT/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copia l\'URL del log di crash</string>
+    <string name="url_copy_success">URL copiato con successo</string>
+    <string name="url_copy_failed">Si è verificato un errore durante il caricamento del log su pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Scorri di nuovo per sbloccare i gesti</string>
+    <!-- App lock -->
+    <string name="unlock_application">Sblocca <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">La modalità tasca è attiva</string>
+    <string name="pocket_mode_illustration_description">Illustrazione del telefono in tasca</string>
+    <string name="pocket_mode_instructions_header">Per utilizzare il telefono:</string>
+    <string name="pocket_mode_instruction_step1">1. Assicurarsi che l\'area blu (sensore di prossimità) mostrata sopra sia ostruita e libera da sporcizia o polvere.</string>
+    <string name="pocket_mode_instruction_step2">2. Premere e tenere premuto il pulsante di accensione per uscire dalla modalità tasca.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Le chiamate e le notifiche squilleranno</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> aggiunto a GameSpace</string>
+</resources>
diff --git a/core/res/res/values-iw-rIL/cr_strings.xml b/core/res/res/values-iw-rIL/cr_strings.xml
new file mode 100644
index 0000000000000..dbfd5c09377d3
--- /dev/null
+++ b/core/res/res/values-iw-rIL/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">העתק את הקישור של דוח הקריסה</string>
+    <string name="url_copy_success">הקישור הועתק בהצלחה</string>
+    <string name="url_copy_failed">התרחשה שגיאה במהלך העלאת דו\"ח הקריסה</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">החליקו בשנית כדי להתיר מחוות</string>
+    <!-- App lock -->
+    <string name="unlock_application">פתיחת הנעילה של <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-ja-rJP/cr_strings.xml b/core/res/res/values-ja-rJP/cr_strings.xml
new file mode 100644
index 0000000000000..bd83b20623530
--- /dev/null
+++ b/core/res/res/values-ja-rJP/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">再度スワイプしてジェスチャーのロックを解除</string>
+    <!-- App lock -->
+    <string name="unlock_application"><xliff:g id="label" example="Telegram">%1$s</xliff:g> をロック解除</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>
+    <!-- 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-ko-rKR/cr_strings.xml b/core/res/res/values-ko-rKR/cr_strings.xml
new file mode 100644
index 0000000000000..818a2d39de125
--- /dev/null
+++ b/core/res/res/values-ko-rKR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">제스처 잠금을 해제하려면 다시 한 번 스와이프하세요.</string>
+    <!-- App lock -->
+    <string name="unlock_application"><xliff:g id="label" example="Telegram">%1$s</xliff:g> 잠금 해제</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>
+    <!-- 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-ku-rTR/cr_strings.xml b/core/res/res/values-ku-rTR/cr_strings.xml
new file mode 100644
index 0000000000000..b456025be5517
--- /dev/null
+++ b/core/res/res/values-ku-rTR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">لەبەرگرتنەوەی بەستەری کڕاشبوون</string>
+    <string name="url_copy_success">بەسەرکەوتوویی لەبەرگیرایەوە</string>
+    <string name="url_copy_failed">Di dema barkirina têketinê li Pasty de xeletiyek derket</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+    <!-- App lock -->
+    <string name="unlock_application">Unlock <xliff:g id="label" example="Telegram">%1$s</xliff:g></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">Ji bo ku têlefona xwe bikar bînin:</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>
+    <!-- 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-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/cr_strings.xml b/core/res/res/values-nl-rNL/cr_strings.xml
new file mode 100644
index 0000000000000..692934ec895d0
--- /dev/null
+++ b/core/res/res/values-nl-rNL/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Kopieer crash log URL</string>
+    <string name="url_copy_success">URL succesvol gekopieerd</string>
+    <string name="url_copy_failed">Er is een fout opgetreden tijdens het uploaden van het logboek naar Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Veeg opnieuw om gebaren te ontgrendelen</string>
+    <!-- App lock -->
+    <string name="unlock_application">Ontgrendel <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is aan</string>
+    <string name="pocket_mode_illustration_description">Illustratie van de telefoon in zak</string>
+    <string name="pocket_mode_instructions_header">Om je telefoon te gebruiken:</string>
+    <string name="pocket_mode_instruction_step1">1. Zorg ervoor dat de blauwe oppervlakte (nabijheidssensor) hierboven onbelemmerd en vrij is van vuil of stof.</string>
+    <string name="pocket_mode_instruction_step2">2. Houd de aan/uit-knop ingedrukt om de broekzak modus te sluiten.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Gesprekken en meldingen zullen af gaan</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> toegevoegd aan GameSpace</string>
+</resources>
diff --git a/core/res/res/values-pl-rPL/cr_strings.xml b/core/res/res/values-pl-rPL/cr_strings.xml
new file mode 100644
index 0000000000000..541375f704f30
--- /dev/null
+++ b/core/res/res/values-pl-rPL/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Skopiuj adres URL dziennika awarii</string>
+    <string name="url_copy_success">URL skopiowany pomyślnie</string>
+    <string name="url_copy_failed">Wystąpił błąd podczas przesyłania dziennika do serwisu Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Przesuń ponownie, aby odblokować gesty</string>
+    <!-- App lock -->
+    <string name="unlock_application">Odblokuj <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Tryb kieszonkowy jest aktywny</string>
+    <string name="pocket_mode_illustration_description">Ilustracja telefonu w kieszeni</string>
+    <string name="pocket_mode_instructions_header">Aby korzystać z telefonu:</string>
+    <string name="pocket_mode_instruction_step1">1. Upewnij się, że niebieski obszar (czujnik zbliżeniowy) pokazany powyżej jest odsłonięty i wolny od brudu lub kurzu.</string>
+    <string name="pocket_mode_instruction_step2">2. Naciśnij i przytrzymaj przycisk zasilania, aby wyjść z trybu kieszonkowego.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Połączenia i powiadomienia będą z dźwiękiem</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> dodano do Przestrzeni gier</string>
+</resources>
diff --git a/core/res/res/values-pt-rBR/cr_strings.xml b/core/res/res/values-pt-rBR/cr_strings.xml
new file mode 100644
index 0000000000000..9896529a732fb
--- /dev/null
+++ b/core/res/res/values-pt-rBR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copiar URL do log de erro</string>
+    <string name="url_copy_success">URL copiado com sucesso</string>
+    <string name="url_copy_failed">Ocorreu um erro durante o upload do log para o Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Deslize novamente para desbloquear os gestos</string>
+    <!-- App lock -->
+    <string name="unlock_application">Desbloquear <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Modo de bolso está ativo</string>
+    <string name="pocket_mode_illustration_description">Ilustração de telefone no bolso</string>
+    <string name="pocket_mode_instructions_header">Para usar seu telefone:</string>
+    <string name="pocket_mode_instruction_step1">1. Certifique-se de que a área azul (sensor de proximidade) mostrada acima esteja desobstruída e livre de sujeira ou poeira.</string>
+    <string name="pocket_mode_instruction_step2">2. Pressione e segure o botão liga/desliga para sair do modo de bolso.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Chamadas e notificações irão tocar</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> adicionado ao GameSpace</string>
+</resources>
diff --git a/core/res/res/values-pt-rPT/cr_strings.xml b/core/res/res/values-pt-rPT/cr_strings.xml
new file mode 100644
index 0000000000000..7393b18f08d91
--- /dev/null
+++ b/core/res/res/values-pt-rPT/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copiar URL do registo de falhas</string>
+    <string name="url_copy_success">URL copiado com sucesso</string>
+    <string name="url_copy_failed">Ocorreu um erro ao enviar o registo para o dogbin</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Deslize novamente para desbloquear os gestos</string>
+    <!-- App lock -->
+    <string name="unlock_application">Desbloquear <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Modo de bolso está ativo</string>
+    <string name="pocket_mode_illustration_description">Ilustração do telefone no bolso</string>
+    <string name="pocket_mode_instructions_header">Para utilizar o seu telefone:</string>
+    <string name="pocket_mode_instruction_step1">1. Certifique-se de que a área azul (sensor de proximidade) mostrada acima está desobstruído e livre de terra ou pó.</string>
+    <string name="pocket_mode_instruction_step2">2. Pressione e segure o botão de ligar/desligar para sair do modo bolso.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">As chamadas e as notificações vão tocar</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> adicionado ao EspaçoJogo</string>
+</resources>
diff --git a/core/res/res/values-ro-rRO/cr_strings.xml b/core/res/res/values-ro-rRO/cr_strings.xml
new file mode 100644
index 0000000000000..10443c4223f6b
--- /dev/null
+++ b/core/res/res/values-ro-rRO/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copiază URL-ul jurnalului de eroare</string>
+    <string name="url_copy_success">URL-ul a fost copiat cu succes</string>
+    <string name="url_copy_failed">A apărut o eroare la încărcarea registrului în pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Glisați din nou pentru a debloca gesturile</string>
+    <!-- App lock -->
+    <string name="unlock_application">Deblocare <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Modul de buzunar este activ</string>
+    <string name="pocket_mode_illustration_description">Ilustrație de telefon în buzunar</string>
+    <string name="pocket_mode_instructions_header">Pentru a folosi telefonul:</string>
+    <string name="pocket_mode_instruction_step1">1. Asiguraţi-vă că zona albastră (senzorul de proximitate) de mai sus este neobstrucţionată şi fără noroi sau praf.</string>
+    <string name="pocket_mode_instruction_step2">2. Apăsați și țineți apăsat butonul de pornire pentru a ieși din modul buzunar.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Apelurile și notificările vor suna</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> adăugat la GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ru-rRU/cr_strings.xml b/core/res/res/values-ru-rRU/cr_strings.xml
new file mode 100644
index 0000000000000..2e9f90a205bac
--- /dev/null
+++ b/core/res/res/values-ru-rRU/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Скопировать ссылку на журнал сбоя</string>
+    <string name="url_copy_success">Ссылка скопирована</string>
+    <string name="url_copy_failed">Произошла ошибка во время загрузки лога на Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Проведите ещё раз, чтобы разблокировать жесты</string>
+    <!-- App lock -->
+    <string name="unlock_application">Разблокировать <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-sat-rIN/cr_strings.xml b/core/res/res/values-sat-rIN/cr_strings.xml
new file mode 100644
index 0000000000000..7c47ba9c8f582
--- /dev/null
+++ b/core/res/res/values-sat-rIN/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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">An error occured while uploading the log to Pasty</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+    <!-- App lock -->
+    <string name="unlock_application">Unlock <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-sk-rSK/cr_strings.xml b/core/res/res/values-sk-rSK/cr_strings.xml
new file mode 100644
index 0000000000000..9fdd136adc6ec
--- /dev/null
+++ b/core/res/res/values-sk-rSK/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Kopírovať adresu URL záznamu o chybe</string>
+    <string name="url_copy_success">URL úspešne skopírované</string>
+    <string name="url_copy_failed">Pri nahrávaní protokolu o zlyhaní došlo k chybe</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Prejdite prstom znova pre odomknutie gest</string>
+    <!-- App lock -->
+    <string name="unlock_application">Odomknúť <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Režim detekcie nosenia vo vrecku je aktívny</string>
+    <string name="pocket_mode_illustration_description">Znázornenie režimu detekcie nosenia vo vrecku</string>
+    <string name="pocket_mode_instructions_header">Ak chcete používať telefón:</string>
+    <string name="pocket_mode_instruction_step1">1. Uistite sa, že modrá oblasť (snímač priblíženia) zobrazená vyššie je bez prekážok, nečistôt alebo prachu.</string>
+    <string name="pocket_mode_instruction_step2">2. Stlačte a podržte tlačidlo napájania, pre vypnutie režimu detekcie nosenia vo vrecku.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Telefonáty a upozornenia budú zvoniť</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> pridané do GameSpace</string>
+</resources>
diff --git a/core/res/res/values-tr-rTR/cr_strings.xml b/core/res/res/values-tr-rTR/cr_strings.xml
new file mode 100644
index 0000000000000..831efce22969e
--- /dev/null
+++ b/core/res/res/values-tr-rTR/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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">Kayıt Pasty\'ye yüklenirken bir hata oluştu</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Jestlerin kilidini açmak için tekrar kaydırın</string>
+    <!-- App lock -->
+    <string name="unlock_application">Kilidi aç <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Cep modu kullanımda</string>
+    <string name="pocket_mode_illustration_description">Cepteki telefon illüstrasyon</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 pas içermediğinden emin olun.</string>
+    <string name="pocket_mode_instruction_step2">2. Cep modundan çıkmak için güç düğmesini basılı tutun.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Çağrılar ve bildirimlerde zil çalacak</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added">GameSpace\'e <xliff:g id="name" example="MyApp">%s</xliff:g> eklendi</string>
+</resources>
diff --git a/core/res/res/values-uk-rUA/cr_strings.xml b/core/res/res/values-uk-rUA/cr_strings.xml
new file mode 100644
index 0000000000000..2283739357fc3
--- /dev/null
+++ b/core/res/res/values-uk-rUA/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Проведіть ще раз, щоб розблокувати жести</string>
+    <!-- App lock -->
+    <string name="unlock_application">Розблокувати <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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-vi-rVN/cr_strings.xml b/core/res/res/values-vi-rVN/cr_strings.xml
new file mode 100644
index 0000000000000..f3b4e7d28178b
--- /dev/null
+++ b/core/res/res/values-vi-rVN/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Sao chép địa chỉ nhật ký sự cố</string>
+    <string name="url_copy_success">Đã sao chép thành công</string>
+    <string name="url_copy_failed">Đã xảy ra lỗi khi tải nhật ký lên máy chủ</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Vuốt lại để mở khóa cử chỉ</string>
+    <!-- App lock -->
+    <string name="unlock_application">Mở khóa <xliff:g id="label" example="Telegram">%1$s</xliff:g></string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Chế độ bỏ túi đang được bật</string>
+    <string name="pocket_mode_illustration_description">Hình minh họa điện thoại trong túi</string>
+    <string name="pocket_mode_instructions_header">Để tiếp tục sử dụng hãy:</string>
+    <string name="pocket_mode_instruction_step1">1. Đảm bảo khu vực màu xanh (cảm biến tiệm cận) không bị che hoặc không bám bụi.</string>
+    <string name="pocket_mode_instruction_step2">2. Ấn giữ nút nguồn để tiếp tục.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Cuộc gọi &amp; thông báo sẽ đổ chuông</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> đã thêm vào không gian trò chơi</string>
+</resources>
diff --git a/core/res/res/values-zh-rCN/cr_strings.xml b/core/res/res/values-zh-rCN/cr_strings.xml
new file mode 100644
index 0000000000000..160614d79b556
--- /dev/null
+++ b/core/res/res/values-zh-rCN/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">复制崩溃日志链接</string>
+    <string name="url_copy_success">已成功复制链接</string>
+    <string name="url_copy_failed">将日志上传到 Pasty 时出错</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">再次滑动以解锁手势</string>
+    <!-- App lock -->
+    <string name="unlock_application">解锁应用 <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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/cr_strings.xml b/core/res/res/values-zh-rTW/cr_strings.xml
new file mode 100644
index 0000000000000..16f5e1814b7fb
--- /dev/null
+++ b/core/res/res/values-zh-rTW/cr_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">複製當機紀錄連結</string>
+    <string name="url_copy_success">已成功複製連結</string>
+    <string name="url_copy_failed">上傳紀錄至 Pasty 時發生錯誤</string>
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">再滑動一次以解鎖手勢</string>
+    <!-- App lock -->
+    <string name="unlock_application">解鎖 <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+    <!-- 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/config.xml b/core/res/res/values/config.xml
index 2bffe6d3972d3..0da165168670d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -59,6 +59,7 @@
         <item><xliff:g id="id">@string/status_bar_ethernet</xliff:g></item>
         <item><xliff:g id="id">@string/status_bar_oem_satellite</xliff:g></item>
         <item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>
+        <item><xliff:g id="id">@string/status_bar_network_traffic</xliff:g></item>
         <item><xliff:g id="id">@string/status_bar_stacked_mobile</xliff:g></item>
         <item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>
         <item><xliff:g id="id">@string/status_bar_wifi</xliff:g></item>
@@ -106,6 +107,7 @@
     <string translatable="false" name="status_bar_sensors_off">sensors_off</string>
     <string translatable="false" name="status_bar_screen_record">screen_record</string>
     <string translatable="false" name="status_bar_oem_satellite">satellite</string>
+    <string translatable="false" name="status_bar_network_traffic">network_traffic</string>
 
     <!-- Flag indicating whether the surface flinger has limited
          alpha compositing functionality in hardware.  If set, the window
@@ -944,11 +946,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>
@@ -1477,7 +1479,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>
@@ -5282,6 +5287,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>
 
@@ -5298,7 +5305,7 @@
     <integer translatable="false" name="config_storageManagerDaystoRetainDefault">90</integer>
 
     <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
-    <string name="config_headlineFontFamily" translatable="false"></string>
+    <string name="config_headlineFontFamily" translatable="false">sans-serif</string>
     <!-- Allows setting custom fontFeatureSettings on specific text. -->
     <string name="config_headlineFontFeatureSettings" translatable="false"></string>
 
@@ -5383,7 +5390,7 @@
     <!-- Controls whether system buttons use all caps for text -->
     <bool name="config_buttonTextAllCaps">true</bool>
     <!-- Name of the font family used for system surfaces where the font should use medium weight -->
-    <string name="config_headlineFontFamilyMedium" translateable="false">@string/font_family_button_material</string>
+    <string name="config_headlineFontFamilyMedium" translateable="false">sans-serif-medium</string>
     <!-- Name of a font family to use for body text. -->
     <string name="config_bodyFontFamily" translatable="false">sans-serif</string>
     <!-- Name of a font family to use for medium body text. -->
diff --git a/core/res/res/values/cr_arrays.xml b/core/res/res/values/cr_arrays.xml
new file mode 100644
index 0000000000000..418d200cd2af7
--- /dev/null
+++ b/core/res/res/values/cr_arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+</resources>
diff --git a/core/res/res/values/cr_attrs.xml b/core/res/res/values/cr_attrs.xml
new file mode 100644
index 0000000000000..34d5221eae65e
--- /dev/null
+++ b/core/res/res/values/cr_attrs.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <declare-styleable name="BatteryBarController">
+        <attr name="viewLocation" format="integer" />
+    </declare-styleable>
+
+</resources>
diff --git a/core/res/res/values/cr_colors.xml b/core/res/res/values/cr_colors.xml
new file mode 100644
index 0000000000000..418d200cd2af7
--- /dev/null
+++ b/core/res/res/values/cr_colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+</resources>
diff --git a/core/res/res/values/cr_config.xml b/core/res/res/values/cr_config.xml
new file mode 100644
index 0000000000000..e571104d5c389
--- /dev/null
+++ b/core/res/res/values/cr_config.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     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>
+
+    <!-- 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>
+
+    <!-- List of system apps that are allowed to be locked with app lock.
+         Use with extreme caution. -->
+    <string-array name="config_appLockAllowedSystemApps" translatable="false" />
+
+    <!-- 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 doze feature is enabled by default in settings -->
+    <bool name="config_doze_enabled_by_default">false</bool>
+
+    <!-- Whether the device supports Smart Pixels -->
+    <bool name="config_supportSmartPixels">false</bool>
+
+    <!-- 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 to cancel fingerprint operation if not idle -->
+    <bool name="config_fpCancelIfNotIdle">false</bool>
+</resources>
diff --git a/core/res/res/values/cr_dimens.xml b/core/res/res/values/cr_dimens.xml
new file mode 100644
index 0000000000000..a9ebd1b9cf57d
--- /dev/null
+++ b/core/res/res/values/cr_dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     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>
+</resources>
diff --git a/core/res/res/values/cr_strings.xml b/core/res/res/values/cr_strings.xml
new file mode 100644
index 0000000000000..482ebd17b8d0a
--- /dev/null
+++ b/core/res/res/values/cr_strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- 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>
+
+    <!-- Lock gesture -->
+    <string name="gesture_locked_warning">Swipe again to unlock gestures</string>
+
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+
+    <!-- App lock -->
+    <string name="unlock_application">Unlock <xliff:g id="label" example="Telegram">%1$s</xliff:g></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>
+</resources>
diff --git a/core/res/res/values/cr_styles.xml b/core/res/res/values/cr_styles.xml
new file mode 100644
index 0000000000000..d2ac22eb1afba
--- /dev/null
+++ b/core/res/res/values/cr_styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<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/cr_symbols.xml b/core/res/res/values/cr_symbols.xml
new file mode 100644
index 0000000000000..549a84fd26509
--- /dev/null
+++ b/core/res/res/values/cr_symbols.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- Light / Regular style fonts -->
+    <java-symbol type="string" name="config_lightFontFamily" />
+    <java-symbol type="string" name="config_regularFontFamily" />
+
+    <!-- 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" />
+
+    <!-- Lock gesture -->
+    <java-symbol type="string" name="gesture_locked_warning" />
+
+    <!-- GameSpace -->
+    <java-symbol type="string" name="gamespace_new_game_added" />
+
+    <!-- App lock -->
+    <java-symbol type="string" name="unlock_application" />
+    <java-symbol type="array" name="config_appLockAllowedSystemApps" />
+
+    <!-- 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 doze feature is enabled by default in settings -->
+    <java-symbol type="bool" name="config_doze_enabled_by_default" />
+
+    <!-- Whether the device supports Smart Pixels -->
+    <java-symbol type="bool" name="config_supportSmartPixels" />
+
+    <!-- Define device configs on boot -->
+    <java-symbol type="array" name="global_device_configs_override" />
+    <java-symbol type="array" name="device_configs_override" />
+
+    <!-- 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" />
+</resources>
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 24eeb0496a189..b140996ee6a93 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -1120,7 +1120,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>
diff --git a/core/res/res/values/donottranslate_material.xml b/core/res/res/values/donottranslate_material.xml
index 9cf9f6cfa86df..24ae4d430a947 100644
--- a/core/res/res/values/donottranslate_material.xml
+++ b/core/res/res/values/donottranslate_material.xml
@@ -16,17 +16,17 @@
 
 <resources>
 
-    <string name="font_family_display_4_material">sans-serif-light</string>
-    <string name="font_family_display_3_material">sans-serif</string>
-    <string name="font_family_display_2_material">sans-serif</string>
-    <string name="font_family_display_1_material">sans-serif</string>
-    <string name="font_family_headline_material">sans-serif</string>
-    <string name="font_family_title_material">sans-serif-medium</string>
-    <string name="font_family_subhead_material">sans-serif</string>
-    <string name="font_family_menu_material">sans-serif</string>
-    <string name="font_family_body_2_material">sans-serif-medium</string>
-    <string name="font_family_body_1_material">sans-serif</string>
-    <string name="font_family_caption_material">sans-serif</string>
-    <string name="font_family_button_material">sans-serif-medium</string>
+    <string name="font_family_display_4_material">@string/config_lightFontFamily</string>
+    <string name="font_family_display_3_material">@string/config_bodyFontFamily</string>
+    <string name="font_family_display_2_material">@string/config_bodyFontFamily</string>
+    <string name="font_family_display_1_material">@string/config_bodyFontFamily</string>
+    <string name="font_family_headline_material">@string/config_headlineFontFamily</string>
+    <string name="font_family_title_material">@string/config_headlineFontFamilyMedium</string>
+    <string name="font_family_subhead_material">@string/config_headlineFontFamily</string>
+    <string name="font_family_menu_material">@string/config_bodyFontFamily</string>
+    <string name="font_family_body_2_material">@string/config_bodyFontFamilyMedium</string>
+    <string name="font_family_body_1_material">@string/config_bodyFontFamily</string>
+    <string name="font_family_caption_material">@string/config_bodyFontFamily</string>
+    <string name="font_family_button_material">@string/config_headlineFontFamilyMedium</string>
 
 </resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 16a8faa58f972..238f690c78766 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -5358,16 +5358,16 @@
     <string name="time_placeholder">--</string>
 
     <!-- DO NOT TRANSLATE -->
-    <string name="radial_numbers_typeface">sans-serif</string>
+    <string name="radial_numbers_typeface">@string/config_bodyFontFamily</string>
     <!-- DO NOT TRANSLATE -->
-    <string name="sans_serif">sans-serif</string>
+    <string name="sans_serif">@string/config_bodyFontFamily</string>
 
     <!-- DO NOT TRANSLATE -->
-    <string name="date_picker_month_typeface">sans-serif-medium</string>
+    <string name="date_picker_month_typeface">@string/config_bodyFontFamilyMedium</string>
     <!-- DO NOT TRANSLATE -->
-    <string name="date_picker_day_of_week_typeface">sans-serif-medium</string>
+    <string name="date_picker_day_of_week_typeface">@string/config_bodyFontFamilyMedium</string>
     <!-- DO NOT TRANSLATE -->
-    <string name="date_picker_day_typeface">sans-serif-medium</string>
+    <string name="date_picker_day_typeface">@string/config_bodyFontFamilyMedium</string>
 
     <!-- Lock-to-app unlock pin string -->
     <string name="lock_to_app_unlock_pin">Ask for PIN before unpinning</string>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 3f75fd90284bc..96279ced772f2 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -283,7 +283,7 @@ please see styles_device_defaults.xml.
     </style>
     <style name="TextAppearance.StatusBar.EventContent.Title">
         <item name="textColor">#ffffff</item>
-        <item name="fontFamily">sans-serif-light</item>
+        <item name="fontFamily">@string/config_lightFontFamily</item>
         <item name="textSize">@dimen/notification_title_text_size</item>
         <item name="textStyle">bold</item>
     </style>
@@ -999,7 +999,7 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="TextAppearance.Tooltip">
-        <item name="fontFamily">sans-serif</item>
+        <item name="fontFamily">@string/config_bodyFontFamily</item>
         <item name="textSize">?android:attr/tooltipFontSize</item>
     </style>
 
@@ -1590,7 +1590,7 @@ please see styles_device_defaults.xml.
     <!-- @hide The style for Autofill half screen dialog button -->
     <style name="AutofillHalfSheetButton" parent="Widget.Material.Button">
         <item name="textSize">14sp</item>
-        <item name="fontFamily">google-sans-text-medium</item>
+        <item name="fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="textStyle">normal</item>
         <item name="textAllCaps">false</item>
         <item name="paddingStart">24dp</item>
@@ -1622,7 +1622,7 @@ please see styles_device_defaults.xml.
     <!-- @hide Autofill save dialog title -->
     <style name="AutofillSaveUiTitle" parent="TextAppearance.DeviceDefault.Subhead">
         <item name="textColor">?attr/textColorPrimary</item>
-        <item name="fontFamily">google-sans</item>
+        <item name="fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="textSize">24sp</item>
     </style>
 
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 4f714af08e2a0..9c32b1fd8a8e7 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -429,7 +429,7 @@ please see styles_device_defaults.xml.
     <style name="TextAppearance.Material.TimePicker.InputHeader" parent="TextAppearance.Material">
         <item name="textSize">@dimen/text_size_display_1_material</item>
         <item name="textColor">@color/white</item>
-        <item name="fontFamily">sans-serif-medium</item>
+        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.Material.TimePicker.InputField" parent="TextAppearance.Material">
@@ -438,31 +438,31 @@ please see styles_device_defaults.xml.
 
     <style name="TextAppearance.Material.TimePicker.PromptLabel" parent="TextAppearance.Material">
         <item name="textSize">@dimen/timepicker_text_size_normal</item>
-        <item name="fontFamily">sans-serif-medium</item>
+        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.Material.DatePicker.YearLabel" parent="TextAppearance.Material">
         <item name="textColor">@color/primary_text_secondary_when_activated_material_inverse</item>
         <item name="textSize">@dimen/date_picker_year_label_size</item>
-        <item name="fontFamily">sans-serif-medium</item>
+        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.Material.DatePicker.DateLabel" parent="TextAppearance.Material">
         <item name="textColor">@color/primary_text_secondary_when_activated_material_inverse</item>
         <item name="textSize">@dimen/date_picker_date_label_size</item>
-        <item name="fontFamily">sans-serif-medium</item>
+        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.Material.DatePicker.List.YearLabel" parent="TextAppearance.Material">
         <item name="textColor">?attr/textColorPrimary</item>
         <item name="textSize">@dimen/datepicker_list_year_label_size</item>
-        <item name="fontFamily">sans-serif</item>
+        <item name="fontFamily">@string/config_bodyFontFamily</item>
     </style>
 
     <style name="TextAppearance.Material.DatePicker.List.YearLabel.Activated">
         <item name="textColor">?attr/colorControlActivated</item>
         <item name="textSize">@dimen/datepicker_list_year_activated_label_size</item>
-        <item name="fontFamily">sans-serif-medium</item>
+        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.Material.Notification">
@@ -474,14 +474,14 @@ please see styles_device_defaults.xml.
 
     <style name="TextAppearance.Material.Notification.Title">
         <item name="textColor">@color/notification_primary_text_color_current</item>
-        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">sans-serif-medium</item>
+        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_headlineFontFamilyMedium</item>
         <item name="textSize">@dimen/notification_title_text_size</item>
     </style>
 
     <!-- unused as of the 2025 redesign -->
     <style name="TextAppearance.Material.Notification.BigTitle">
         <item name="textColor">@color/notification_primary_text_color_current</item>
-        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">sans-serif-medium</item>
+        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_headlineFontFamilyMedium</item>
         <item name="textSize">@dimen/notification_big_title_text_size</item>
     </style>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index a0ae922789e2b..d1e90b7ac0127 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -354,9 +354,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" />
@@ -2165,6 +2163,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" />
@@ -3367,6 +3366,7 @@
   <java-symbol type="string" name="status_bar_sensors_off" />
   <java-symbol type="string" name="status_bar_screen_record" />
   <java-symbol type="string" name="status_bar_oem_satellite" />
+  <java-symbol type="string" name="status_bar_network_traffic" />
 
   <!-- Locale picker -->
   <java-symbol type="id" name="locale_search_menu" />
@@ -4182,6 +4182,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" />
@@ -4193,6 +4194,8 @@
   <java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" />
   <java-symbol type="string" name="config_headlineFontFamily" />
   <java-symbol type="string" name="config_headlineFontFamilyMedium" />
+  <java-symbol type="string" name="config_bodyFontFamily" />
+  <java-symbol type="string" name="config_bodyFontFamilyMedium" />
 
   <java-symbol type="integer" name="config_pressedStateDurationMillis" />
   <java-symbol type="integer" name="config_tapTimeoutMillis" />
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/crowdin.yml b/crowdin.yml
new file mode 100644
index 0000000000000..152323b3833f3
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,5 @@
+files:
+  - source: /core/res/res/values/cr_strings.xml
+    translation: /core/res/res/values-%android_code%/%original_file_name%
+  - source: /packages/SystemUI/res/values/cr_strings.xml
+    translation: /packages/SystemUI/res/values-%android_code%/%original_file_name%
diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 272e891b1d5de..98278f4529ffd 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -185,7 +185,7 @@ prebuilt_etc {
 
 prebuilt_etc {
     name: "privapp_whitelist_com.android.statementservice",
-    product_specific: true,
+    system_ext_specific: true,
     sub_dir: "permissions",
     src: "com.android.statementservice.xml",
     filename_from_src: true,
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 99911de09b7d4..057d75024ab63 100644
--- a/data/etc/com.android.settings.xml
+++ b/data/etc/com.android.settings.xml
@@ -28,6 +28,7 @@
         <permission name="android.permission.FORCE_STOP_PACKAGES"/>
         <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
         <permission name="android.permission.LOG_COMPAT_CHANGE" />
+        <permission name="android.permission.MANAGE_APP_LOCK" />
         <permission name="android.permission.MANAGE_DEBUGGING"/>
         <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
         <permission name="android.permission.MANAGE_FINGERPRINT"/>
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
index 3eadf3b94515b..2725abb90099f 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"/>
@@ -96,5 +97,6 @@
         <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" />
     </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/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/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 39cd4a89aae6d..de0403ba14f9d 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -29,6 +29,7 @@
 import android.annotation.UiThread;
 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;
@@ -57,6 +58,7 @@
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.Preconditions;
+import com.android.internal.util.crdroid.FontController;
 import com.android.text.flags.Flags;
 
 import dalvik.annotation.optimization.CriticalNative;
@@ -77,6 +79,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;
@@ -177,7 +180,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;
@@ -254,6 +257,8 @@ public static void clearTypefaceCachesForTestingPurpose() {
      */
     public static final String DEFAULT_FAMILY = "sans-serif";
 
+    private static volatile String sFontName = DEFAULT_FAMILY;
+
     // Style value for building typeface.
     private static final int STYLE_NORMAL = 0;
     private static final int STYLE_ITALIC = 1;
@@ -941,7 +946,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);
     }
 
     /**
@@ -1309,7 +1314,14 @@ public void releaseNativeObjectForTest() {
         mCleaner.run();
     }
 
-    private static Typeface getSystemDefaultTypeface(@NonNull String familyName) {
+    /** @hide */
+    public static Typeface getOverrideTypeface(@NonNull String familyName) {
+        Typeface tf = FontController.getOverrideTypeface(familyName);
+        return tf == null ? getSystemDefaultTypeface(familyName) : tf;
+    }
+
+    /** @hide */
+    public static Typeface getSystemDefaultTypeface(@NonNull String familyName) {
         Typeface tf = sSystemFontMap.get(familyName);
         return tf == null ? Typeface.DEFAULT : tf;
     }
@@ -1490,6 +1502,42 @@ public static void setSystemFontMap(@Nullable SharedMemory sharedMemory)
         }
     }
 
+    /** @hide */
+    public static void changeFont(Resources res) {
+        if (res == null) {
+            return;
+        }
+
+        synchronized (sDynamicCacheLock) {
+            sDynamicTypefaceCache.evictAll();
+        }
+
+        int configId = res.getIdentifier("config_bodyFontFamily", "string", "android");
+        String fontFamily = res.getString(configId);
+
+        sFontName = fontFamily;
+
+        Typeface tf = getOverrideTypeface(sFontName);
+
+        Typeface tfBold = create(tf, BOLD);
+        Typeface tfItalic = create(tf, ITALIC);
+        Typeface tfItalicBold = create(tf, 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) {
@@ -1590,6 +1638,9 @@ public static void init() {
         preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "Roboto-Regular.ttf");
         preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "RobotoStatic-Regular.ttf");
 
+        preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "GoogleSans-Regular.ttf");
+        preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "GoogleSans-Italic.ttf");
+
         String locale = SystemProperties.get("persist.sys.locale", "en-US");
         String script = ULocale.addLikelySubtags(ULocale.forLanguageTag(locale)).getScript();
 
diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java
index f5cf571ad9556..f23b34bc43ad1 100644
--- a/keystore/java/android/security/KeyStore2.java
+++ b/keystore/java/android/security/KeyStore2.java
@@ -32,6 +32,9 @@
 import android.system.keystore2.ResponseCode;
 import android.util.Log;
 
+import com.android.internal.util.crdroid.KeyboxImitationHooks;
+import com.android.internal.util.crdroid.KeyboxUtils;
+
 import java.util.Calendar;
 
 /**
@@ -283,6 +286,11 @@ public KeyEntryResponse getKeyEntry(@NonNull KeyDescriptor descriptor)
             throws KeyStoreException {
         StrictMode.noteDiskRead();
 
+        KeyEntryResponse response = KeyboxImitationHooks.onGetKeyEntry(descriptor);
+        if (response != null) {
+            return response;
+        }
+
         return handleRemoteExceptionWithRetry((service) -> service.getKeyEntry(descriptor));
     }
 
@@ -333,6 +341,8 @@ public void deleteKey(@NonNull KeyDescriptor descriptor)
             throws KeyStoreException {
         StrictMode.noteDiskWrite();
 
+        KeyboxUtils.remove(Binder.getCallingUid(), descriptor.alias);
+
         handleRemoteExceptionWithRetry((service) -> {
             service.deleteKey(descriptor);
             return 0;
diff --git a/keystore/java/android/security/KeyStoreSecurityLevel.java b/keystore/java/android/security/KeyStoreSecurityLevel.java
index 6ab148a8b4eab..ab90b67614260 100644
--- a/keystore/java/android/security/KeyStoreSecurityLevel.java
+++ b/keystore/java/android/security/KeyStoreSecurityLevel.java
@@ -33,6 +33,9 @@
 import android.system.keystore2.ResponseCode;
 import android.util.Log;
 
+import com.android.internal.util.crdroid.KeyboxImitationHooks;
+import com.android.internal.util.crdroid.KeyboxUtils;
+
 import java.util.Calendar;
 import java.util.Collection;
 
@@ -146,6 +149,15 @@ public KeyMetadata generateKey(@NonNull KeyDescriptor descriptor, KeyDescriptor
             throws KeyStoreException {
         StrictMode.noteDiskWrite();
 
+        KeyboxUtils.remove(Binder.getCallingUid(), descriptor.alias);
+        if (attestationKey == null) {
+            KeyMetadata metadata = KeyboxImitationHooks.generateKey(mSecurityLevel,
+                    descriptor, args);
+            if (metadata != null) {
+                return metadata;
+            }
+        }
+
         return handleExceptions(() -> mSecurityLevel.generateKey(
                 descriptor, attestationKey, args.toArray(new KeyParameter[args.size()]),
                 flags, entropy));
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
index e6a63b9c4c17e..36da03ad1ec94 100644
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
@@ -90,6 +90,8 @@
 
 import javax.crypto.SecretKey;
 
+import com.android.internal.util.crdroid.PixelPropsUtils;
+
 /**
  * A java.security.KeyStore interface for the Android KeyStore. An instance of
  * it can be created via the {@link java.security.KeyStore#getInstance(String)
@@ -178,6 +180,8 @@ private KeyEntryResponse getKeyMetadata(String alias) {
 
     @Override
     public Certificate[] engineGetCertificateChain(String alias) {
+        PixelPropsUtils.onEngineGetCertificateChain();
+
         KeyEntryResponse response = getKeyMetadata(alias);
 
         if (response == null || response.metadata.certificate == null) {
diff --git a/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml b/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml
index d29ed8b5a9eca..1be399a1aedd8 100644
--- a/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml
+++ b/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml
@@ -42,7 +42,7 @@
         android:layout_marginBottom="0dp"
         android:gravity="center_horizontal"
         android:textAlignment="center"
-        android:fontFamily="google-sans-medium"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:text="@string/one_handed_tutorial_title"
         android:textSize="16sp"
         android:textColor="@android:color/white"/>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index e984c9197690e..143c94ec7e165 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -2042,11 +2042,13 @@ void finishEnterSplitScreen(SurfaceControl.Transaction finishT) {
     }
 
     void getStageBounds(Rect outTopOrLeftBounds, Rect outBottomOrRightBounds) {
+        if (mSplitLayout == null) return;
         outTopOrLeftBounds.set(mSplitLayout.getTopLeftBounds());
         outBottomOrRightBounds.set(mSplitLayout.getBottomRightBounds());
     }
 
     void getRefStageBounds(Rect outTopOrLeftBounds, Rect outBottomOrRightBounds) {
+        if (mSplitLayout == null) return;
         outTopOrLeftBounds.set(mSplitLayout.getTopLeftRefBounds());
         outBottomOrRightBounds.set(mSplitLayout.getBottomRightRefBounds());
     }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java
index caed194c5fd8e..d8c7492e7d8bd 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java
@@ -172,6 +172,35 @@ void addSplashScreenStartingWindow(StartingWindowInfo windowInfo,
             final SplashWindowRecord record = sRecord instanceof SplashWindowRecord
                     ? (SplashWindowRecord) sRecord : null;
             // If record == null, either the starting window added fail or removed already.
+            if (record == null) {
+                // release the icon view host
+                if (contentView.getSurfaceHost() != null) {
+                    SplashScreenView.releaseIconHost(contentView.getSurfaceHost());
+                }
+                return;
+            }
+
+            if (record.mSuggestType != STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN) {
+                contentView.addOnAttachStateChangeListener(
+                        new View.OnAttachStateChangeListener() {
+                            @Override
+                            public void onViewAttachedToWindow(View v) {
+                                SplashScreenView view = (SplashScreenView) v;
+                                final int lightBarAppearance =
+                                        ContrastColorUtil.isColorLight(
+                                                view.getInitBackgroundColor())
+                                                ? LIGHT_BARS_MASK : 0;
+                                view.getWindowInsetsController()
+                                        .setSystemBarsAppearance(
+                                        lightBarAppearance, LIGHT_BARS_MASK);
+                            }
+
+                            @Override
+                            public void onViewDetachedFromWindow(View v) {
+                            }
+                        });
+            }
+
             // Do not add this view if the token is mismatch.
             if (record != null && windowInfo.appToken == record.mAppToken) {
                 // if view == null then creation of content view was failed.
@@ -192,47 +221,15 @@ void addSplashScreenStartingWindow(StartingWindowInfo windowInfo,
         mSplashscreenContentDrawer.createContentView(context, suggestType, windowInfo,
                 viewSupplier::setView, viewSupplier::setUiThreadInitTask);
         try {
-            if (addWindow(taskId, windowInfo.appToken, rootLayout, display, params, suggestType)) {
-                // We use the splash screen worker thread to create SplashScreenView while adding
-                // the window, as otherwise Choreographer#doFrame might be delayed on this thread.
-                // And since Choreographer#doFrame won't happen immediately after adding the window,
-                // if the view is not added to the PhoneWindow on the first #doFrame, the view will
-                // not be rendered on the first frame. So here we need to synchronize the view on
-                // the window before first round relayoutWindow, which will happen after insets
-                // animation.
-                mChoreographer.postCallback(CALLBACK_INSETS_ANIMATION, setViewSynchronized, null);
-                final SplashWindowRecord record =
-                        (SplashWindowRecord) mStartingWindowRecordManager.getRecord(taskId);
-                if (record != null) {
-                    // Block until we get the background color.
-                    final SplashScreenView contentView = viewSupplier.get();
-                    if (suggestType != STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN) {
-                        contentView.addOnAttachStateChangeListener(
-                                new View.OnAttachStateChangeListener() {
-                                    @Override
-                                    public void onViewAttachedToWindow(View v) {
-                                        final int lightBarAppearance =
-                                                ContrastColorUtil.isColorLight(
-                                                        contentView.getInitBackgroundColor())
-                                                        ? LIGHT_BARS_MASK : 0;
-                                        contentView.getWindowInsetsController()
-                                                .setSystemBarsAppearance(
-                                                lightBarAppearance, LIGHT_BARS_MASK);
-                                    }
-
-                                    @Override
-                                    public void onViewDetachedFromWindow(View v) {
-                                    }
-                                });
-                    }
-                }
-            } else {
-                // release the icon view host
-                final SplashScreenView contentView = viewSupplier.get();
-                if (contentView.getSurfaceHost() != null) {
-                    SplashScreenView.releaseIconHost(contentView.getSurfaceHost());
-                }
-            }
+            // We use the splash screen worker thread to create SplashScreenView while adding
+            // the window, as otherwise Choreographer#doFrame might be delayed on this thread.
+            // And since Choreographer#doFrame won't happen immediately after adding the window,
+            // if the view is not added to the PhoneWindow on the first #doFrame, the view will
+            // not be rendered on the first frame. So here we need to synchronize the view on
+            // the window before first round relayoutWindow, which will happen after insets
+            // animation.
+            mChoreographer.postCallback(CALLBACK_INSETS_ANIMATION, setViewSynchronized, null);
+            addWindow(taskId, windowInfo.appToken, rootLayout, display, params, suggestType);
         } catch (RuntimeException e) {
             // don't crash if something else bad happens, for example a
             // failure loading resources because we are loading from an app
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 5f01ef9add8ea..b66bcee746064 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;
@@ -221,7 +223,7 @@ static void updateRelayoutParams(
             boolean shouldSetTaskVisibilityPositionAndCrop,
             boolean isStatusBarVisible,
             boolean isKeyguardVisibleAndOccluded,
-            InsetsState displayInsetsState,
+            DisplayController displayController,
             boolean hasGlobalFocus,
             @NonNull Region globalExclusionRegion,
             boolean shouldSetBackground,
@@ -247,6 +249,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
@@ -266,7 +270,8 @@ static void updateRelayoutParams(
         controlsElement.mAlignment = RelayoutParams.OccludingCaptionElement.Alignment.END;
         relayoutParams.mOccludingCaptionElements.add(controlsElement);
         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.
@@ -291,7 +296,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);
 
@@ -351,6 +356,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.
      */
@@ -391,17 +409,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/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 3eb3a53ee8716..9a4ba24b722ad 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -4538,7 +4538,7 @@ bool ResTable::getResourceName(uint32_t resID, bool allowUtf8, resource_name* ou
 
     if (p < 0) {
         if (Res_GETPACKAGE(resID)+1 == 0) {
-            ALOGW("No package identifier when getting name for resource number 0x%08x", resID);
+            ALOGV("No package identifier when getting name for resource number 0x%08x", resID);
         } else {
 #ifndef STATIC_ANDROIDFW_FOR_TOOLS
             ALOGW("No known package when getting name for resource number 0x%08x", resID);
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 2c11c84a0a089..99f929ee10696 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/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index f6fdec1c82bc0..63b98606ee36a 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -920,7 +920,9 @@ namespace PaintGlue {
                                    jlong xfermodeHandle) {
         Paint* paint = reinterpret_cast<Paint*>(paintHandle);
         SkBlender* blender = reinterpret_cast<SkBlender*>(xfermodeHandle);
-        paint->setBlender(sk_ref_sp(blender));
+        sk_sp<SkBlender> blenderTemp = sk_ref_sp(blender);
+        blenderTemp->unref();
+        paint->setBlender(blenderTemp);
     }
 
     static jlong setPathEffect(CRITICAL_JNI_PARAMS_COMMA jlong objHandle, jlong effectHandle) {
diff --git a/libs/hwui/jni/RuntimeEffectUtils.cpp b/libs/hwui/jni/RuntimeEffectUtils.cpp
index ad0e540b5b40d..7e30e0242cc08 100644
--- a/libs/hwui/jni/RuntimeEffectUtils.cpp
+++ b/libs/hwui/jni/RuntimeEffectUtils.cpp
@@ -94,7 +94,9 @@ void UpdateChild(JNIEnv* env, SkRuntimeEffectBuilder* builder, const char* child
         return;
     }
 
-    builderChild = sk_ref_sp(childEffect);
+    sk_sp<SkFlattenable> childEffectTemp = sk_ref_sp(childEffect);
+    childEffectTemp->unref();
+    builderChild = childEffectTemp;
 }
 
 }  // namespace uirenderer
diff --git a/location/java/android/location/flags/location.aconfig b/location/java/android/location/flags/location.aconfig
index 9bf37c63947ab..8863ff5e96274 100644
--- a/location/java/android/location/flags/location.aconfig
+++ b/location/java/android/location/flags/location.aconfig
@@ -188,17 +188,10 @@ flag {
     bug: "403337028"
 }
 
-flag {
-    name: "location_indicators_enabled"
-    namespace: "location"
-    description: "Enables modified location privacy item behavior"
-    bug: "419834493"
-}
-
 flag {
     name: "change_get_adas_allowlist_from_hidden_to_system"
     namespace: "location"
     description: "Changes the getAdasAllowlist API from hidden to system"
     bug: "362287534"
     is_exported: true
-}
\ No newline at end of file
+}
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
index 66de8c791fdd1..683b6e849f056 100644
--- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
+++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
@@ -38,7 +38,7 @@ public class GpsNetInitiatedHandler {
 
     private static final String TAG = "GpsNetInitiatedHandler";
 
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final boolean DEBUG = false;
 
     private final Context mContext;
     private final TelephonyManager mTelephonyManager;
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index 144285c112a59..0a30a26c9a2c3 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -756,12 +756,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;
     }
 
@@ -1870,20 +1864,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/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 021348153bb89..71a337dcf5571 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/native/android/Android.bp b/native/android/Android.bp
index 0a247139ffb19..ce2ebe19e0b8d 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/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java b/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
index bc06bdbd29afd..60ef1c9c645aa 100644
--- a/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
+++ b/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
@@ -55,7 +55,7 @@
  */
 public class BackupRestoreConfirmation extends Activity {
     static final String TAG = "BackupRestoreConfirmation";
-    static final boolean DEBUG = true;
+    static final boolean DEBUG = false;
 
     static final String KEY_DID_ACKNOWLEDGE = "did_acknowledge";
     static final String KEY_TOKEN = "token";
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/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt
index 90fc122b00529..fbca8a9b33df4 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt
@@ -509,8 +509,6 @@ object PackageUtil {
     @JvmStatic
     fun isMaterialDesignEnabled(context: Context): Boolean {
         return android.content.pm.Flags.usePiaV2()
-                && context.resources.getBoolean(
-            android.R.bool.config_enableMaterialDesignInPackageInstaller)
     }
 
     /**
diff --git a/packages/PrintSpooler/res/values/styles.xml b/packages/PrintSpooler/res/values/styles.xml
index 1e63a67e50a44..5d8e244e5a995 100644
--- a/packages/PrintSpooler/res/values/styles.xml
+++ b/packages/PrintSpooler/res/values/styles.xml
@@ -28,7 +28,7 @@
         <item name="android:layout_marginTop">16dip</item>
         <item name="android:layout_marginBottom">16dip</item>
         <item name="android:textColor">?android:attr/colorAccent</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
         <item name="android:textSize">14sp</item>
     </style>
 </resources>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java b/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java
index 0df5e3cf18d70..60c9b586cb1ae 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java
@@ -35,7 +35,7 @@
 public final class MutexFileProvider {
     private static final String LOG_TAG = "MutexFileProvider";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private final Object mLock = new Object();
 
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 214258b97679b..b605f4ef175d8 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
@@ -26,7 +26,6 @@
         android:outlineAmbientShadowColor="@android:color/transparent"
         android:outlineSpotShadowColor="@android:color/transparent"
         android:background="@android:color/transparent"
-        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..87782f14b286e 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml
@@ -23,16 +23,16 @@
         <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="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">
@@ -52,4 +52,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/LayoutPreference/res/values/styles.xml b/packages/SettingsLib/LayoutPreference/res/values/styles.xml
index c9d35975a907e..da6225d6c73e0 100644
--- a/packages/SettingsLib/LayoutPreference/res/values/styles.xml
+++ b/packages/SettingsLib/LayoutPreference/res/values/styles.xml
@@ -82,7 +82,7 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:fontFamily">google-sans-medium</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
         <item name="android:layout_marginTop">8dp</item>
     </style>
-</resources>
+</resources>
\ No newline at end of file
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-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/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/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt
index 4db843dc3803c..1a3eed13e1683 100644
--- a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt
+++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt
@@ -42,7 +42,7 @@ abstract class SettingsBasePreferenceFragment : PreferenceFragmentCompat() {
     @CallSuper
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, 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/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..1272ea7a30e1e 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="27dp"
+        android:height="16dp"
+        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_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/values/cr_config.xml b/packages/SettingsLib/res/values/cr_config.xml
new file mode 100644
index 0000000000000..e883ed5da34f9
--- /dev/null
+++ b/packages/SettingsLib/res/values/cr_config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024-2025 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/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index ba7270940a7c9..bf07c5311f7fa 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);
             }
@@ -2124,7 +2128,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/BluetoothUtils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
index 3281a1ac2d8c6..aecae786d9d79 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
@@ -73,7 +73,7 @@ public class BluetoothUtils {
     private static final String TAG = "BluetoothUtils";
 
     public static final boolean V = false; // verbose logging
-    public static final boolean D = true; // regular logging
+    public static final boolean D = false; // regular logging
 
     public static final int META_INT_ERROR = -1;
     public static final String BT_ADVANCED_HEADER_ENABLED = "bt_advanced_header_enabled";
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
index f4415fa253ec0..25b1c35601da4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
@@ -332,6 +332,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 671dfa230f0da..6a912c36818f1 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
@@ -241,9 +255,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);
@@ -251,6 +288,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();
@@ -312,10 +363,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/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/wifi/WifiUtils.kt b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt
index 84d61fc86073d..143d532efe183 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt
@@ -118,27 +118,13 @@ open class WifiUtils {
         val WIFI_PIE = getIconsBasedOnFlag()
 
         private fun getIconsBasedOnFlag(): IntArray {
-            return if (newStatusBarIcons()) {
-                // TODO(b/396664075):
-                // The new wifi icons only define a range of [0, 3]. Since this array is indexed on
-                // level, we can simulate the range squash by mapping both level 3 to drawn-level 2,
-                // and level 4 to drawn-level 3
-                intArrayOf(
-                    R.drawable.ic_wifi_0,
-                    R.drawable.ic_wifi_1,
-                    R.drawable.ic_wifi_2,
-                    R.drawable.ic_wifi_2,
-                    R.drawable.ic_wifi_3,
-                )
-            } else {
-                intArrayOf(
+            return intArrayOf(
                     com.android.internal.R.drawable.ic_wifi_signal_0,
                     com.android.internal.R.drawable.ic_wifi_signal_1,
                     com.android.internal.R.drawable.ic_wifi_signal_2,
                     com.android.internal.R.drawable.ic_wifi_signal_3,
                     com.android.internal.R.drawable.ic_wifi_signal_4
                 )
-            }
         }
 
         val NO_INTERNET_WIFI_PIE = getErrorIconsBasedOnFlag()
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 94aa955f0282b..55d35d4e1755a 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -224,6 +224,9 @@
     <!-- Default for Settings.System.VIBRATE_WHEN_RINGING -->
     <bool name="def_vibrate_when_ringing">false</bool>
 
+    <!-- Default for Settings.Global.DISABLE_WINDOW_BLURS -->
+    <bool name="def_disable_window_blurs">false</bool>
+
     <!-- Default for Settings.Global.CELL_ON; see PhoneConstants.CELL_ON_FLAG.
         0: cellular off; 1: cellular on. -->
     <integer name="def_cell_on">1</integer>
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
index 6aee10a71d628..05a49d2004181 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
@@ -275,7 +275,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,
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
index 11a9dc1001e13..059dfa4c142a9 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
@@ -448,7 +448,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,
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index a3eab5da11005..113c98d1310a0 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2342,6 +2342,9 @@ private void loadGlobalSettings(SQLiteDatabase db) {
             loadIntegerSetting(stmt, Settings.Global.CELL_ON,
                     R.integer.def_cell_on);
 
+            loadBooleanSetting(stmt, Settings.Global.DISABLE_WINDOW_BLURS,
+                    R.bool.def_disable_window_blurs);
+
             // Enable or disable Cell Broadcast SMS
             loadSetting(stmt, Settings.Global.CDMA_CELL_BROADCAST_SMS,
                     RILConstants.CDMA_CELL_BROADCAST_SMS_DISABLED);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index 98c0791b28dbb..a051b4220e7ab 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -240,6 +240,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);
@@ -349,11 +350,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
@@ -410,7 +412,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.
      */
@@ -455,6 +457,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 b50158afc232c..030b94d42efd6 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2980,9 +2980,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 2a513c64bb45d..2bd0d85738cb1 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -853,6 +853,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 +872,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)) {
@@ -1251,9 +1255,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 '"
@@ -2560,6 +2565,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()
@@ -4685,17 +4697,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/SharedStorageBackup/src/com/android/sharedstoragebackup/ObbBackupService.java b/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/ObbBackupService.java
index 0f8ccd7bc403e..ce8c377153a6a 100644
--- a/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/ObbBackupService.java
+++ b/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/ObbBackupService.java
@@ -43,7 +43,7 @@
  */
 public class ObbBackupService extends Service {
     static final String TAG = "ObbBackupService";
-    static final boolean DEBUG = true;
+    static final boolean DEBUG = false;
 
     /**
      * IObbBackupService interface implementation
diff --git a/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java b/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java
index e453cf53a98b5..1b9c0cff7ce8a 100644
--- a/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java
+++ b/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java
@@ -16,7 +16,7 @@
 
 public class SharedStorageAgent extends FullBackupAgent {
     static final String TAG = "SharedStorageAgent";
-    static final boolean DEBUG = true;
+    static final boolean DEBUG = false;
 
     StorageVolume[] mVolumes;
 
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 75a356b2cd5e0..41c1bd398b679 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -1061,7 +1061,7 @@
                 android:resource="@xml/file_provider_paths" />
         </provider>
 
-        <provider
+        <!--<provider
             android:name=".BugreportStorageProvider"
             android:authorities="com.android.shell.documents"
             android:grantUriPermissions="true"
@@ -1071,7 +1071,7 @@
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
-        </provider>
+        </provider>-->
 
         <provider
             android:name=".HeapDumpProvider"
diff --git a/packages/StatementService/Android.bp b/packages/StatementService/Android.bp
index a1422c0b40d8e..f0ddf4b6d84e0 100644
--- a/packages/StatementService/Android.bp
+++ b/packages/StatementService/Android.bp
@@ -31,8 +31,8 @@ android_app {
         proguard_flags_files: ["proguard.flags"],
     },
     target_sdk_version: "29",
-    sdk_version: "system_current",
-    product_specific: true,
+    platform_apis: true,
+    system_ext_specific: true,
     privileged: true,
     required: [
         "privapp_whitelist_com.android.statementservice",
diff --git a/packages/StatementService/AndroidManifest.xml b/packages/StatementService/AndroidManifest.xml
index 42cd143149546..0cc5b210f33c0 100644
--- a/packages/StatementService/AndroidManifest.xml
+++ b/packages/StatementService/AndroidManifest.xml
@@ -26,6 +26,7 @@
     <uses-permission android:name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"/>
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION"/>
diff --git a/packages/StatementService/src/com/android/statementservice/StatementServiceApplication.kt b/packages/StatementService/src/com/android/statementservice/StatementServiceApplication.kt
index 6af8004c40154..fabe07eebdf90 100644
--- a/packages/StatementService/src/com/android/statementservice/StatementServiceApplication.kt
+++ b/packages/StatementService/src/com/android/statementservice/StatementServiceApplication.kt
@@ -29,6 +29,7 @@ class StatementServiceApplication : Application() {
         if (userManager.isUserUnlocked) {
             // WorkManager can only schedule when the user data directories are unencrypted (after
             // the user has entered their lock password.
+            DomainVerificationUtils.registerNetworkPolicyListener(this)
             DomainVerificationUtils.schedulePeriodicCheckUnlocked(WorkManager.getInstance(this))
             DomainVerificationUtils.schedulePeriodicUpdateUnlocked(WorkManager.getInstance(this))
         }
diff --git a/packages/StatementService/src/com/android/statementservice/domain/BootCompletedReceiver.kt b/packages/StatementService/src/com/android/statementservice/domain/BootCompletedReceiver.kt
index 7b5da832b9d75..3f13469910cbe 100644
--- a/packages/StatementService/src/com/android/statementservice/domain/BootCompletedReceiver.kt
+++ b/packages/StatementService/src/com/android/statementservice/domain/BootCompletedReceiver.kt
@@ -43,6 +43,7 @@ class BootCompletedReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action != Intent.ACTION_BOOT_COMPLETED) return
         val workManager = WorkManager.getInstance(context)
+        DomainVerificationUtils.registerNetworkPolicyListener(context)
         DomainVerificationUtils.schedulePeriodicCheckUnlocked(workManager)
         workManager.beginUniqueWork(
             PACKAGE_BOOT_REQUEST_KEY,
diff --git a/packages/StatementService/src/com/android/statementservice/domain/DomainVerificationUtils.kt b/packages/StatementService/src/com/android/statementservice/domain/DomainVerificationUtils.kt
index 157a800d0e09d..0ebe06ea656b6 100644
--- a/packages/StatementService/src/com/android/statementservice/domain/DomainVerificationUtils.kt
+++ b/packages/StatementService/src/com/android/statementservice/domain/DomainVerificationUtils.kt
@@ -16,6 +16,8 @@
 
 package com.android.statementservice.domain
 
+import android.content.Context
+import android.net.NetworkPolicyManager
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
@@ -36,6 +38,9 @@ object DomainVerificationUtils {
 
     private const val UPDATE_WORKER_ENABLED = false
 
+    private val uidBlockedReasons = mutableMapOf<Int, Int>()
+    private var networkPolicyListener: NetworkPolicyManager.Listener? = null
+
     /**
      * In a majority of cases, the initial requests will be enough to verify domains, since they
      * are also restricted to [NetworkType.CONNECTED], but for cases where they aren't sufficient,
@@ -113,4 +118,31 @@ object DomainVerificationUtils {
             }
         }
     }
+
+    fun getUidBlockedReasons(uid: Int) : Int? {
+        return uidBlockedReasons[uid]
+    }
+
+    fun registerNetworkPolicyListener(context: Context) {
+        if (networkPolicyListener != null) {
+            unregisterNetworkPolicyListener(context)
+        }
+        networkPolicyListener = object : NetworkPolicyManager.Listener() {
+            override fun onBlockedReasonChanged(
+                uid: Int,
+                oldBlockedReasons: Int,
+                newBlockedReasons: Int
+            ) {
+                uidBlockedReasons[uid] = newBlockedReasons
+            }
+        }
+        val networkPolicyManager = context.getSystemService(NetworkPolicyManager::class.java)
+        networkPolicyManager?.registerListener(networkPolicyListener)
+    }
+
+    private fun unregisterNetworkPolicyListener(context: Context) {
+        val networkPolicyManager = context.getSystemService(NetworkPolicyManager::class.java)
+        networkPolicyManager?.unregisterListener(networkPolicyListener)
+        networkPolicyListener = null
+    }
 }
diff --git a/packages/StatementService/src/com/android/statementservice/domain/DomainVerifier.kt b/packages/StatementService/src/com/android/statementservice/domain/DomainVerifier.kt
index c7f6c184fd22b..b0858629b085c 100644
--- a/packages/StatementService/src/com/android/statementservice/domain/DomainVerifier.kt
+++ b/packages/StatementService/src/com/android/statementservice/domain/DomainVerifier.kt
@@ -17,7 +17,10 @@
 package com.android.statementservice.domain
 
 import android.content.Context
+import android.content.pm.PackageManager
 import android.content.pm.verify.domain.DomainVerificationManager
+import android.net.ConnectivityManager.BLOCKED_REASON_APP_BACKGROUND
+import android.net.ConnectivityManager.BLOCKED_REASON_NONE
 import android.net.Network
 import android.util.Log
 import androidx.collection.LruCache
@@ -92,6 +95,15 @@ class DomainVerifier private constructor(
         val assetMatcher = synchronized(targetAssetCache) { targetAssetCache[packageName] }
             .takeIf { it!!.isPresent }
             ?: return Triple(WorkResult.failure(), VerifyStatus.FAILURE_PACKAGE_MANAGER, null)
+        val packageUid = appContext.packageManager.getPackageUid(
+            packageName,
+            PackageManager.PackageInfoFlags.of(0)
+        )
+        // Fail if no blocked reason is set or for any reason other than APP_BACKGROUND and NONE
+        if (DomainVerificationUtils.getUidBlockedReasons(packageUid)
+            ?.and(BLOCKED_REASON_APP_BACKGROUND.inv())?.and(BLOCKED_REASON_NONE.inv()) != 0) {
+            return Triple(WorkResult.failure(), VerifyStatus.NO_RESPONSE, null)
+        }
         return verifyHost(host, assetMatcher.get(), network)
     }
 
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 200af795b4af8..8c4f377df7503 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -542,6 +542,7 @@ android_library {
         "displaylib",
         "aconfig_settings_flags_lib",
         "vendor.lineage.powershare-V1-java",
+        "FadingEdgeLayoutLib",
     ],
     libs: [
         "keepanno-annotations",
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 0c1aab9aacbea..a06d407dbea53 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -210,6 +210,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" />
 
@@ -398,12 +401,25 @@
     <!-- 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" />
+
+    <!-- To broadcast status of the GameSpaceManager -->
+    <uses-permission android:name="android.permission.MANAGE_GAME_MODE" />
+
+    <!-- Kill button in notification guts -->
+    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />
+
+    <!-- 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.ACTION_LAUNCH_MEDIA_OUTPUT_BROADCAST_DIALOG" />
     <protected-broadcast android:name="com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_DIALOG" />
     <protected-broadcast android:name="com.android.systemui.STARTED" />
+    <protected-broadcast android:name="com.android.systemui.doze.pulse" />
 
     <application
         android:name=".SystemUIApplication"
@@ -536,11 +552,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>
@@ -550,6 +577,23 @@
             </intent-filter>
         </receiver>
 
+        <!-- Smart Pixels -->
+        <service android:name=".smartpixels.SmartPixelsService"
+                android:enabled="true"
+                android:exported="true" />
+
+        <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"
@@ -570,6 +614,7 @@
                   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" />
@@ -598,6 +643,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"/>
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 9d2285c48b504..a485306c2700d 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,
     // TODO(b/285250939): Default this to true then remove once the Compose QS expandables have
     // proven that the new implementation is robust.
@@ -160,6 +165,7 @@ fun Expandable(
         modifier,
         onClick,
         onClickLabel,
+        onLongClick,
         interactionSource,
         useModifierBasedImplementation,
         defaultMinSize,
@@ -201,6 +207,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.
@@ -222,7 +229,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,
@@ -265,7 +272,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
@@ -310,7 +317,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 { controller.boundsInComposeViewRoot = it.boundsInRoot() }
@@ -360,6 +367,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
@@ -376,7 +384,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 { controller.boundsInComposeViewRoot = it.boundsInRoot() }
@@ -480,28 +488,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/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 69ac69d8a551c..4e90726c3d8f7 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
@@ -57,9 +58,12 @@ import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerMessageAreaVie
 import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerUdfpsIconViewModel
 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,
@@ -107,6 +111,7 @@ fun AlternateBouncer(
         udfpsIconLocation?.let { udfpsLocation ->
             Box {
                 DeviceEntryIcon(
+                    applicationScope,
                     viewModel = alternateBouncerDependencies.udfpsIconViewModel,
                     logger = alternateBouncerDependencies.logger,
                     modifier =
@@ -155,6 +160,7 @@ private fun StatusMessage(
 
 @Composable
 private fun DeviceEntryIcon(
+    applicationScope: CoroutineScope,
     viewModel: AlternateBouncerUdfpsIconViewModel,
     logger: TouchHandlingViewLogger,
     modifier: Modifier = Modifier,
@@ -163,12 +169,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/element/LockElement.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/element/LockElement.kt
index 87df890c9667f..3d64d74c44670 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/element/LockElement.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/element/LockElement.kt
@@ -48,6 +48,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 com.google.android.msdl.domain.MSDLPlayer
 import dagger.Lazy
 import javax.inject.Inject
@@ -69,6 +70,7 @@ constructor(
     private val vibratorHelper: Lazy<VibratorHelper>,
     private val msdlPlayer: Lazy<MSDLPlayer>,
     @LongPressTouchLog private val logBuffer: LogBuffer,
+    private val tunerService: TunerService,
 ) {
 
     @Composable
@@ -80,7 +82,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/qs/footer/ui/compose/FooterActions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
index 3bd2a4efee3e9..d7bd1394a8e6a 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
@@ -398,6 +398,7 @@ private fun IconButton(
     CircleExpandable(
         color = colors.background,
         onClick = model.onClick,
+        onLongClick = model.onLongClick,
         modifier = modifier,
         useModifierBasedImplementation = useModifierBasedExpandable,
     ) {
@@ -476,6 +477,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,
@@ -486,6 +488,7 @@ private fun CircleExpandable(
         borderStroke = borderStroke,
         shape = CircleShape,
         onClick = onClick,
+        onLongClick = onLongClick,
         interactionSource = interactionSource,
         modifier =
             modifier.borderOnFocus(
diff --git a/packages/SystemUI/customization/clocks/common/res/values/dimens.xml b/packages/SystemUI/customization/clocks/common/res/values/dimens.xml
index ea954cc16a420..4e5ed62e10c7e 100644
--- a/packages/SystemUI/customization/clocks/common/res/values/dimens.xml
+++ b/packages/SystemUI/customization/clocks/common/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="small_clock_text_size">86dp</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>
 
diff --git a/packages/SystemUI/customization/res/layout/clock_default_large.xml b/packages/SystemUI/customization/res/layout/clock_default_large.xml
index 0139d50dcfba2..b27bfaeca0aba 100644
--- a/packages/SystemUI/customization/res/layout/clock_default_large.xml
+++ b/packages/SystemUI/customization/res/layout/clock_default_large.xml
@@ -25,6 +25,8 @@
     android:textSize="@dimen/large_clock_text_size"
     android:fontFamily="@*android:string/config_clockFontFamily"
     android:typeface="monospace"
+    android:textAlignment="center"
+    android:includeFontPadding="false"
     android:elegantTextHeight="false"
     chargeAnimationDelay="200"
     dozeWeight="200"
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 4d9687068b562..a91434df8561e 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
@@ -192,6 +192,7 @@ open class ClockRegistry(
                 plugin.initialize(clockBuffers)
 
                 var isClockListChanged = false
+                plugin ?: return
                 for (clock in plugin.getClocks()) {
                     val id = clock.clockId
                     val info =
@@ -229,6 +230,7 @@ open class ClockRegistry(
                 plugin: ClockProviderPlugin,
                 manager: PluginLifecycleManager<ClockProviderPlugin>,
             ) {
+                plugin ?: return
                 for (clock in plugin.getClocks()) {
                     val id = clock.clockId
                     val info = availableClocks[id]
@@ -321,6 +323,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()
@@ -339,7 +352,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 bed74757b74e6..c769c19550810 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
@@ -23,6 +23,7 @@ import android.util.TypedValue
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.annotation.VisibleForTesting
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.customization.R as customR
 import com.android.systemui.customization.clocks.DefaultClockFaceLayout
 import com.android.systemui.customization.clocks.R as clocksR
@@ -45,7 +46,6 @@ import com.android.systemui.plugins.clocks.ThemeConfig
 import com.android.systemui.plugins.clocks.TimeFormatKind
 import com.android.systemui.plugins.clocks.WeatherData
 import com.android.systemui.plugins.clocks.ZenData
-import com.android.systemui.shared.Flags.ambientAod
 import java.io.PrintWriter
 import java.util.Locale
 
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt
index c4dfb647f3b7a..b19fa3476f8c9 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt
@@ -36,6 +36,7 @@ import android.view.animation.PathInterpolator
 import android.widget.TextView
 import com.android.app.animation.Interpolators
 import com.android.internal.annotations.VisibleForTesting
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.animation.AxisDefinition
 import com.android.systemui.animation.GSFAxes
 import com.android.systemui.animation.TextAnimator
@@ -52,7 +53,6 @@ import com.android.systemui.plugins.clocks.VPoint
 import com.android.systemui.plugins.clocks.VPointF
 import com.android.systemui.plugins.clocks.VPointF.Companion.size
 import com.android.systemui.plugins.clocks.VRectF
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.shared.clocks.ClockContext
 import com.android.systemui.shared.clocks.DigitTranslateAnimator
 import com.android.systemui.shared.clocks.DimensionParser
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 05730808d185d..2109e88e571cb 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
@@ -60,7 +60,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)
         }
@@ -68,7 +68,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/privacy/PrivacyConfigFlagsTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/privacy/PrivacyConfigFlagsTest.kt
index 821145d9f5afc..68f6db9621418 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/privacy/PrivacyConfigFlagsTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/privacy/PrivacyConfigFlagsTest.kt
@@ -16,11 +16,8 @@
 
 package com.android.systemui.privacy
 
-import android.location.flags.Flags
-import android.platform.test.annotations.EnableFlags
-import android.platform.test.flag.junit.FlagsParameterization
-import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf
 import android.provider.DeviceConfig
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags
 import com.android.systemui.SysuiTestCase
@@ -39,39 +36,33 @@ import org.mockito.Mockito.atLeastOnce
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
-import platform.test.runner.parameterized.ParameterizedAndroidJunit4
-import platform.test.runner.parameterized.Parameters
 
-@RunWith(ParameterizedAndroidJunit4::class)
+@RunWith(AndroidJUnit4::class)
 @SmallTest
 @android.platform.test.annotations.EnabledOnRavenwood
-class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
+class PrivacyConfigFlagsTest : SysuiTestCase() {
     companion object {
         private const val MIC_CAMERA = SystemUiDeviceConfigFlags.PROPERTY_MIC_CAMERA_ENABLED
+        private const val LOCATION = SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_ENABLED
         private const val MEDIA_PROJECTION =
-            SystemUiDeviceConfigFlags.PROPERTY_MEDIA_PROJECTION_INDICATORS_ENABLED
-
-        @JvmStatic
-        @Parameters(name = "{0}")
-        fun getParams(): List<FlagsParameterization> {
-            return allCombinationsOf(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
-        }
-    }
-
-    init {
-        mSetFlagsRule.setFlagsParameterization(flags)
+                SystemUiDeviceConfigFlags.PROPERTY_MEDIA_PROJECTION_INDICATORS_ENABLED
     }
 
     private lateinit var privacyConfig: PrivacyConfig
 
-    @Mock private lateinit var callback: PrivacyConfig.Callback
-    @Mock private lateinit var dumpManager: DumpManager
+    @Mock
+    private lateinit var callback: PrivacyConfig.Callback
+    @Mock
+    private lateinit var dumpManager: DumpManager
 
     private lateinit var executor: FakeExecutor
     private lateinit var deviceConfigProxy: DeviceConfigProxy
 
     fun createPrivacyConfig(): PrivacyConfig {
-        return PrivacyConfig(executor, deviceConfigProxy, dumpManager)
+        return PrivacyConfig(
+                executor,
+                deviceConfigProxy,
+                dumpManager)
     }
 
     @Before
@@ -87,13 +78,11 @@ class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
     fun testMicCameraListeningByDefault() {
         assertTrue(privacyConfig.micCameraAvailable)
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
     fun testMicCameraChanged() {
         changeMicCamera(false) // default is true
         executor.runAllReady()
@@ -104,7 +93,6 @@ class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
     fun testMediaProjectionChanged() {
         changeMediaProjection(false) // default is true
         executor.runAllReady()
@@ -115,9 +103,8 @@ class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
     fun testLocationChanged() {
-        changeMicCamera(true)
+        changeLocation(true)
         executor.runAllReady()
 
         verify(callback).onFlagLocationChanged(true)
@@ -125,8 +112,8 @@ class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
     fun testMicCamAndLocationChanged() {
+        changeLocation(true)
         changeMicCamera(false)
         executor.runAllReady()
 
@@ -138,7 +125,6 @@ class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_LOCATION_INDICATORS_ENABLED)
     fun testMicDeleted_stillAvailable() {
         changeMicCamera(true)
         executor.runAllReady()
@@ -150,15 +136,15 @@ class PrivacyConfigFlagsTest(flags: FlagsParameterization) : SysuiTestCase() {
     }
 
     private fun changeMicCamera(value: Boolean?) = changeProperty(MIC_CAMERA, value)
-
+    private fun changeLocation(value: Boolean?) = changeProperty(LOCATION, value)
     private fun changeMediaProjection(value: Boolean?) = changeProperty(MEDIA_PROJECTION, value)
 
     private fun changeProperty(name: String, value: Boolean?) {
         deviceConfigProxy.setProperty(
-            DeviceConfig.NAMESPACE_PRIVACY,
-            name,
-            value?.toString(),
-            false,
+                DeviceConfig.NAMESPACE_PRIVACY,
+                name,
+                value?.toString(),
+                false
         )
     }
 }
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
index c515d940d2aa1..f5a3e05c025a9 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
@@ -111,7 +111,7 @@ class TargetSdkResolverTest : SysuiTestCase() {
 
     private fun createSbn(notification: Notification) = StatusBarNotification(
             PACKAGE, "opPkg", 0, "tag", 0, 0,
-            notification, UserHandle(USER_ID), "", 0
+            notification, UserHandle(USER_ID), "", 0, false /* isContentSecure */
     )
 
     private fun createNotificationEntry(sbn: StatusBarNotification) =
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/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt
index 142820c67f2de..a4e560599cdec 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt
@@ -16,9 +16,9 @@ package com.android.systemui.plugins.clocks
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Rect
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.monet.ColorScheme
 import com.android.systemui.plugins.annotations.ProtectedInterface
-import com.android.systemui.shared.Flags.ambientAod
 
 /** Events that have specific data about the related face */
 @ProtectedInterface
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
index d789505138d89..0814510644387 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
@@ -38,7 +38,7 @@
               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_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/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/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_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_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_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_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_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_crdroid_logo.xml b/packages/SystemUI/res/drawable/ic_crdroid_logo.xml
new file mode 100644
index 0000000000000..6b5af131e4200
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_crdroid_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="m14.951,19.206c-0.0227-0.07025-0.03004-0.41881-0.01976-0.94056,0.005-0.2549,0.0129-0.5199,0.01751-0.58887,0.04255-0.63662,0.13888-1.2172,0.50713-3.0567,0.06407-0.32002,0.12942-0.65509,0.14522-0.74459,0.14583-0.82575,0.16896-1.4355,0.06269-1.6524-0.03433-0.07008-0.08241-0.10078-0.16592-0.10593-0.07602-0.0047-0.12854,0.01813-0.21817,0.09486-0.08838,0.07565-0.18701,0.20295-0.38183,0.49286-0.26412,0.39303-0.38333,0.55842-0.72299,1.003-1.0074,1.3186-2.0717,2.4527-3.0309,3.2295-1.4784,1.1972-2.9789,1.8964-4.304,2.0054-0.19195,0.01578-0.60064,0.0067-0.76589-0.01681-0.7477-0.105-1.2982-0.418-1.7275-0.98-0.6769-0.887-0.9181-2.249-0.6073-3.431,0.20756-0.78941,0.72205-1.3506,1.3859-1.5117,0.11567-0.02806,0.44543-0.02785,0.56193,0.000371,0.31078,0.07528,0.58564,0.25334,0.79442,0.51464,0.18182,0.22755,0.26972,0.5134,0.2561,0.83284-0.00657,0.15431-0.031153,0.27617-0.084821,0.42066-0.0941,0.254-0.2671,0.461-0.454,0.546-0.3333,0.151-0.7378-0.184-0.7826-0.647-0.00886-0.09154-0.00105-0.18024,0.026335-0.29866,0.022341-0.09664,0.019086-0.13328-0.012256-0.13798-0.03699-0.0054-0.23012,0.08015-0.32852,0.14576-0.30528,0.20358-0.5012,0.56091-0.55529,1.0127-0.019479,0.16274-0.013957,0.44282,0.012053,0.61133,0.089727,0.58128,0.37982,1.1045,0.78965,1.4243,0.44742,0.34912,1.132,0.48536,1.8831,0.37474,1.3507-0.19893,2.9807-1.168,4.5745-2.7197,0.51654-0.5029,1.14-1.2375,1.5568-1.8345,0.30134-0.43152,0.45099-0.71794,0.41364-0.7917-0.02701-0.05334-0.45255-0.04742-1.0131,0.01412-0.39559,0.04342-0.57877,0.05227-0.93655,0.04522-0.44239-0.0087-0.77193-0.04181-1.2236-0.12282-0.8801-0.156-1.8172-0.454-2.8614-0.906-0.1227-0.054-0.4569-0.204-0.7428-0.334-0.6435-0.292-0.8619-0.379-1.37-0.544-0.3308-0.108-0.5999-0.184-0.9699-0.274-0.4362-0.107-0.4-0.094-0.3955-0.151,0.00204-0.02529,0.00572-0.32536,0.00822-0.6668s0.00572-0.62237,0.00718-0.62428c0.00145-0.00191,0.14658-0.047332,0.32249-0.10094,0.91967-0.28025,2.0584-0.65706,3.4288-1.1346,1.9767-0.6888,2.3519-0.81066,2.7892-0.90598,0.96326-0.20996,1.6228-0.21388,2.4642-0.014648,0.77373,0.18322,1.7684,0.56611,3.5006,1.3476,0.54364,0.24525,0.7219,0.31058,1.0198,0.37373,0.4674,0.099089,0.8953,0.094183,1.3629-0.015623,0.22004-0.051672,0.34652-0.069199,0.42234-0.058528l0.06616,0.00931,0.0905,0.26172c0.16326,0.47216,0.33662,0.981,0.34241,1.005,0.0051,0.021026,0.0013,0.024805-0.0342,0.035107-0.02192,0.00641-0.12041,0.026482-0.21885,0.044745-0.54251,0.10065-0.8368,0.17033-1.1239,0.26608-0.72004,0.24019-1.2024,0.58688-1.5191,1.0918-0.21333,0.34012-0.34613,0.61773-0.41139,0.85995-0.08317,0.30867-0.13927,0.81614-0.11919,1.0781,0.01238,0.16152,0.02715,0.23325,0.07267,0.35268,0.09932,0.2606,0.29798,0.45275,0.73229,0.70829,0.14916,0.08777,0.16248,0.09762,0.16248,0.12029,0,0.01651-0.01953,0.02552-0.15185,0.06989-0.4995,0.16756-0.76056,0.51256-1.008,1.3321-0.0207,0.06855-0.08697,0.31592-0.14729,0.54972-0.23088,0.89498-0.38812,1.415-0.58192,1.9245-0.09576,0.25176-0.13789,0.34975-0.23211,0.5398-0.16689,0.33665-0.32396,0.537-0.46606,0.59449-0.07152,0.02894-0.07551,0.02808-0.0908-0.01925zm-1.9548-8.0283c0.49146-0.02201,0.67189-0.04328,1.0323-0.1218,1.0988-0.2393,2.2532-0.78599,2.9498-1.3969l0.06772-0.059417-0.21424-0.13733c-0.291-0.1867-0.529-0.3173-0.906-0.4973-0.357-0.1705-0.983-0.435-1.227-0.519-0.227-0.0778-0.8-0.2394-1.145-0.3227-0.10073-0.024355-0.19401-0.047113-0.20729-0.050572-0.02003-0.00522-0.02324-0.00322-0.01887,0.011697,0.0029,0.00989,0.01304,0.087732,0.02254,0.17298,0.06143,0.55077-0.02994,1.0075-0.26627,1.3312-0.145,0.1979-0.36,0.3449-0.601,0.4098-0.328,0.0885-0.731,0.0405-1.013-0.121-0.24-0.1376-0.402-0.3341-0.506-0.6144-0.05326-0.14288-0.08189-0.28043-0.09522-0.45765-0.01049-0.1395-0.0076-0.21572,0.01658-0.46382,0.0086-0.086969,0.01762-0.18186,0.0202-0.21087l0.0046-0.052743-0.03532,0.00728c-0.208,0.0426-1.2768,0.3742-2.1971,0.6814-0.9402,0.3137-1.6956,0.556-2.2664,0.7267-0.13619,0.040739-0.24483,0.077108-0.24142,0.080839,0.00339,0.00375,0.053022,0.025436,0.11026,0.048258,0.18441,0.073517,0.55634,0.23076,1.1655,0.49274,1.0977,0.47206,1.5767,0.65344,2.126,0.80504,0.47632,0.13144,1.0728,0.23966,1.4995,0.27206,0.10784,0.0082,1.6799-0.0038,1.923-0.01482zm-8.6201-3.0518c0.0000576-0.17378,0.027645-0.92837,0.04236-1.1587,0.00784-0.12256,0.034149-0.3812,0.045218-0.44438l0.0043-0.024536,0.33492-0.0000217c0.5183,0,0.7338-0.0301,1.1374-0.1585,0.4185-0.1333,0.8154-0.299,2.3194-0.9682,1.1825-0.5261,2.2665-0.8214,3.3545-0.914,0.23634-0.020088,0.7687-0.01713,0.98561,0.00548,0.29857,0.031117,0.59691,0.090531,1.0477,0.20866,0.91923,0.24086,1.8094,0.55926,2.9991,1.0727,0.57214,0.24694,0.81292,0.33913,1.1297,0.43253,0.66922,0.19734,1.181,0.2054,1.7299,0.027252,0.12089-0.039234,0.13468-0.04169,0.15176-0.027033,0.08254,0.070838,0.36671,0.6961,0.43178,0.95002,0.02883,0.11254,0.02562,0.11997-0.08159,0.188-0.16695,0.10594-0.37206,0.18557-0.548,0.21276-0.38396,0.05934-1.1,0.064919-1.3816,0.010765-0.226-0.0436-1.108-0.3668-1.886-0.6915-0.457-0.191-0.698-0.2817-1.066-0.4024-1.426-0.4681-2.901-0.6783-3.868-0.5512-0.15,0.0197-0.515,0.088-0.76,0.1423-0.352,0.0779-0.701,0.1793-1.0283,0.2983-0.2975,0.1081-0.549,0.211-1.3111,0.5364-1.5758,0.6727-2.8304,1.1133-3.6146,1.2692-0.1772,0.0353-0.1691,0.036-0.1691-0.0141z" />
+</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_internet_hotspot.xml b/packages/SystemUI/res/drawable/ic_internet_hotspot.xml
new file mode 100644
index 0000000000000..efe34a1cd329c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_internet_hotspot.xml
@@ -0,0 +1,11 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M 10 8.7 C 8.9 8.7 8 9.6 8 10.7 C 8 11.8 8.9 12.7 10 12.7 C 11.1 12.7 12 11.8 12 10.7 C 12 9.6 11.1 8.7 10 8.7 Z M 16 10.7 C 16 7.39 13.31 4.7 10 4.7 C 6.69 4.7 4 7.39 4 10.7 C 4 12.92 5.21 14.85 7 15.89 L 8 14.15 C 6.81 13.45 6 12.18 6 10.7 C 6 8.49 7.79 6.7 10 6.7 C 12.21 6.7 14 8.49 14 10.7 C 14 12.18 13.19 13.45 12 14.15 L 13 15.89 C 14.79 14.85 16 12.92 16 10.7 Z M 10 0.7 C 4.48 0.7 0 5.18 0 10.7 C 0 14.4 2.01 17.62 4.99 19.35 L 5.99 17.62 C 3.61 16.23 2 13.66 2 10.7 C 2 6.28 5.58 2.7 10 2.7 C 14.42 2.7 18 6.28 18 10.7 C 18 13.66 16.39 16.23 14 17.62 L 15 19.35 C 17.99 17.62 20 14.4 20 10.7 C 20 5.18 15.52 0.7 10 0.7 Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_internet_hotspot_disabled.xml b/packages/SystemUI/res/drawable/ic_internet_hotspot_disabled.xml
new file mode 100644
index 0000000000000..2d30019780f02
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_internet_hotspot_disabled.xml
@@ -0,0 +1,11 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="21"
+    android:viewportHeight="21"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M 1.61 0.81 L 0.19 2.22 L 2.88 4.91 C 1.58 6.6 0.8 8.71 0.8 11 C 0.8 13.76 1.92 16.26 3.73 18.07 L 5.15 16.65 C 3.7 15.21 2.8 13.21 2.8 11 C 2.8 9.25 3.37 7.65 4.31 6.34 L 5.74 7.77 C 5.15 8.7 4.8 9.81 4.8 11 C 4.8 12.66 5.48 14.15 6.56 15.24 L 7.98 13.82 C 7.25 13.1 6.8 12.11 6.8 11 C 6.8 10.37 6.95 9.77 7.21 9.24 L 8.82 10.85 C 8.82 10.9 8.8 10.95 8.8 11 C 8.8 11.55 9.03 12.05 9.39 12.41 C 9.75 12.77 10.25 13 10.8 13 C 10.85 13 10.9 12.99 10.96 12.98 L 18.58 20.6 L 19.99 19.19 L 1.61 0.81 Z M 16.5 12.87 C 16.69 12.28 16.8 11.65 16.8 11 C 16.8 7.69 14.11 5 10.8 5 C 10.15 5 9.52 5.1 8.93 5.3 L 10.64 7.01 C 10.69 7 10.75 7 10.8 7 C 13.01 7 14.8 8.79 14.8 11 C 14.8 11.05 14.8 11.11 14.79 11.16 L 16.5 12.87 Z M 10.8 3 C 15.22 3 18.8 6.58 18.8 11 C 18.8 12.22 18.53 13.37 18.03 14.4 L 19.52 15.89 C 20.33 14.45 20.8 12.78 20.8 11 C 20.8 5.48 16.32 1 10.8 1 C 9.02 1 7.36 1.46 5.91 2.28 L 7.39 3.76 C 8.43 3.27 9.58 3 10.8 3 Z"
+        android:fillColor="#000000"/>
+</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_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_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_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_smart_pixels.xml b/packages/SystemUI/res/drawable/ic_qs_smart_pixels.xml
new file mode 100644
index 0000000000000..525321baff966
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_smart_pixels.xml
@@ -0,0 +1,8 @@
+<!-- drawable/grid.xml -->
+<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="M10,4V8H14V4H10M16,4V8H20V4H16M16,10V14H20V10H16M16,16V20H20V16H16M14,20V16H10V20H14M8,20V16H4V20H8M8,14V10H4V14H8M8,8V4H4V8H8M10,14H14V10H10V14M4,2H20A2,2 0 0,1 22,4V20A2,2 0 0,1 20,22H4C2.92,22 2,21.1 2,20V4A2,2 0 0,1 4,2Z" />
+</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_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_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_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_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_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/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/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_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/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/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_network_traffic.xml b/packages/SystemUI/res/drawable/stat_sys_network_traffic.xml
new file mode 100644
index 0000000000000..c74ed333aa344
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_network_traffic.xml
@@ -0,0 +1,33 @@
+<?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="14dp"
+    android:height="18dp"
+    android:viewportWidth="14"
+    android:viewportHeight="18">
+
+    <path
+        android:name="down"
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M9,16l3-3h-2V8H8v5H6L9,16z" />
+
+    <path
+        android:name="up"
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M5,2L2,5h2v5h2V5h2L5,2z" />
+
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_network_traffic_down.xml b/packages/SystemUI/res/drawable/stat_sys_network_traffic_down.xml
new file mode 100644
index 0000000000000..22562636c9910
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_network_traffic_down.xml
@@ -0,0 +1,33 @@
+<?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="14dp"
+    android:height="18dp"
+    android:viewportWidth="14"
+    android:viewportHeight="18">
+
+    <path
+        android:name="down"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,16l3-3h-2V8H8v5H6L9,16z" />
+
+    <path
+        android:name="up"
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M5,2L2,5h2v5h2V5h2L5,2z" />
+
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_network_traffic_up.xml b/packages/SystemUI/res/drawable/stat_sys_network_traffic_up.xml
new file mode 100644
index 0000000000000..36f2c50c14d93
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_network_traffic_up.xml
@@ -0,0 +1,33 @@
+<?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="14dp"
+    android:height="18dp"
+    android:viewportWidth="14"
+    android:viewportHeight="18">
+
+    <path
+        android:name="down"
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M9,16l3-3h-2V8H8v5H6L9,16z" />
+
+    <path
+        android:name="up"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5,2L2,5h2v5h2V5h2L5,2z" />
+
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_network_traffic_updown.xml b/packages/SystemUI/res/drawable/stat_sys_network_traffic_updown.xml
new file mode 100644
index 0000000000000..f6796f98eb0f5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_network_traffic_updown.xml
@@ -0,0 +1,33 @@
+<?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="14dp"
+    android:height="18dp"
+    android:viewportWidth="14"
+    android:viewportHeight="18">
+
+    <path
+        android:name="down"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,16l3-3h-2V8H8v5H6L9,16z" />
+
+    <path
+        android:name="up"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5,2L2,5h2v5h2V5h2L5,2z" />
+
+</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/layout/contaminant_dialog.xml b/packages/SystemUI/res/layout/contaminant_dialog.xml
index 5f8c305322552..72310bb2b16bd 100644
--- a/packages/SystemUI/res/layout/contaminant_dialog.xml
+++ b/packages/SystemUI/res/layout/contaminant_dialog.xml
@@ -32,7 +32,7 @@
         android:paddingTop="18dp"
         android:paddingBottom="18dp"
         android:textAlignment="center"
-        android:fontFamily="google-sans-medium"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
         android:textSize="20sp"
         android:textStyle="bold"
         android:textColor="?android:attr/textColorPrimary"/>
@@ -46,7 +46,7 @@
         android:paddingBottom="24dp"
         android:textAlignment="center"
         android:textSize="16sp"
-        android:fontFamily="roboto-regular"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:textColor="?android:attr/textColorPrimary" />
 
     <LinearLayout
diff --git a/packages/SystemUI/res/layout/immersive_mode_cling.xml b/packages/SystemUI/res/layout/immersive_mode_cling.xml
index f12cf96c55970..37d0fe60b5bae 100644
--- a/packages/SystemUI/res/layout/immersive_mode_cling.xml
+++ b/packages/SystemUI/res/layout/immersive_mode_cling.xml
@@ -44,7 +44,7 @@
         android:text="@string/immersive_cling_title"
         android:textColor="@androidprv:color/materialColorOnSurface"
         android:textSize="24sp"
-        android:fontFamily="google-sans" />
+        android:fontFamily="@*android:string/config_headlineFontFamily" />
 
     <TextView
         android:id="@+id/immersive_cling_description"
@@ -56,7 +56,7 @@
         android:text="@string/immersive_cling_description"
         android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
         android:textSize="14sp"
-        android:fontFamily="google-sans" />
+        android:fontFamily="@*android:string/config_bodyFontFamily" />
 
     <Button
         android:id="@+id/ok"
@@ -76,5 +76,5 @@
         android:textAllCaps="false"
         android:textSize="14sp"
         android:textFontWeight="500"
-        android:fontFamily="google-sans" />
+        android:fontFamily="@*android:string/config_bodyFontFamily" />
 </RelativeLayout>
diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
index 67e97010ff22f..9a1e3373e4da3 100644
--- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
+++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
@@ -128,7 +128,153 @@
 
                 <LinearLayout
                     android:id="@+id/mobile_network_layout"
-                    style="@style/InternetDialog.Network">
+                    style="@style/InternetDialog.Network"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <LinearLayout
+                        android:id="@+id/mobile_network_sublayout"
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent">
+                        <FrameLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="24dp"
+                            android:clickable="false"
+                            android:layout_gravity="center_vertical|start">
+                            <ImageView
+                                android:id="@+id/signal_icon"
+                                android:autoMirrored="true"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_weight="1"
+                            android:orientation="vertical"
+                            android:clickable="false"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minHeight="72dp"
+                            android:gravity="center_vertical">
+                            <TextView
+                                android:id="@+id/mobile_title"
+                                android:maxLines="1"
+                                style="@style/InternetDialog.NetworkTitle"/>
+                            <TextView
+                                android:id="@+id/mobile_summary"
+                                style="@style/InternetDialog.NetworkSummary"/>
+                            <TextView
+                                android:id="@+id/airplane_mode_summary"
+                                android:text="@string/airplane_mode"
+                                android:visibility="gone"
+                                style="@style/InternetDialog.NetworkSummary"/>
+                        </LinearLayout>
+
+                        <View
+                            android:id="@+id/mobile_toggle_divider"
+                            android:layout_width="1dp"
+                            android:layout_height="28dp"
+                            android:layout_marginStart="7dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_gravity="center_vertical"/>
+
+                        <FrameLayout
+                            android:layout_width="@dimen/settingslib_switch_track_width"
+                            android:layout_height="48dp"
+                            android:layout_gravity="end|center_vertical">
+                            <Switch
+                                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"/>
+                        </FrameLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/fiveg_layout"
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent">
+                        <FrameLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="24dp"
+                            android:clickable="false"
+                            android:layout_gravity="center_vertical|start">
+                            <ImageView
+                                android:id="@+id/fiveg_icon"
+                                android:autoMirrored="true"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:src="@drawable/ic_5g_mobiledata"/>
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_weight="1"
+                            android:orientation="vertical"
+                            android:clickable="false"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minHeight="48dp"
+                            android:gravity="center_vertical">
+                            <TextView
+                                android:id="@+id/fiveg_title"
+                                android:maxLines="1"
+                                style="@style/InternetDialog.NetworkTitle"/>
+                        </LinearLayout>
+
+                        <View
+                            android:id="@+id/fiveg_toggle_divider"
+                            android:layout_width="1dp"
+                            android:layout_height="28dp"
+                            android:layout_marginStart="7dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_gravity="center_vertical"/>
+
+                        <FrameLayout
+                            android:layout_width="@dimen/settingslib_switch_track_width"
+                            android:layout_height="48dp"
+                            android:layout_gravity="end|center_vertical">
+                            <Switch
+                                android:id="@+id/fiveg_toggle"
+                                android:contentDescription="@string/enable_fiveg"
+                                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"/>
+                        </FrameLayout>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <ViewStub android:id="@+id/secondary_mobile_network_stub"
+                  android:inflatedId="@+id/secondary_mobile_network_layout"
+                  android:layout="@layout/qs_dialog_secondary_mobile_network"
+                  style="@style/InternetDialog.Network"/>
+
+                <Space
+                    android:id="@+id/mobile_connected_space"
+                    android:layout_height="8dp"
+                    android:layout_width="match_parent"
+                    android:visibility="gone"/>
+
+                <LinearLayout
+                    android:id="@+id/hotspot_layout"
+                    style="@style/InternetDialog.Network"
+                    android:layout_height="@dimen/internet_dialog_wifi_network_height"
+                    android:gravity="center"
+                    android:clickable="false"
+                    android:focusable="false">
 
                     <FrameLayout
                         android:layout_width="wrap_content"
@@ -136,11 +282,12 @@
                         android:clickable="false"
                         android:layout_gravity="center_vertical|start">
                         <ImageView
-                            android:id="@+id/signal_icon"
+                            android:id="@+id/hotspot_icon"
                             android:autoMirrored="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"/>
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_internet_hotspot_disabled"/>
                     </FrameLayout>
 
                     <LinearLayout
@@ -149,37 +296,34 @@
                         android:clickable="false"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:minHeight="72dp"
+                        android:minHeight="48dp"
                         android:gravity="center_vertical">
                         <TextView
-                            android:id="@+id/mobile_title"
+                            android:id="@+id/hotspot_title"
                             android:maxLines="1"
                             style="@style/InternetDialog.NetworkTitle"/>
                         <TextView
-                            android:id="@+id/mobile_summary"
-                            style="@style/InternetDialog.NetworkSummary"/>
-                        <TextView
-                            android:id="@+id/airplane_mode_summary"
-                            android:text="@string/airplane_mode"
-                            android:visibility="gone"
+                            android:id="@+id/hotspot_summary"
                             style="@style/InternetDialog.NetworkSummary"/>
                     </LinearLayout>
 
                     <View
-                        android:id="@+id/mobile_toggle_divider"
+                        android:id="@+id/hotspot_toggle_divider"
                         android:layout_width="1dp"
                         android:layout_height="28dp"
                         android:layout_marginStart="7dp"
                         android:layout_marginEnd="16dp"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_gravity="center_vertical"
+                        android:background="@color/disconnected_network_primary_color"/>
 
                     <FrameLayout
                         android:layout_width="@dimen/settingslib_switch_track_width"
                         android:layout_height="48dp"
-                        android:layout_gravity="end|center_vertical">
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp">
                         <Switch
-                            android:id="@+id/mobile_toggle"
-                            android:contentDescription="@string/mobile_data_settings_title"
+                            android:id="@+id/hotspot_toggle"
+                            android:contentDescription="@string/quick_settings_hotspot_label"
                             android:switchMinWidth="@dimen/settingslib_switch_track_width"
                             android:layout_gravity="center"
                             android:layout_width="@dimen/settingslib_switch_track_width"
@@ -191,10 +335,11 @@
 
                 </LinearLayout>
 
-                <ViewStub android:id="@+id/secondary_mobile_network_stub"
-                  android:inflatedId="@+id/secondary_mobile_network_layout"
-                  android:layout="@layout/qs_dialog_secondary_mobile_network"
-                  style="@style/InternetDialog.Network"/>
+                <Space
+                    android:id="@+id/wifi_connected_space"
+                    android:layout_height="8dp"
+                    android:layout_width="match_parent"
+                    android:visibility="gone"/>
 
                 <LinearLayout
                     android:id="@+id/turn_on_wifi_layout"
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 a81d90bd13fc5..13674988e9f6b 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -55,6 +55,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>
@@ -71,7 +73,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/navigation_layout.xml b/packages/SystemUI/res/layout/navigation_layout.xml
index 5c6c9a4e6e284..d1429f75e327a 100644
--- a/packages/SystemUI/res/layout/navigation_layout.xml
+++ b/packages/SystemUI/res/layout/navigation_layout.xml
@@ -36,19 +36,19 @@
         systemui:isVertical="false">
 
         <LinearLayout
-            android:id="@+id/ends_group"
-            android:layout_width="match_parent"
+            android:id="@+id/center_group"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
             android:orientation="horizontal"
             android:clipToPadding="false"
             android:clipChildren="false" />
 
         <LinearLayout
-            android:id="@+id/center_group"
-            android:layout_width="wrap_content"
+            android:id="@+id/ends_group"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
             android:orientation="horizontal"
             android:clipToPadding="false"
             android:clipChildren="false" />
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/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/shutdown_dialog_finder_active.xml b/packages/SystemUI/res/layout/shutdown_dialog_finder_active.xml
index b6db7fc8007f1..4440568c86e23 100644
--- a/packages/SystemUI/res/layout/shutdown_dialog_finder_active.xml
+++ b/packages/SystemUI/res/layout/shutdown_dialog_finder_active.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
-        android:fontFamily="google-sans"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:gravity="center"
         android:text="@string/shutdown_progress"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
-        android:fontFamily="google-sans"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:gravity="center"
         android:text="@string/shutdown_progress"
         android:textAppearance="?android:attr/textAppearanceLarge"
@@ -59,7 +59,7 @@
         android:background="@drawable/bg_shutdown_finder_message"
         android:drawablePadding="16dp"
         android:drawableStart="@drawable/ic_finder_active"
-        android:fontFamily="google-sans"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:gravity="start"
         android:padding="20dp"
         android:text="@string/finder_active"
diff --git a/packages/SystemUI/res/layout/smart_action_button.xml b/packages/SystemUI/res/layout/smart_action_button.xml
index 4e5785d284ee3..a459c5635c3f6 100644
--- a/packages/SystemUI/res/layout/smart_action_button.xml
+++ b/packages/SystemUI/res/layout/smart_action_button.xml
@@ -25,7 +25,7 @@
         android:paddingVertical="@dimen/smart_reply_button_padding_vertical"
         android:background="@drawable/smart_reply_button_background"
         android:gravity="center"
-        android:fontFamily="roboto-medium"
+        android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
         android:textSize="@dimen/smart_reply_button_font_size"
         android:lineSpacingExtra="@dimen/smart_reply_button_line_spacing_extra"
         android:textColor="@color/smart_reply_button_text"
diff --git a/packages/SystemUI/res/layout/smart_reply_button.xml b/packages/SystemUI/res/layout/smart_reply_button.xml
index b24362febbdd3..b9d6b301862f7 100644
--- a/packages/SystemUI/res/layout/smart_reply_button.xml
+++ b/packages/SystemUI/res/layout/smart_reply_button.xml
@@ -27,7 +27,7 @@
         android:paddingVertical="@dimen/smart_reply_button_padding_vertical"
         android:background="@drawable/smart_reply_button_background"
         android:gravity="center"
-        android:fontFamily="roboto-medium"
+        android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
         android:textSize="@dimen/smart_reply_button_font_size"
         android:lineSpacingExtra="@dimen/smart_reply_button_line_spacing_extra"
         android:textColor="@color/smart_reply_button_text"
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index 6a21d8f2cfb76..2b9dc39b88485 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -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,17 @@
                         android:layout_height="match_parent"
                         android:layout="@layout/operator_name" />
 
+                    <com.android.systemui.crdroid.logo.LogoImageView
+                        android:id="@+id/statusbar_logo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
+                        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
+                        android:gravity="center_vertical|start"
+                        android:scaleType="center"
+                        android:visibility="gone" />
+
                     <com.android.systemui.statusbar.policy.Clock
                         android:id="@+id/clock"
                         android:layout_width="wrap_content"
@@ -188,4 +199,9 @@
         />
     </com.android.keyguard.AlphaOptimizedLinearLayout>
 
+    <com.android.systemui.crdroid.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 527c75eaced3b..e5b5c619b147d 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"
@@ -65,5 +66,16 @@
             android:visibility="gone"
             systemui:isStatusBar="true"
         />
+
+        <com.android.systemui.crdroid.logo.LogoImageViewRight
+            android:id="@+id/statusbar_logo_right"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical|end"
+            android:paddingStart="@dimen/status_bar_clock_starting_padding"
+            android:paddingEnd="@dimen/status_bar_clock_end_padding"
+            android:gravity="center_vertical"
+            android:scaleType="center"
+            android:visibility="gone" />
     </com.android.keyguard.AlphaOptimizedLinearLayout>
 </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/wireless_charging_layout.xml b/packages/SystemUI/res/layout/wireless_charging_layout.xml
index f1bc883700713..a91d869138e7b 100644
--- a/packages/SystemUI/res/layout/wireless_charging_layout.xml
+++ b/packages/SystemUI/res/layout/wireless_charging_layout.xml
@@ -53,6 +53,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/values-ar-rSA/cr_strings.xml b/packages/SystemUI/res/values-ar-rSA/cr_strings.xml
new file mode 100644
index 0000000000000..bfe1a1dd433c7
--- /dev/null
+++ b/packages/SystemUI/res/values-ar-rSA/cr_strings.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">اتصالات عالية الجودة (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">اتصال عبر الـ Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">ك. ب/ث</string>
+    <string name="megabitspersecond_short">م. ب/ث</string>
+    <string name="gigabitspersecond_short">ج. ب/ث</string>
+    <string name="kilobytespersecond_short">ك. بايت/ث</string>
+    <string name="megabytespersecond_short">م. بايت/ث</string>
+    <string name="gigabytespersecond_short">ج. بايت/ث</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> • شحن سريع (<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> • شحن سريع</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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">الأولويّة</string>
+    <string name="volume_ringer_alarms_only">التنبيهات</string>
+    <string name="volume_ringer_dnd">لا إزعاج</string>
+    <string name="tristate_flashlight">الكشاف</string>
+    <string name="tristate_flashlight_on">الكشاف يعمل</string>
+    <string name="tristate_flashlight_off">الكشاف مغلق</string>
+    <string name="tristate_flashlight_blink">ومض الكشاف</string>
+    <string name="tristate_brightness_bright">أقصى سطوع</string>
+    <string name="tristate_brightness_dark">أقل سطوع</string>
+    <string name="tristate_brightness_auto">سطوع تلقائي</string>
+    <string name="tristate_rotation_auto">دوران تلقائي</string>
+    <string name="tristate_rotation_0">الوضع الرأسي</string>
+    <string name="tristate_rotation_90">عرضي (90 درجة)</string>
+    <string name="tristate_rotation_270">عرضي (270 درجة)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">المستخدم اليوم</string>
+    <string name="usage_data_weekly">used this week</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">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">معلومات المعالج</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">معلومات معدَّل العرض</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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">الدقة الذكية</string>
+    <string name="quick_settings_smart_pixels_on_power_save">تمكين الدقة الذكية تلقائياً</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="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">مساعد AI</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">يتم التعرف على الوجه...</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>
+    <!-- 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</item>
+        <item quantity="one">%d جهاز متصل</item>
+        <item quantity="two">%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>
+</resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/cr_strings.xml b/packages/SystemUI/res/values-az-rAZ/cr_strings.xml
new file mode 100644
index 0000000000000..70195222224b6
--- /dev/null
+++ b/packages/SystemUI/res/values-az-rAZ/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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 qənaəti</string>
+    <string name="status_bar_call_strength">Zəng siqnal gücü</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Rouminq göstəricisi</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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 doldurulur (Dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> qalıb)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Enerji doldurulması</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 doldurulur (Dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> qalıb)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Enerji doldurulması</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 doldurulur (Dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> qalıb)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Enerji doldurulması</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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Sistem interfeysi</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go aktivləşdirildi</string>
+    <string name="onthego_notif_title">On-The-Go aktivdir</string>
+    <string name="onthego_notif_stop">Dayandırın</string>
+    <string name="onthego_notif_options">Seçimlər</string>
+    <string name="onthego_notif_error">On-The-Go funksiyasını açmaq mümkün olmadı</string>
+    <string name="onthego_notif_restart">On-The-Go funksiyasını yenidən işə sal</string>
+    <string name="onthego_notif_camera_changed">Kamera rejimi dəyişdirildi</string>
+    <string name="onthego_transparency">Şəffaflıq</string>
+    <string name="onthego_front_camera">Ön kameradan istifadə edin</string>
+    <string name="onthego_service_toggle">Xidməti avtomatik olaraq yenidən başladın</string>
+    <string name="onthego_channel_name">Əsas</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Öncəlik</string>
+    <string name="volume_ringer_alarms_only">Alarmlar</string>
+    <string name="volume_ringer_dnd">DnD</string>
+    <string name="tristate_flashlight">Fənər</string>
+    <string name="tristate_flashlight_on">Fənər açıq</string>
+    <string name="tristate_flashlight_off">Fənər bağlı</string>
+    <string name="tristate_flashlight_blink">Fənər titrəməsi</string>
+    <string name="tristate_brightness_bright">Tam parlaqlıq</string>
+    <string name="tristate_brightness_dark">Ən aşağı parlaqlıq</string>
+    <string name="tristate_brightness_auto">Avtomatik parlaqlıq</string>
+    <string name="tristate_rotation_auto">Avto döndərmə</string>
+    <string name="tristate_rotation_0">Şaquli</string>
+    <string name="tristate_rotation_90">Üfüqi (90°)</string>
+    <string name="tristate_rotation_270">Üfüqi (270°)</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">Məcburi dayandırılsın?</string>
+    <string name="force_stop_dlg_text">Tətbiqi məcburi dayandırsanız, xətalı davrana bilər.</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">Səs</string>
+    <string name="quick_settings_sound_ring">Zəng səsi</string>
+    <string name="quick_settings_sound_vibrate">Vibrasiya</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU məlumatı</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS məlumatı</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">Kompas</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">Hazırlanır\u2026</string>
+    <string name="quick_settings_compass_N">Şi</string>
+    <string name="quick_settings_compass_NE">ŞŞ</string>
+    <string name="quick_settings_compass_E">Şə</string>
+    <string name="quick_settings_compass_SE">CŞ</string>
+    <string name="quick_settings_compass_S">C</string>
+    <string name="quick_settings_compass_SW">CQ</string>
+    <string name="quick_settings_compass_W">Q</string>
+    <string name="quick_settings_compass_NW">ŞQ</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Şəbəkə kartını dəyişdir</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Səs paneli</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Ağıllı Piksellər</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Auto-enabled Smart Pixels</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Hava məlumatı yüklənərkən problem yarandı</string>
+    <string name="omnijaws_service_unknown">Hava məlumatı yoxdur</string>
+    <string name="omnijaws_label_default">Hava</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</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">Dil</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>
+    <!-- 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>
+    <!-- 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">Sil</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Ekran qeydi silindi</string>
+</resources>
diff --git a/packages/SystemUI/res/values-be-rBY/cr_strings.xml b/packages/SystemUI/res/values-be-rBY/cr_strings.xml
new file mode 100644
index 0000000000000..8b496dd906d01
--- /dev/null
+++ b/packages/SystemUI/res/values-be-rBY/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">кбіт/с</string>
+    <string name="megabitspersecond_short">Мб/с</string>
+    <string name="gigabitspersecond_short">Гб/с</string>
+    <string name="kilobytespersecond_short">кБ/с</string>
+    <string name="megabytespersecond_short">МБ/с</string>
+    <string name="gigabytespersecond_short">Гб/с</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Воблачна</string>
+    <string name="weather_condition_rain">Дождж</string>
+    <string name="weather_condition_clear">Clear Sky</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 гадзінны і 2 хвіліны">%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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Прыярытэт</string>
+    <string name="volume_ringer_alarms_only">Будзільнікі</string>
+    <string name="volume_ringer_dnd">Не турбаваць</string>
+    <string name="tristate_flashlight">Ліхтарык</string>
+    <string name="tristate_flashlight_on">Ліхтарык уключаны</string>
+    <string name="tristate_flashlight_off">Ліхтарык выключаны</string>
+    <string name="tristate_flashlight_blink">Ліхтарык</string>
+    <string name="tristate_brightness_bright">Максімальная яркасць</string>
+    <string name="tristate_brightness_dark">Мінімальная яркасць</string>
+    <string name="tristate_brightness_auto">Аўтаматычная яркасць</string>
+    <string name="tristate_rotation_auto">Аўтапаварот</string>
+    <string name="tristate_rotation_0">Партрэт</string>
+    <string name="tristate_rotation_90">Ландшафт (90°)</string>
+    <string name="tristate_rotation_270">Ландшафт (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">выкарыстоўваецца сёння</string>
+    <string name="usage_data_weekly">used this week</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">Спынiць прымусова?</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">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">FPS: <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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Разумныя пікселі</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Аўтаматычнае ўключэнне разумных пікселяў</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="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">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">Распазнаванне асобы...</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>
+    <!-- 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>
+</resources>
diff --git a/packages/SystemUI/res/values-bg-rBG/cr_strings.xml b/packages/SystemUI/res/values-bg-rBG/cr_strings.xml
new file mode 100644
index 0000000000000..01db0a3c3588a
--- /dev/null
+++ b/packages/SystemUI/res/values-bg-rBG/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Индикатор за роуминг</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kб/с</string>
+    <string name="megabitspersecond_short">Mб/с</string>
+    <string name="gigabitspersecond_short">Гб/с</string>
+    <string name="kilobytespersecond_short">kб/с</string>
+    <string name="megabytespersecond_short">MБ/с</string>
+    <string name="gigabytespersecond_short">Гб/с</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> • Бързо зареждане (<xliff:g id="charging_time_left" example="4 часа и 2 минути">%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 часа и 2 минути">%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 часа и 2 минути">%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 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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Системен UI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go активиран</string>
+    <string name="onthego_notif_title">On-The-Go е активен</string>
+    <string name="onthego_notif_stop">Стоп</string>
+    <string name="onthego_notif_options">Опции</string>
+    <string name="onthego_notif_error">Невъзможно стартиране на On-The-Go</string>
+    <string name="onthego_notif_restart">Рестартиране на On-The-Go</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">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Приоритет</string>
+    <string name="volume_ringer_alarms_only">Будилници</string>
+    <string name="volume_ringer_dnd">DnD</string>
+    <string name="tristate_flashlight">Фенерче</string>
+    <string name="tristate_flashlight_on">Фенерчето е включено</string>
+    <string name="tristate_flashlight_off">Фенерчето е изключено</string>
+    <string name="tristate_flashlight_blink">Мигане на фенерче</string>
+    <string name="tristate_brightness_bright">Максимална яркост</string>
+    <string name="tristate_brightness_dark">Минимална яркост</string>
+    <string name="tristate_brightness_auto">Автоматична яркост</string>
+    <string name="tristate_rotation_auto">Автоматично завъртане</string>
+    <string name="tristate_rotation_0">Портрет</string>
+    <string name="tristate_rotation_90">Пейзаж (90°)</string>
+    <string name="tristate_rotation_270">Пейзаж (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">Използвани днес</string>
+    <string name="usage_data_weekly">used this week</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">Lens</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">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Информация за CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Информация за 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">Компас</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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Смарт Пиксели</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Автоматично включване на Смарт Пиксели</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">Refresh rate</string>
+    <string name="auto_mode_label">Автоматично</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Език</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>
+    <!-- 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>
+    <!-- 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">Изтриване</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Запис на екрана е изтрит</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ca-rES/cr_strings.xml b/packages/SystemUI/res/values-ca-rES/cr_strings.xml
new file mode 100644
index 0000000000000..590f2afb3bd07
--- /dev/null
+++ b/packages/SystemUI/res/values-ca-rES/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Estalvi de dades</string>
+    <string name="status_bar_call_strength">Força de la trucada</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicador d\'itinerància</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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> • Càrrega Dash (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> per càrrega completa)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Càrrega 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> • Càrrega Warp (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> per càrrega completa)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Càrrega 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> • Càrrega VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> per a completar)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Càrrega 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> • Càrrega Turbo (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> per a finalitzar la càrrega)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Càrrega Turbo</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Interfície del sistema</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activat</string>
+    <string name="onthego_notif_title">On-The-Go està actiu</string>
+    <string name="onthego_notif_stop">Aturar</string>
+    <string name="onthego_notif_options">Opcions</string>
+    <string name="onthego_notif_error">No a sigut possible iniciar On-The-Go</string>
+    <string name="onthego_notif_restart">Reinicialitzar On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Mode de càmera canviat</string>
+    <string name="onthego_transparency">Transparència</string>
+    <string name="onthego_front_camera">Utilitzar la càmera frontal</string>
+    <string name="onthego_service_toggle">Reinicia automàticament el servei</string>
+    <string name="onthego_channel_name">Principal</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioritat</string>
+    <string name="volume_ringer_alarms_only">Alarmes</string>
+    <string name="volume_ringer_dnd">No molestar</string>
+    <string name="tristate_flashlight">Llanterna</string>
+    <string name="tristate_flashlight_on">Llanterna encesa</string>
+    <string name="tristate_flashlight_off">Llanterna apagada</string>
+    <string name="tristate_flashlight_blink">Llanterna parpadejant</string>
+    <string name="tristate_brightness_bright">Brillantor màxima</string>
+    <string name="tristate_brightness_dark">Brillantor màxima</string>
+    <string name="tristate_brightness_auto">Brillantor automàtica</string>
+    <string name="tristate_rotation_auto">Gira automàticament</string>
+    <string name="tristate_rotation_0">Vertical</string>
+    <string name="tristate_rotation_90">Horitzontal (90º)</string>
+    <string name="tristate_rotation_270">Horitzontal (270º)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">utilitzat avui</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Dades</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Forçar l\'aturada?</string>
+    <string name="force_stop_dlg_text">Si es força l\'aturada d\'una app, és possible que no funcioni correctament.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lent</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">So</string>
+    <string name="quick_settings_sound_ring">Timbre</string>
+    <string name="quick_settings_sound_vibrate">Vibrar</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informació de CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Informació de FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" exemple="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Brúixola</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">Inicialitzant\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">Cambiar tarjeta de dades</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panell de volum</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Píxels intel·ligents</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Activa automàticament els píxels intel·ligents</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error carregant la informació de l\'oratge</string>
+    <string name="omnijaws_service_unknown">No hi ha informació de l\'oratge</string>
+    <string name="omnijaws_label_default">Oratge</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Freqüència de refresc</string>
+    <string name="auto_mode_label">Automàtic</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Prem prolongadament la regió seleccionada</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Idioma</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">Reconeixent rostre...</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>
+    <!-- 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 dispositiu connectat</item>
+        <item quantity="other">%d dispositius connectats</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">Eliminar</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">S\'ha eliminat la gravació de pantalla</string>
+</resources>
diff --git a/packages/SystemUI/res/values-cs-rCZ/cr_strings.xml b/packages/SystemUI/res/values-cs-rCZ/cr_strings.xml
new file mode 100644
index 0000000000000..71fee27aa40ca
--- /dev/null
+++ b/packages/SystemUI/res/values-cs-rCZ/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Spořič dat</string>
+    <string name="status_bar_call_strength">Síla signálu hovoru</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indikátor roamingu</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD hovory (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi hovory (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Ikona zakázaných dat</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Ikona 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Oblačno</string>
+    <string name="weather_condition_rain">Deštivo</string>
+    <string name="weather_condition_clear">Jasno</string>
+    <string name="weather_condition_storm">Bouřka</string>
+    <string name="weather_condition_snow">Sněžení</string>
+    <string name="weather_condition_wind">Větrno</string>
+    <string name="weather_condition_mist">Mlhavo</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 nabíjení (zbývá <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do plného nabití)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • DASH nabíjení</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 nabíjení (zbývá <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do plného nabití)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp nabíjení</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 nabíjení (zbývá <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do plného nabití)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC nabíjení</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 nabíjení (zbývá <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do plného nabití)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo nabíjení</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 aktivováno</string>
+    <string name="onthego_notif_title">On‑The‑Go je aktivní</string>
+    <string name="onthego_notif_stop">Zastavit</string>
+    <string name="onthego_notif_options">Možnosti</string>
+    <string name="onthego_notif_error">On‑The‑Go nelze spustit</string>
+    <string name="onthego_notif_restart">Restartovat On‑The‑Go</string>
+    <string name="onthego_notif_camera_changed">Režim fotoaparátu byl změněn</string>
+    <string name="onthego_transparency">Průhlednost</string>
+    <string name="onthego_front_camera">Použít přední fotoaparát</string>
+    <string name="onthego_service_toggle">Automaticky restartovat službu</string>
+    <string name="onthego_channel_name">Hlavní</string>
+    <string name="global_action_onthego">On‑The‑Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioritní</string>
+    <string name="volume_ringer_alarms_only">Budíky</string>
+    <string name="volume_ringer_dnd">Nerušit</string>
+    <string name="tristate_flashlight">Svítilna</string>
+    <string name="tristate_flashlight_on">Svítilna zapnuta</string>
+    <string name="tristate_flashlight_off">Svítilna vypnuta</string>
+    <string name="tristate_flashlight_blink">Blikání svítilny</string>
+    <string name="tristate_brightness_bright">Maximální jas</string>
+    <string name="tristate_brightness_dark">Minimální jas</string>
+    <string name="tristate_brightness_auto">Automatický jas</string>
+    <string name="tristate_rotation_auto">Automatické otáčení</string>
+    <string name="tristate_rotation_0">Na výšku</string>
+    <string name="tristate_rotation_90">Na šířku (90°)</string>
+    <string name="tristate_rotation_270">Na šířku (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">využito dnes</string>
+    <string name="usage_data_weekly">využito tento týden</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">Vynutit ukončení?</string>
+    <string name="force_stop_dlg_text">Vynucené ukončení může způsobit nepředvídatelné chování aplikace.</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">Zvuk</string>
+    <string name="quick_settings_sound_ring">Vyzvánění</string>
+    <string name="quick_settings_sound_vibrate">Vibrace</string>
+    <string name="quick_settings_sound_silent">Tichý</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informace o\u00a0CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Informace o\u00a0FPS</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">Kompas</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">Inicializuje se\u2026</string>
+    <string name="quick_settings_compass_N">S</string>
+    <string name="quick_settings_compass_NE">SV</string>
+    <string name="quick_settings_compass_E">V</string>
+    <string name="quick_settings_compass_SE">JV</string>
+    <string name="quick_settings_compass_S">J</string>
+    <string name="quick_settings_compass_SW">JZ</string>
+    <string name="quick_settings_compass_W">Z</string>
+    <string name="quick_settings_compass_NW">SZ</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Přepnout SIM pro data</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panel hlasitosti</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Automaticky povolit Smart Pixels</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Chyba při načítání údajů o\u00a0počasí</string>
+    <string name="omnijaws_service_unknown">Žádné údaje o\u00a0počasí</string>
+    <string name="omnijaws_label_default">Počasí</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Obnovovací frekvence</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Dlouhým stiskem – vybraná oblast</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Jazyk</string>
+    <string name="quick_settings_locale_more_locales_toast">Nejdříve nakonfigurujte více jazyků</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI asistent</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferovaná síť</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">Nepodporována</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Rozpoznávání obličeje…</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Síla svítilny</string>
+    <string name="flashlight_strength_turn_off">Vypnout</string>
+    <string name="flashlight_strength_turn_on">Zapnout</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 zařízení připojeno</item>
+        <item quantity="few">%d zařízení připojena</item>
+        <item quantity="many">%d zařízení připojených</item>
+        <item quantity="other">%d zařízení připojených</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Povolit 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Odstranit</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Záznam obrazovky byl odstraněn</string>
+</resources>
diff --git a/packages/SystemUI/res/values-de-rDE/cr_strings.xml b/packages/SystemUI/res/values-de-rDE/cr_strings.xml
new file mode 100644
index 0000000000000..3f3273b4a7ebe
--- /dev/null
+++ b/packages/SystemUI/res/values-de-rDE/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Datensparmodus</string>
+    <string name="status_bar_call_strength">Anruf-Signalstärke</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Hinweis auf Roaming</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD-Anruf (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">WLAN-Anruf (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Symbol bei deaktivierten mobilen Daten</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G-Symbol</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kbit/s</string>
+    <string name="megabitspersecond_short">Mbit/s</string>
+    <string name="gigabitspersecond_short">Gbit/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Bewölkt</string>
+    <string name="weather_condition_rain">Regen</string>
+    <string name="weather_condition_clear">Sonnig</string>
+    <string name="weather_condition_storm">Stürmisch</string>
+    <string name="weather_condition_snow">Schnee</string>
+    <string name="weather_condition_wind">Wind</string>
+    <string name="weather_condition_mist">Nebel</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> • Schnellladen (<xliff:g id="charging_time_left" example="4 Stunden und 2 Minuten">%1$s</xliff:g> bis voll)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Schnellladen</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> • Schnellladen (<xliff:g id="charging_time_left" example="4 Stunden und 2 Minuten">%1$s</xliff:g> bis voll)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Schnellladen</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> • Ladevorgang mit VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> bis voll)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g>•Ladevorgang mit 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> • Schnellladen (Voll in <xliff:g id="charging_time_left" example="4 Stunden und 2 Minuten">%1$s</xliff:g>)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Schnellladen</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">System-UI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go aktiviert</string>
+    <string name="onthego_notif_title">On-The-Go ist aktiv</string>
+    <string name="onthego_notif_stop">Beenden</string>
+    <string name="onthego_notif_options">Optionen</string>
+    <string name="onthego_notif_error">On-The-Go kann nicht gestartet werden</string>
+    <string name="onthego_notif_restart">On-The-Go neu starten</string>
+    <string name="onthego_notif_camera_changed">Kameramodus geändert</string>
+    <string name="onthego_transparency">Transparenz</string>
+    <string name="onthego_front_camera">Frontkamera verwenden</string>
+    <string name="onthego_service_toggle">Dienst automatisch neu starten</string>
+    <string name="onthego_channel_name">Primär</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Wichtig</string>
+    <string name="volume_ringer_alarms_only">Wecker</string>
+    <string name="volume_ringer_dnd">Bitte nicht stören</string>
+    <string name="tristate_flashlight">Taschenlampe</string>
+    <string name="tristate_flashlight_on">Taschenlampe ein</string>
+    <string name="tristate_flashlight_off">Taschenlampe aus</string>
+    <string name="tristate_flashlight_blink">Taschenlampe blinken</string>
+    <string name="tristate_brightness_bright">Maximale Helligkeit</string>
+    <string name="tristate_brightness_dark">Minimale Helligkeit</string>
+    <string name="tristate_brightness_auto">Automatische Helligkeit</string>
+    <string name="tristate_rotation_auto">Automatisch drehen</string>
+    <string name="tristate_rotation_0">Hochformat</string>
+    <string name="tristate_rotation_90">Querformat (90°)</string>
+    <string name="tristate_rotation_270">Querformat (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">heute verbraucht</string>
+    <string name="usage_data_weekly">in dieser Woche verwendet</string>
+    <string name="usage_data_default_suffix">Daten</string>
+    <string name="usage_wifi_default_suffix">WLAN</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Beenden erzwingen?</string>
+    <string name="force_stop_dlg_text">Das Beenden einer App zu erzwingen, kann zu unerwünschtem Verhalten führen.</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">Ton</string>
+    <string name="quick_settings_sound_ring">Klingeln</string>
+    <string name="quick_settings_sound_vibrate">Vibrieren</string>
+    <string name="quick_settings_sound_silent">Stumm</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">Kompass</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">Initialisiere\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NO</string>
+    <string name="quick_settings_compass_E">O</string>
+    <string name="quick_settings_compass_SE">SO</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">Datenkarte wechseln</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Lautstärkeregler</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">„Smart Pixels” automatisch einschalten</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Fehler beim Laden der Wetterdaten</string>
+    <string name="omnijaws_service_unknown">Keine Wetterdaten</string>
+    <string name="omnijaws_label_default">Wetter</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Aktualisierungsrate</string>
+    <string name="auto_mode_label">Automatisch</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Gedrückt halten - ausgewählter Bereich</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Sprache</string>
+    <string name="quick_settings_locale_more_locales_toast">Bitte zunächst mehr als eine Sprache hinzufügen</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">KI-Assistent</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Bevorzugtes Netzwerk</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">Nicht unterstützt</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Gesichtserkennung …</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Taschenlampenstärke</string>
+    <string name="flashlight_strength_turn_off">Ausschalten</string>
+    <string name="flashlight_strength_turn_on">Einschalten</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 Gerät verbunden</item>
+        <item quantity="other">%d Geräte verbunden</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">5G aktivieren</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Löschen</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Bildschirmaufnahme gelöscht</string>
+</resources>
diff --git a/packages/SystemUI/res/values-el-rGR/cr_strings.xml b/packages/SystemUI/res/values-el-rGR/cr_strings.xml
new file mode 100644
index 0000000000000..b011a4433ae89
--- /dev/null
+++ b/packages/SystemUI/res/values-el-rGR/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Εικονίδιο απενεργοποιημένων δεδομένων</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Εικονίδιο 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/δ</string>
+    <string name="megabitspersecond_short">Mb/δ</string>
+    <string name="gigabitspersecond_short">Gb/δ</string>
+    <string name="kilobytespersecond_short">kB/δ</string>
+    <string name="megabytespersecond_short">MB/δ</string>
+    <string name="gigabytespersecond_short">GB/δ</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> • Εξαιρετικά Γρήγορη Φόρτιση (<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> • Εξαιρετικά Γρήγορη Φόρτιση</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> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Φόρτιση</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 ενεργοποιήθηκε</string>
+    <string name="onthego_notif_title">Η λειτουργία On-The-Go είναι ενεργή</string>
+    <string name="onthego_notif_stop">Διακοπή</string>
+    <string name="onthego_notif_options">Επιλογές</string>
+    <string name="onthego_notif_error">Αδυναμία εκκίνησης της λειτουργίας On-The-Go</string>
+    <string name="onthego_notif_restart">Επανεκκίνηση On-The-Go</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">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Προτεραιότητα</string>
+    <string name="volume_ringer_alarms_only">Ξυπνητήρια</string>
+    <string name="volume_ringer_dnd">\"Μην Ενοχλείτε\"</string>
+    <string name="tristate_flashlight">Φακός</string>
+    <string name="tristate_flashlight_on">Φακός ενεργός</string>
+    <string name="tristate_flashlight_off">Φακός ανενεργός</string>
+    <string name="tristate_flashlight_blink">Φακός αναβοσβήνει</string>
+    <string name="tristate_brightness_bright">Μέγιστη φωτεινότητα</string>
+    <string name="tristate_brightness_dark">Ελάχιστη φωτεινότητα</string>
+    <string name="tristate_brightness_auto">Αυτόματη φωτεινότητα</string>
+    <string name="tristate_rotation_auto">Αυτόματη περιστροφή</string>
+    <string name="tristate_rotation_0">Κατακόρυφα</string>
+    <string name="tristate_rotation_90">Οριζόντια (90°)</string>
+    <string name="tristate_rotation_270">Οριζόντια (270°)</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">Lens</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">Πληροφορίες CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Πληροφορίες 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">Πυξίδα</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">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">Εναλλαγή κάρτας δεδομένων</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Πίνακας έντασης ήχου</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Έξυπνα Πίξελ</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Αυτόματη ενεργοποίηση Έξυπνων Πίξελ</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="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">Βοηθός AI</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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Ένταση φακού</string>
+    <string name="flashlight_strength_turn_off">Απενεργοποίηση</string>
+    <string name="flashlight_strength_turn_on">Ενεργοποίηση</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="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>
+</resources>
diff --git a/packages/SystemUI/res/values-es-rES/cr_strings.xml b/packages/SystemUI/res/values-es-rES/cr_strings.xml
new file mode 100644
index 0000000000000..10cdeda574234
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rES/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Ahorro de datos</string>
+    <string name="status_bar_call_strength">Intensidad de llamada</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicador de Roaming</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Llamada HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Llamada Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Icono de datos deshabilitados</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Icono 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">Kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Nublado</string>
+    <string name="weather_condition_rain">Lluvioso</string>
+    <string name="weather_condition_clear">Soleado</string>
+    <string name="weather_condition_storm">Tormenta</string>
+    <string name="weather_condition_snow">Nevado</string>
+    <string name="weather_condition_wind">Ventoso</string>
+    <string name="weather_condition_mist">Neblina</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> • Carga rápida(<xliff:g id="charging_time_left" example="4 horas y 2 minutos">%1$s</xliff:g> para carga total)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Carga rápida 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> • Carga rápida (<xliff:g id="charging_time_left" example="4 horas y 2 minutos">%1$s</xliff:g> para carga completa)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Carga rápida</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> • Carga VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> hasta carga completa)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Carga 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> • Carga rápida (<xliff:g id="charging_time_left" example="4 horas y 2 minutos">%1$s</xliff:g> para carga completa)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Carga rápida</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Interfaz del Sistema</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activado</string>
+    <string name="onthego_notif_title">On-The-Go está activo</string>
+    <string name="onthego_notif_stop">Detener</string>
+    <string name="onthego_notif_options">Opciones</string>
+    <string name="onthego_notif_error">No es posible iniciar el modo On-The-Go</string>
+    <string name="onthego_notif_restart">Reiniciar On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Modo de cámara cambiado</string>
+    <string name="onthego_transparency">Transparencia</string>
+    <string name="onthego_front_camera">Usar la cámara frontal</string>
+    <string name="onthego_service_toggle">Reiniciar el servicio automáticamente</string>
+    <string name="onthego_channel_name">Principal</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioridad</string>
+    <string name="volume_ringer_alarms_only">Alarmas</string>
+    <string name="volume_ringer_dnd">No Molestar</string>
+    <string name="tristate_flashlight">Linterna</string>
+    <string name="tristate_flashlight_on">Linterna activada</string>
+    <string name="tristate_flashlight_off">Linterna desactivada</string>
+    <string name="tristate_flashlight_blink">Linterna parpadear</string>
+    <string name="tristate_brightness_bright">Brillo máximo</string>
+    <string name="tristate_brightness_dark">Brillo mínimo</string>
+    <string name="tristate_brightness_auto">Brillo automático</string>
+    <string name="tristate_rotation_auto">Girar automáticamente</string>
+    <string name="tristate_rotation_0">Vertical</string>
+    <string name="tristate_rotation_90">Paisaje (90°)</string>
+    <string name="tristate_rotation_270">Paisaje (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">usado hoy</string>
+    <string name="usage_data_weekly">usado esta semana</string>
+    <string name="usage_data_default_suffix">Datos</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">¿Forzar Finalización?</string>
+    <string name="force_stop_dlg_text">Si se finaliza una aplicación, es posible que no funcione correctamente.</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">Sonido</string>
+    <string name="quick_settings_sound_ring">Timbre</string>
+    <string name="quick_settings_sound_vibrate">Vibrar</string>
+    <string name="quick_settings_sound_silent"></string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Información de CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Información de 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">Brújula</string>
+    <string name="quick_settings_compass_value"><xliff:g id="grados">%1$.0f</xliff:g>\u00b0 <xliff:g id="dirección">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Iniciando\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">Cambiar tarjeta SIM</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panel de volumen</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Píxeles inteligentes</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Habilitar automáticamente los píxeles inteligentes</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error al cargar datos del clima</string>
+    <string name="omnijaws_service_unknown">No hay datos del clima</string>
+    <string name="omnijaws_label_default">Clima</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Tasa de refresco</string>
+    <string name="auto_mode_label">Automático</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Pulsación larga - región seleccionada</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Idioma</string>
+    <string name="quick_settings_locale_more_locales_toast">Primero configura varios idiomas</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Asistente de IA</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"></string>
+    <string name="qs_preferred_network_unsupported">No soportado</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Reconociendo rostro...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Intensidad de la linterna</string>
+    <string name="flashlight_strength_turn_off">Apagar</string>
+    <string name="flashlight_strength_turn_on">Encender</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 dispositivo conectado</item>
+        <item quantity="other">%d dispositivos conectados</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Habilitar 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Eliminar</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Grabación de pantalla eliminada</string>
+</resources>
diff --git a/packages/SystemUI/res/values-et-rEE/cr_strings.xml b/packages/SystemUI/res/values-et-rEE/cr_strings.xml
new file mode 100644
index 0000000000000..33f314a4ef151
--- /dev/null
+++ b/packages/SystemUI/res/values-et-rEE/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Andmesäästja</string>
+    <string name="status_bar_call_strength">Kõne tugevus</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Rändlusindikaator</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD helistamine (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi helistamine (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Pilves</string>
+    <string name="weather_condition_rain">Vihmane</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Tormine</string>
+    <string name="weather_condition_snow">Lumine</string>
+    <string name="weather_condition_wind">Tuuline</string>
+    <string name="weather_condition_mist">Niiske</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-laadimine (täitumiseni <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> • Dash-laadimine</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-laadimine (täitumiseni <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-laadimine</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 laadimine (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> täitumiseni)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC laadimine</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-laadimine (täitumiseni <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-laadimine</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Süsteemiliides</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Liikumisrežiim aktiveeritud</string>
+    <string name="onthego_notif_title">Liikumisrežiim aktiivne</string>
+    <string name="onthego_notif_stop">Peata</string>
+    <string name="onthego_notif_options">Valikud</string>
+    <string name="onthego_notif_error">Ei ole võimalik liikumisrežiimi käivitada</string>
+    <string name="onthego_notif_restart">Taaskäivita liikumisrežiim</string>
+    <string name="onthego_notif_camera_changed">Kaamera režiim muudatud</string>
+    <string name="onthego_transparency">Läbipaistvus</string>
+    <string name="onthego_front_camera">Kasuta esikaamerat</string>
+    <string name="onthego_service_toggle">Automaatne taaskäivitamine</string>
+    <string name="onthego_channel_name">Esileht</string>
+    <string name="global_action_onthego">Liikumisrežiim</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioriteet</string>
+    <string name="volume_ringer_alarms_only">Alarmid</string>
+    <string name="volume_ringer_dnd">Mitte segada</string>
+    <string name="tristate_flashlight">Taskulamp</string>
+    <string name="tristate_flashlight_on">Taskulamp sees</string>
+    <string name="tristate_flashlight_off">Taskulamp väljas</string>
+    <string name="tristate_flashlight_blink">Taskulamp vilgub</string>
+    <string name="tristate_brightness_bright">Maksimaalne heledus</string>
+    <string name="tristate_brightness_dark">Minimaalne heledus</string>
+    <string name="tristate_brightness_auto">Automaatne heledus</string>
+    <string name="tristate_rotation_auto">Automaatne pööramine</string>
+    <string name="tristate_rotation_0">Püstasend</string>
+    <string name="tristate_rotation_90">Maastik (90°)</string>
+    <string name="tristate_rotation_270">Maastik (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">täna kasutatud</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Andmeside</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Sundpeatad?</string>
+    <string name="force_stop_dlg_text">Kui sunnite rakenduse peatuma, võib see valesti käituda.</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">Heli</string>
+    <string name="quick_settings_sound_ring">Helin</string>
+    <string name="quick_settings_sound_vibrate">Vibreeri</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Protsessori info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">K/S info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">K/s: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Kompass</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">Käivitamine\u2026</string>
+    <string name="quick_settings_compass_N">Põhi</string>
+    <string name="quick_settings_compass_NE">Kirre</string>
+    <string name="quick_settings_compass_E">Ida</string>
+    <string name="quick_settings_compass_SE">Kagu</string>
+    <string name="quick_settings_compass_S">Lõuna</string>
+    <string name="quick_settings_compass_SW">Edel</string>
+    <string name="quick_settings_compass_W">Lääs</string>
+    <string name="quick_settings_compass_NW">Loe</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Vaheta andmeside SIMi</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Helitugevuse paneel</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Targad pikslid</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Targad pikslid automaatselt lubatud</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Tõrge ilmaandmete laadimisel</string>
+    <string name="omnijaws_service_unknown">Ilmaandmed puuduvad</string>
+    <string name="omnijaws_label_default">Ilm</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Värskendussagedus</string>
+    <string name="auto_mode_label">Automaatne</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Hoia pikalt - valitud ala</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Keel</string>
+    <string name="quick_settings_locale_more_locales_toast">Seadista kõigepealt mitu keelt</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI assistent</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">Näotuvastus...</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>
+    <!-- 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 seade ühendatud</item>
+        <item quantity="other">%d seadet ühendatud</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Luba 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Kustuta</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Ekraanisalvestus kustutatud</string>
+</resources>
diff --git a/packages/SystemUI/res/values-fa-rIR/cr_strings.xml b/packages/SystemUI/res/values-fa-rIR/cr_strings.xml
new file mode 100644
index 0000000000000..0651146fbef65
--- /dev/null
+++ b/packages/SystemUI/res/values-fa-rIR/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_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>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">تماس اچ‌دی (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">تماس وای‌فای (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">آیکون خاموشی دیتا</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">آیکون 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">ک‌ب/ث</string>
+    <string name="megabitspersecond_short">م‌ب/ث</string>
+    <string name="gigabitspersecond_short">گ‌ب/ث</string>
+    <string name="kilobytespersecond_short">ک‌ب/ث</string>
+    <string name="megabytespersecond_short">م‌ب/ث</string>
+    <string name="gigabytespersecond_short">گ‌ب/ث</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> • Wشارژ بی‌سیم</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> • شارژ فوق سریع (<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> • شارژ فوق سریع</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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">اولویت</string>
+    <string name="volume_ringer_alarms_only">زنگ هشدار</string>
+    <string name="volume_ringer_dnd">مزاحم نشو</string>
+    <string name="tristate_flashlight">چراغ قوه</string>
+    <string name="tristate_flashlight_on">روشن کردن چراغ‌قوه</string>
+    <string name="tristate_flashlight_off">خاموش کردن چراغ‌قوه</string>
+    <string name="tristate_flashlight_blink">چشمک زدن چراغ قوه</string>
+    <string name="tristate_brightness_bright">حداکثر روشنایی</string>
+    <string name="tristate_brightness_dark">حداقل روشنایی</string>
+    <string name="tristate_brightness_auto">روشنایی خودکار</string>
+    <string name="tristate_rotation_auto">چرخش خودکار</string>
+    <string name="tristate_rotation_0">عمودی</string>
+    <string name="tristate_rotation_90">افقی(90 درجه)</string>
+    <string name="tristate_rotation_270">افقی(270 درجه)</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">زنگ</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">FPS: <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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">پیکسل های هوشمند</string>
+    <string name="quick_settings_smart_pixels_on_power_save">پیکسل های هوشمند درحالت خودکار</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="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">نسل چهارم / LTE</string>
+    <string name="qs_preferred_network_nr">نسل پنجم / NR</string>
+    <string name="qs_preferred_network_unsupported">پشتیبانی نشده</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">درحال شناسایی چهره...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">قدرت چراغ قوه</string>
+    <string name="flashlight_strength_turn_off">خاموش</string>
+    <string name="flashlight_strength_turn_on">روشن</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="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>
+</resources>
diff --git a/packages/SystemUI/res/values-fi-rFI/cr_strings.xml b/packages/SystemUI/res/values-fi-rFI/cr_strings.xml
new file mode 100644
index 0000000000000..050d272c716d5
--- /dev/null
+++ b/packages/SystemUI/res/values-fi-rFI/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Datan säästäjä</string>
+    <string name="status_bar_call_strength">Puhelun voimakkuus</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Verkkovierailun osoitin</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kt/s</string>
+    <string name="megabytespersecond_short">Mt/s</string>
+    <string name="gigabytespersecond_short">Gt/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Pilvinen</string>
+    <string name="weather_condition_rain">Sateinen</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Myrskyinen</string>
+    <string name="weather_condition_snow">Luminen</string>
+    <string name="weather_condition_wind">Tuulinen</string>
+    <string name="weather_condition_mist">Sumuinen</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-ladataan (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kunnes täynnä)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash-ladataan</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-ladataan (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kunnes täynnä)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp-ladataan</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-ladataan (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kunnes täynnä)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC-ladataan</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-ladataan (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kunnes täynnä)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo-ladataan</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Käyttöliittymä</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Liikkeellä-tila aktivoitu</string>
+    <string name="onthego_notif_title">Liikkeellä-tila käytössä</string>
+    <string name="onthego_notif_stop">Lopeta</string>
+    <string name="onthego_notif_options">Valinnat</string>
+    <string name="onthego_notif_error">Liikkeellä-tilaa ei voitu käynnistää</string>
+    <string name="onthego_notif_restart">Käynnistä Liikkeellä-tila uudelleen</string>
+    <string name="onthego_notif_camera_changed">Kameratila muuttunut</string>
+    <string name="onthego_transparency">Läpinäkyvyys</string>
+    <string name="onthego_front_camera">Käytä etukameraa</string>
+    <string name="onthego_service_toggle">Käynnistä palvelu automaattisesti uudelleen</string>
+    <string name="onthego_channel_name">Ensisijainen</string>
+    <string name="global_action_onthego">Liikkeellä</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Tärkeys</string>
+    <string name="volume_ringer_alarms_only">Hälytykset</string>
+    <string name="volume_ringer_dnd">Älä häiritse</string>
+    <string name="tristate_flashlight">Taskulamppu</string>
+    <string name="tristate_flashlight_on">Taskulamppu päällä</string>
+    <string name="tristate_flashlight_off">Taskulamppu pois</string>
+    <string name="tristate_flashlight_blink">Taskulamppu vilkkuu</string>
+    <string name="tristate_brightness_bright">Täysi kirkkaus</string>
+    <string name="tristate_brightness_dark">Minimikirkkaus</string>
+    <string name="tristate_brightness_auto">Automaattinen kirkkaus</string>
+    <string name="tristate_rotation_auto">Automaattinen kääntö</string>
+    <string name="tristate_rotation_0">Pysty</string>
+    <string name="tristate_rotation_90">Vaaka (90°)</string>
+    <string name="tristate_rotation_270">Vaaka (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">käytetty tänään</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">Pakotetaanko lopetus?</string>
+    <string name="force_stop_dlg_text">Jos pakotat sovelluksen pysähtymään, se saattaa käyttäytyä väärin.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Linssi</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Ääni</string>
+    <string name="quick_settings_sound_ring">Äänet</string>
+    <string name="quick_settings_sound_vibrate">Värinä</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Suorittimen Tiedot</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS-tiedot</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">Kompassi</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">Alustetaan\u2026</string>
+    <string name="quick_settings_compass_N">P</string>
+    <string name="quick_settings_compass_NE">Koillinen</string>
+    <string name="quick_settings_compass_E">I</string>
+    <string name="quick_settings_compass_SE">Kaakko</string>
+    <string name="quick_settings_compass_S">E</string>
+    <string name="quick_settings_compass_SW">Lounas</string>
+    <string name="quick_settings_compass_W">L</string>
+    <string name="quick_settings_compass_NW">Luode</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Vaihda datakorttia</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Äänenvoimakkuuspaneeli</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Älykkäät Pikselit</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Älykkäät Pikselit otettiin käyttöön automaattisesti</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Virhe ladattaessa säätietoja</string>
+    <string name="omnijaws_service_unknown">Ei säätietoja</string>
+    <string name="omnijaws_label_default">Sää</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Virkistystaajuus</string>
+    <string name="auto_mode_label">Automaattinen</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Paina pitkään - valittu alue</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Kieli</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">Tunnistetaan kasvoja...</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>
+    <!-- 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 laite yhdistettynä</item>
+        <item quantity="other">%d laitetta yhdistettynä</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">Näytön nauhoitus poistettu</string>
+</resources>
diff --git a/packages/SystemUI/res/values-fr-rFR/cr_strings.xml b/packages/SystemUI/res/values-fr-rFR/cr_strings.xml
new file mode 100644
index 0000000000000..f7965fea5766d
--- /dev/null
+++ b/packages/SystemUI/res/values-fr-rFR/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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 de l\'itinérance</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Appel haute-définition (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Appel en Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">Kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">ko/s</string>
+    <string name="megabytespersecond_short">Mo/s</string>
+    <string name="gigabytespersecond_short">Go/s</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 Rapide (<xliff:g id="charging_time_left" exemple="4 heures et 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 Rapide</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 Rapide (<xliff:g id="charging_time_left" exemple="4 heures et 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 Rapide</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 rapide (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> jusqu\'à la charge complète)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Charge rapide</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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Interface utilisateur</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activé</string>
+    <string name="onthego_notif_title">On-The-Go est actif</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 On-The-Go</string>
+    <string name="onthego_notif_restart">Redémarrer 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioritaire</string>
+    <string name="volume_ringer_alarms_only">Alarmes</string>
+    <string name="volume_ringer_dnd">NPD</string>
+    <string name="tristate_flashlight">Lampe torche</string>
+    <string name="tristate_flashlight_on">Lampe torche allumée</string>
+    <string name="tristate_flashlight_off">Lampe torche éteinte</string>
+    <string name="tristate_flashlight_blink">Clignotement lampe torche</string>
+    <string name="tristate_brightness_bright">Luminosité maxi</string>
+    <string name="tristate_brightness_dark">Luminosité mini</string>
+    <string name="tristate_brightness_auto">Luminosité automatique</string>
+    <string name="tristate_rotation_auto">Rotation automatique</string>
+    <string name="tristate_rotation_0">Portrait</string>
+    <string name="tristate_rotation_90">Paysage (90°)</string>
+    <string name="tristate_rotation_270">Paysage (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">utilisé aujourd\'hui</string>
+    <string name="usage_data_weekly">utilisée 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 des dysfonctionnements.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Objectif</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sons</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="degrés">%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">Basculer de carte mémoire</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panneau de volume</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Activation automatique de Smart Pixels</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Erreur de chargement des données météo</string>
+    <string name="omnijaws_service_unknown">Pas de données météo</string>
+    <string name="omnijaws_label_default">Météo</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Fréquence de rafraîchissement</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">Configurer plusieurs langues en premier</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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Luminosité de la lampe de poche</string>
+    <string name="flashlight_strength_turn_off">Extinction</string>
+    <string name="flashlight_strength_turn_on">Allumage</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 Appareils connectés</item>
+        <item quantity="other">%d appareils connectés</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Activer la 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>
+</resources>
diff --git a/packages/SystemUI/res/values-hu-rHU/cr_strings.xml b/packages/SystemUI/res/values-hu-rHU/cr_strings.xml
new file mode 100644
index 0000000000000..1380d0d05fd8c
--- /dev/null
+++ b/packages/SystemUI/res/values-hu-rHU/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Adatforgalom-csökkentő</string>
+    <string name="status_bar_call_strength">Híváserősség</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Barangoláskijelző</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD-hívás (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">WiFi-hívás (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Az \'Adat letiltva\' ikonja</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G-ikon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Felhős</string>
+    <string name="weather_condition_rain">Esős</string>
+    <string name="weather_condition_clear">Tiszta égbolt</string>
+    <string name="weather_condition_storm">Viharos</string>
+    <string name="weather_condition_snow">Havas</string>
+    <string name="weather_condition_wind">Szeles</string>
+    <string name="weather_condition_mist">Ködös</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> • Erőteljes töltés (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> a teljes töltésig)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Erőteljes töltés</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> Lánctöltés (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> a teljes töltöttségig)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Lánctöltés</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 Töltés (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> a teljes feltöltésig)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g>• VOOC Töltés</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> • Turbó töltés (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> a teljes töltöttségig)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbó töltés</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Rendszerfelület</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Menet közben (On-The-Go) aktiválva</string>
+    <string name="onthego_notif_title">A Menet közben (On-The-Go) aktív</string>
+    <string name="onthego_notif_stop">Leállítás</string>
+    <string name="onthego_notif_options">Beállítások</string>
+    <string name="onthego_notif_error">Nem lehet elindítani a Menet közben módot (On-The-Go)</string>
+    <string name="onthego_notif_restart">A Menet közben mód (On-The-Go) újraindítása</string>
+    <string name="onthego_notif_camera_changed">A Kameramód megváltoztatva</string>
+    <string name="onthego_transparency">Átlátszóság</string>
+    <string name="onthego_front_camera">Az előlapi kamera használata</string>
+    <string name="onthego_service_toggle">Automatikusan indítsa újra a szolgáltatást</string>
+    <string name="onthego_channel_name">Elsődleges</string>
+    <string name="global_action_onthego">Menet közben (On-The-Go)</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Fontosak</string>
+    <string name="volume_ringer_alarms_only">Ébresztők</string>
+    <string name="volume_ringer_dnd">Ne zavarjanak</string>
+    <string name="tristate_flashlight">Zseblámpa</string>
+    <string name="tristate_flashlight_on">Zseblámpa be</string>
+    <string name="tristate_flashlight_off">Zseblámpa ki</string>
+    <string name="tristate_flashlight_blink">Zseblámpa-villogás</string>
+    <string name="tristate_brightness_bright">Teljes fényerő</string>
+    <string name="tristate_brightness_dark">Alacsony fényerő</string>
+    <string name="tristate_brightness_auto">Automatikus fényerő</string>
+    <string name="tristate_rotation_auto">Automatikus elforgatás</string>
+    <string name="tristate_rotation_0">Állókép-mód</string>
+    <string name="tristate_rotation_90">Fekvőkép-mód</string>
+    <string name="tristate_rotation_270">Fejreállított fekvőkép-mód</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">ma elhasználva</string>
+    <string name="usage_data_weekly">felhasználva ezen a héten</string>
+    <string name="usage_data_default_suffix">Adat</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Kényszeríti a leállítást?</string>
+    <string name="force_stop_dlg_text">Ha egy alkalmazást leállásra kényszerít, lehetséges, hogy az hibásan fog működni.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Google Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Hang</string>
+    <string name="quick_settings_sound_ring">Csengés</string>
+    <string name="quick_settings_sound_vibrate">Rezgés</string>
+    <string name="quick_settings_sound_silent">Csendes</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU-adatok</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS-adatok</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder"><xliff:g id="fps" example="90">%1$d</xliff:g> FPS</string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Iránytű</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">Előkészítés\u2026</string>
+    <string name="quick_settings_compass_N">É</string>
+    <string name="quick_settings_compass_NE">ÉK</string>
+    <string name="quick_settings_compass_E">K</string>
+    <string name="quick_settings_compass_SE">DK</string>
+    <string name="quick_settings_compass_S">D</string>
+    <string name="quick_settings_compass_SW">DNy</string>
+    <string name="quick_settings_compass_W">Ny</string>
+    <string name="quick_settings_compass_NW">ÉNy</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">SIM-kártya váltása</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Hangerőpanel</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Intelligens pixelek</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Az Intelligens pixelek automatikus engedélyezése</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Hiba az időjárásadatok betöltésekor</string>
+    <string name="omnijaws_service_unknown">Nincsenek időjárásadatok</string>
+    <string name="omnijaws_label_default">Időjárás</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Frissítési gyakoriság</string>
+    <string name="auto_mode_label">Automatikus</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Hosszannyomás - kijelölt terület</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Nyelv</string>
+    <string name="quick_settings_locale_more_locales_toast">A kapcsolónak csak több nyelv esetén van értelme, állítson be többet</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI-asszisztens</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Előnyben részesített hálózat</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">Nem támogatott</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Arcfelismerés...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Zseblámpa erőssége</string>
+    <string name="flashlight_strength_turn_off">Kikapcsolás</string>
+    <string name="flashlight_strength_turn_on">Bekapcsolás</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 készülék csatlakoztatva</item>
+        <item quantity="other">%d készülék csatlakoztatva</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Az 5G engedélyezése</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Törlés</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Képernyőfelvétel törölve</string>
+</resources>
diff --git a/packages/SystemUI/res/values-in-rID/cr_strings.xml b/packages/SystemUI/res/values-in-rID/cr_strings.xml
new file mode 100644
index 0000000000000..a0af1c562aa2a
--- /dev/null
+++ b/packages/SystemUI/res/values-in-rID/cr_strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Penghemat 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">Indikator Roaming</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/d</string>
+    <string name="megabitspersecond_short">Mb/d</string>
+    <string name="gigabitspersecond_short">Gb/d</string>
+    <string name="kilobytespersecond_short">kB/d</string>
+    <string name="megabytespersecond_short">MB/d</string>
+    <string name="gigabytespersecond_short">GB/d</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Berawan</string>
+    <string name="weather_condition_rain">Hujan</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Badai</string>
+    <string name="weather_condition_snow">Bersalju</string>
+    <string name="weather_condition_wind">Berangin</string>
+    <string name="weather_condition_mist">Berkabut</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> • Pengisian Daya Cepat (<xliff:g id="charging_time_left" example="4 jam 2 menit">%1$s</xliff:g> hingga penuh)</string>
+    <string name="keyguard_plugged_in_dash_charging">Pengisian Daya Cepat</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> • Pengisian Daya Cepat (<xliff:g id="charging_time_left" example="4 jam 2 menit">%1$s</xliff:g> hingga penuh)</string>
+    <string name="keyguard_plugged_in_warp_charging">Pengisian Daya Cepat</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> • Pengisian VOOC (<xliff:g id="charging_time_left" example="4 jam 2 menit">%1$s</xliff:g> hingga penuh)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Pengisian 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> • Pengisian Turbo (<xliff:g id="charging_time_left" example="4 jam 2 menit">%1$s</xliff:g> hingga penuh)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Pengisian Turbo</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Sistem UI</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">Pilihan</string>
+    <string name="onthego_notif_error">Tidak dapat memulai On-The-Go</string>
+    <string name="onthego_notif_restart">Mulai ulang On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Mode kamera berubah</string>
+    <string name="onthego_transparency">Transparansi</string>
+    <string name="onthego_front_camera">Gunakan kamera depan</string>
+    <string name="onthego_service_toggle">Mulai ulang layanan secara otomatis</string>
+    <string name="onthego_channel_name">Utama</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioritas</string>
+    <string name="volume_ringer_alarms_only">Alarm</string>
+    <string name="volume_ringer_dnd">DND</string>
+    <string name="tristate_flashlight">Senter</string>
+    <string name="tristate_flashlight_on">Senter hidup</string>
+    <string name="tristate_flashlight_off">Senter mati</string>
+    <string name="tristate_flashlight_blink">Senter berkedip</string>
+    <string name="tristate_brightness_bright">Kecerahan maksimum</string>
+    <string name="tristate_brightness_dark">Kecerahan minimum</string>
+    <string name="tristate_brightness_auto">Kecerahan Otomatis</string>
+    <string name="tristate_rotation_auto">Rotasi Otomatis</string>
+    <string name="tristate_rotation_0">Potret</string>
+    <string name="tristate_rotation_90">Lanskap (90°)</string>
+    <string name="tristate_rotation_270">Lanskap (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">digunakan hari ini</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">Paksa berhenti?</string>
+    <string name="force_stop_dlg_text">Jika Anda menghentikan paksa aplikasi, kemungkinan akan terjadi gagal fungsi.</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">Suara</string>
+    <string name="quick_settings_sound_ring">Dering</string>
+    <string name="quick_settings_sound_vibrate">Getar</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Info CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Info 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">Kompas</string>
+    <string name="quick_settings_compass_value"><xliff:g id="derajat">%1$.0f</xliff:g>\u00b0<xliff:g id="arah">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Memulai\u2026</string>
+    <string name="quick_settings_compass_N">U</string>
+    <string name="quick_settings_compass_NE">TL</string>
+    <string name="quick_settings_compass_E">T</string>
+    <string name="quick_settings_compass_SE">TG</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">BD</string>
+    <string name="quick_settings_compass_W">B</string>
+    <string name="quick_settings_compass_NW">BL</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Ubah kartu data</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panel volume</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Piksel Cerdas</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Aktifkan otomatis Piksel Cerdas</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Kesalahan ketika memuat data cuaca</string>
+    <string name="omnijaws_service_unknown">Tidak ada data cuaca</string>
+    <string name="omnijaws_label_default">Cuaca</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Kecepatan refresh</string>
+    <string name="auto_mode_label">Otomatis</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Tekan lama - wilayah yang dipilih</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Bahasa</string>
+    <string name="quick_settings_locale_more_locales_toast">Silakan konfigurasikan beberapa bahasa untuk mengaktifkan fungsi tombol</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Asisten AI</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">Mengenali wajah...</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>
+    <!-- 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 perangkat terhubung</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Aktifkan 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Hapus</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Rekaman layar dihapus</string>
+</resources>
diff --git a/packages/SystemUI/res/values-it-rIT/cr_strings.xml b/packages/SystemUI/res/values-it-rIT/cr_strings.xml
new file mode 100644
index 0000000000000..99ed3ace0843c
--- /dev/null
+++ b/packages/SystemUI/res/values-it-rIT/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Risparmio dati</string>
+    <string name="status_bar_call_strength">Intensità chiamata</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicatore roaming</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Chiamata HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Chiamata Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Icona dati disabilitati</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Icona 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Nuvoloso</string>
+    <string name="weather_condition_rain">Piovoso</string>
+    <string name="weather_condition_clear">Cielo Sereno</string>
+    <string name="weather_condition_storm">Tempestoso</string>
+    <string name="weather_condition_snow">Nevoso</string>
+    <string name="weather_condition_wind">Ventoso</string>
+    <string name="weather_condition_mist">Nebbioso</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">&lt;xliff:g id=\"percentage\"&gt;%2$s&lt;/xliff:g&gt; • Ricarica Ultrarapida (&lt;xliff:g id=\"charging_time_left\" example=\"4 hours and 2 minutes\"&gt;%1$s&lt;/xliff:g alla carica completa)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Ricarica rapida</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> • Carica Rapida(<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> • Carica Rapida</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> • Ricarica VOOC (<xliff:g id="charging_time_left" example="2 ore e 2 minuti">%1$s</xliff:g> fino al completamento della carica)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Carica 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> • Ricarica Turbo (<xliff:g id="charging_time_left" example="4 ore e 2 minuti">%1$s</xliff:g> al completamento)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Ricarica Turbo</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Interfaccia di sistema</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go attivato</string>
+    <string name="onthego_notif_title">On-The-Go è attivo</string>
+    <string name="onthego_notif_stop">Interrompi</string>
+    <string name="onthego_notif_options">Opzioni</string>
+    <string name="onthego_notif_error">Impossibile avviare On-The-Go</string>
+    <string name="onthego_notif_restart">Riavvia On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Modalità fotocamera cambiata</string>
+    <string name="onthego_transparency">Transparenza</string>
+    <string name="onthego_front_camera">Usa fotocamera frontale</string>
+    <string name="onthego_service_toggle">Riavvia automaticamente il servizio</string>
+    <string name="onthego_channel_name">Principale</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Priorità</string>
+    <string name="volume_ringer_alarms_only">Sveglie</string>
+    <string name="volume_ringer_dnd">Non Disturbare</string>
+    <string name="tristate_flashlight">Torcia</string>
+    <string name="tristate_flashlight_on">Torcia accesa</string>
+    <string name="tristate_flashlight_off">Torcia spenta</string>
+    <string name="tristate_flashlight_blink">Torcia lampeggiante</string>
+    <string name="tristate_brightness_bright">Luminosità massima</string>
+    <string name="tristate_brightness_dark">Luminosità minima</string>
+    <string name="tristate_brightness_auto">Luminosità automatica</string>
+    <string name="tristate_rotation_auto">Rotazione automatica</string>
+    <string name="tristate_rotation_0">Verticale</string>
+    <string name="tristate_rotation_90">Orizzontale (90°)</string>
+    <string name="tristate_rotation_270">Orizzontale (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">utilizzo di oggi</string>
+    <string name="usage_data_weekly">usato questa settimana</string>
+    <string name="usage_data_default_suffix">Dati</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Forzare la chiusura?</string>
+    <string name="force_stop_dlg_text">Se forzi la chiusura di un\'applicazione, potrebbe comportarsi in modo anomalo.</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">Suono</string>
+    <string name="quick_settings_sound_ring">Suoneria</string>
+    <string name="quick_settings_sound_vibrate">Vibrazione</string>
+    <string name="quick_settings_sound_silent">Silenzioso</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informazioni sulla CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Informazioni 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">Bussola</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">Inizializzazione\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">Switcha scheda dati</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Pannello del volume</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Abilita automaticamente Smart Pixels</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Errore durante il caricamento dei dati meteo</string>
+    <string name="omnijaws_service_unknown">Dati meteo non disponibili</string>
+    <string name="omnijaws_label_default">Meteo</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Frequenza di aggiornamento</string>
+    <string name="auto_mode_label">Automatico</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Tieni premuto per selezionare la porzione di schermo</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Lingua</string>
+    <string name="quick_settings_locale_more_locales_toast">Configura prima più lingue</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Assistente IA</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Rete preferita</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 supportato</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Riconoscimento viso...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Potenza Torcia</string>
+    <string name="flashlight_strength_turn_off">Spegni</string>
+    <string name="flashlight_strength_turn_on">Accendi</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 Dispositivo connesso</item>
+        <item quantity="other">%d dispositivo connesso</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Abilita 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Elimina</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Registrazione schermo eliminata</string>
+</resources>
diff --git a/packages/SystemUI/res/values-iw-rIL/cr_strings.xml b/packages/SystemUI/res/values-iw-rIL/cr_strings.xml
new file mode 100644
index 0000000000000..202c18e40590c
--- /dev/null
+++ b/packages/SystemUI/res/values-iw-rIL/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">קילוביט/שניה</string>
+    <string name="megabitspersecond_short">מגהביט/שניה</string>
+    <string name="gigabitspersecond_short">גיגהביט/שניה</string>
+    <string name="kilobytespersecond_short">קילובייט/שניה</string>
+    <string name="megabytespersecond_short">מגהבייט/שניה</string>
+    <string name="gigabytespersecond_short">גיגהבייט/שניה</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> • טעינת Dash (<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> • טעינת 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> • טעינת 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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">ממשק המשתמש של המערכת</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go מופעל</string>
+    <string name="onthego_notif_title">On-The-Go פעיל</string>
+    <string name="onthego_notif_stop">עצירה</string>
+    <string name="onthego_notif_options">אפשרויות</string>
+    <string name="onthego_notif_error">לא ניתן להפעיל את On-The-Go</string>
+    <string name="onthego_notif_restart">הפעלה מחדש של On-The-Go</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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">עדיפות</string>
+    <string name="volume_ringer_alarms_only">התרעות</string>
+    <string name="volume_ringer_dnd">נא לא להפריע</string>
+    <string name="tristate_flashlight">פנס</string>
+    <string name="tristate_flashlight_on">הפנס מופעל</string>
+    <string name="tristate_flashlight_off">הפנס כבוי</string>
+    <string name="tristate_flashlight_blink">פנס מהבהב</string>
+    <string name="tristate_brightness_bright">בהירות מירבית</string>
+    <string name="tristate_brightness_dark">בהירות מזערית</string>
+    <string name="tristate_brightness_auto">בהירות אוטומטית</string>
+    <string name="tristate_rotation_auto">סיבוב אוטומטי</string>
+    <string name="tristate_rotation_0">דיוקן (אנכי)</string>
+    <string name="tristate_rotation_90">אופקי (90°)</string>
+    <string name="tristate_rotation_270">אופקי (270°)</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">Lens</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">FPS: <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="מעלות">%1$.0f</xliff:g>\u00b0 <xliff:g id="כיוון">%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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">פיקסלים חכמים</string>
+    <string name="quick_settings_smart_pixels_on_power_save">פיקסלים חכמים מופעלים אוטומטית</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="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">עוזר AI</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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">עוצמת הפנס</string>
+    <string name="flashlight_strength_turn_off">כיבוי</string>
+    <string name="flashlight_strength_turn_on">הפעלה</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="two">%d devices connected</item>
+        <item quantity="many">%d devices connected</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>
+</resources>
diff --git a/packages/SystemUI/res/values-ja-rJP/cr_strings.xml b/packages/SystemUI/res/values-ja-rJP/cr_strings.xml
new file mode 100644
index 0000000000000..ca349f0518e5c
--- /dev/null
+++ b/packages/SystemUI/res/values-ja-rJP/cr_strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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> • Dash Charge 中 (充電完了まで<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> • Dash Charge中</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 Charge 中 (充電完了まで<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 Charge 中</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 Charge 中 (充電完了まで残り<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 Charge 中</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">システム UI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go モードを有効化しました</string>
+    <string name="onthego_notif_title">On-The-Go モードが有効です</string>
+    <string name="onthego_notif_stop">停止</string>
+    <string name="onthego_notif_options">オプション</string>
+    <string name="onthego_notif_error">On-The-Go モードを開始できません</string>
+    <string name="onthego_notif_restart">On-The-Go モードを再起動</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">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">優先</string>
+    <string name="volume_ringer_alarms_only">アラーム</string>
+    <string name="volume_ringer_dnd">マナー</string>
+    <string name="tristate_flashlight">ライト</string>
+    <string name="tristate_flashlight_on">ライト ON</string>
+    <string name="tristate_flashlight_off">ライト OFF</string>
+    <string name="tristate_flashlight_blink">ライト点滅</string>
+    <string name="tristate_brightness_bright">最大の明るさ</string>
+    <string name="tristate_brightness_dark">最小の明るさ</string>
+    <string name="tristate_brightness_auto">明るさの自動調節</string>
+    <string name="tristate_rotation_auto">自動回転</string>
+    <string name="tristate_rotation_0">縦向き</string>
+    <string name="tristate_rotation_90">横向き (90°)</string>
+    <string name="tristate_rotation_270">横向き (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">今日の使用量</string>
+    <string name="usage_data_weekly">used this week</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">着信音</string>
+    <string name="quick_settings_sound_vibrate">バイブレーション</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU 情報</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">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">コンパス</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">SIM の切り替え</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">音量パネル</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">スマートピクセル</string>
+    <string name="quick_settings_smart_pixels_on_power_save">スマートピクセルを自動的に有効にする</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="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">AI アシスタント</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">顔を認識中...</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>
+    <!-- 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個のデバイスが接続中</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>
+</resources>
diff --git a/packages/SystemUI/res/values-ko-rKR/cr_strings.xml b/packages/SystemUI/res/values-ko-rKR/cr_strings.xml
new file mode 100644
index 0000000000000..d125fbfb33134
--- /dev/null
+++ b/packages/SystemUI/res/values-ko-rKR/cr_strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/초</string>
+    <string name="megabitspersecond_short">Mb/초</string>
+    <string name="gigabitspersecond_short">Gb/초</string>
+    <string name="kilobytespersecond_short">kB/초</string>
+    <string name="megabytespersecond_short">MB/초</string>
+    <string name="gigabytespersecond_short">GB/초</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">흐림</string>
+    <string name="weather_condition_rain">비</string>
+    <string name="weather_condition_clear">Clear Sky</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> • Dash 충전 중 (<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> • 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> • 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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">시스템 UI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go 모드를 시작했습니다.</string>
+    <string name="onthego_notif_title">On-The-Go 모드 사용 중</string>
+    <string name="onthego_notif_stop">중지</string>
+    <string name="onthego_notif_options">옵션</string>
+    <string name="onthego_notif_error">On-The-Go 모드를 시작하지 못했습니다.</string>
+    <string name="onthego_notif_restart">On-The-Go 다시 시작</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">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">우선도</string>
+    <string name="volume_ringer_alarms_only">알람</string>
+    <string name="volume_ringer_dnd">방해 금지</string>
+    <string name="tristate_flashlight">손전등</string>
+    <string name="tristate_flashlight_on">손전등 켜기</string>
+    <string name="tristate_flashlight_off">손전등 끄기</string>
+    <string name="tristate_flashlight_blink">손전등 깜빡이기</string>
+    <string name="tristate_brightness_bright">최대 밝기</string>
+    <string name="tristate_brightness_dark">최소 밝기</string>
+    <string name="tristate_brightness_auto">자동 밝기</string>
+    <string name="tristate_rotation_auto">자동 회전</string>
+    <string name="tristate_rotation_0">세로</string>
+    <string name="tristate_rotation_90">가로(90°)</string>
+    <string name="tristate_rotation_270">가로(270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">를 오늘 사용함</string>
+    <string name="usage_data_weekly">used this week</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">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU 정보</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">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">나침반</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">모바일 데이터 SIM 전환</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">음량 패널</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">스마트 픽셀</string>
+    <string name="quick_settings_smart_pixels_on_power_save">스마트 픽셀이 자동으로 켜짐</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="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">AI 어시스턴트</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">얼굴 인식 중\u2026</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>
+    <!-- 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개 기기 연결됨</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>
+</resources>
diff --git a/packages/SystemUI/res/values-ku-rTR/cr_strings.xml b/packages/SystemUI/res/values-ku-rTR/cr_strings.xml
new file mode 100644
index 0000000000000..48aa75a304062
--- /dev/null
+++ b/packages/SystemUI/res/values-ku-rTR/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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> • بارگاویبوونەوەی داش (<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> • 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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_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">بژاردەکان</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">ڕوونێتی</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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Priority</string>
+    <string name="volume_ringer_alarms_only">وریاکەرەوە</string>
+    <string name="volume_ringer_dnd">DnD</string>
+    <string name="tristate_flashlight">فلاش</string>
+    <string name="tristate_flashlight_on">Torch on</string>
+    <string name="tristate_flashlight_off">Torch off</string>
+    <string name="tristate_flashlight_blink">Torch blink</string>
+    <string name="tristate_brightness_bright">Max-brightness</string>
+    <string name="tristate_brightness_dark">Min-brightness</string>
+    <string name="tristate_brightness_auto">Auto-brightness</string>
+    <string name="tristate_rotation_auto">Auto-rotate</string>
+    <string name="tristate_rotation_0">ستوونی</string>
+    <string name="tristate_rotation_90">Landscape (90°)</string>
+    <string name="tristate_rotation_270">Landscape (270°)</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">بەتینی ڕابگیرێ؟</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">Lens</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">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU زانیاری</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">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">قیبلەنما</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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Auto-enabled Smart Pixels</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">Refresh rate</string>
+    <string name="auto_mode_label">خۆکاری</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">زمان</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>
+    <!-- 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>
+    <!-- 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">سڕینەوە</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+</resources>
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index dbaa2ea55c31e..77dda3edec3d8 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 -->
diff --git a/packages/SystemUI/res/values-night/cr_colors.xml b/packages/SystemUI/res/values-night/cr_colors.xml
new file mode 100644
index 0000000000000..3158f9ef25c5b
--- /dev/null
+++ b/packages/SystemUI/res/values-night/cr_colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- 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>
+</resources>
diff --git a/packages/SystemUI/res/values-nl-rNL/cr_strings.xml b/packages/SystemUI/res/values-nl-rNL/cr_strings.xml
new file mode 100644
index 0000000000000..6c2e42fb51e53
--- /dev/null
+++ b/packages/SystemUI/res/values-nl-rNL/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Databesparing</string>
+    <string name="status_bar_call_strength">Netwerk sterkte</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD Bellen (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi Bellen (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data uitgeschakeld pictogram</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G pictogram</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Bewolkt</string>
+    <string name="weather_condition_rain">Regenachtig</string>
+    <string name="weather_condition_clear">Heldere Lucht</string>
+    <string name="weather_condition_storm">Stormachtig</string>
+    <string name="weather_condition_snow">Sneeuwerig</string>
+    <string name="weather_condition_wind">Winderig</string>
+    <string name="weather_condition_mist">Mistig</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 Opladen (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> tot vol)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Opladen</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 Opladen (<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 Opladen</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 Opladen (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> tot volledig opgeladen)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Opladen</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> tot volledig opgeladen)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Opladen</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SysteemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go geactiveerd</string>
+    <string name="onthego_notif_title">On-The-Go is actief</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Opties</string>
+    <string name="onthego_notif_error">Niet in staat om On-The-Go te starten</string>
+    <string name="onthego_notif_restart">Herstart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Cameramodus gewijzigd</string>
+    <string name="onthego_transparency">Transparantie</string>
+    <string name="onthego_front_camera">Gebruik camera aan de voorzijde</string>
+    <string name="onthego_service_toggle">Service automatisch herstarten</string>
+    <string name="onthego_channel_name">Algemeen</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioriteit</string>
+    <string name="volume_ringer_alarms_only">Alarmen</string>
+    <string name="volume_ringer_dnd">DnD</string>
+    <string name="tristate_flashlight">Zaklamp</string>
+    <string name="tristate_flashlight_on">Zaklamp aan</string>
+    <string name="tristate_flashlight_off">Zaklamp uit</string>
+    <string name="tristate_flashlight_blink">Zaklamp knipperen</string>
+    <string name="tristate_brightness_bright">Maximale helderheid</string>
+    <string name="tristate_brightness_dark">Minimale helderheid</string>
+    <string name="tristate_brightness_auto">Automatische helderheid</string>
+    <string name="tristate_rotation_auto">Automatisch draaien</string>
+    <string name="tristate_rotation_0">Staand</string>
+    <string name="tristate_rotation_90">Liggend (90°)</string>
+    <string name="tristate_rotation_270">Liggend (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">vandaag gebruikt</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Gegevens</string>
+    <string name="usage_wifi_default_suffix">Wifi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Gedwongen stoppen?</string>
+    <string name="force_stop_dlg_text">Als je een app gedwongen stopt, kan deze onverwacht gedrag vertonen.</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">Geluid</string>
+    <string name="quick_settings_sound_ring">Beltoon</string>
+    <string name="quick_settings_sound_vibrate">Trillen</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">Kompas</string>
+    <string name="quick_settings_compass_value"><xliff:g id="graden">%1$.0f</xliff:g>\u00b0 <xliff:g id="richting">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initialiseren\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NO</string>
+    <string name="quick_settings_compass_E">O</string>
+    <string name="quick_settings_compass_SE">ZO</string>
+    <string name="quick_settings_compass_S">Z</string>
+    <string name="quick_settings_compass_SW">ZW</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">Wissel gegevenskaart</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume paneel</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Slimme Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Slimme Pixels automatisch ingeschakeld</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Fout bij het laden van weergegevens</string>
+    <string name="omnijaws_service_unknown">Geen weergegevens</string>
+    <string name="omnijaws_label_default">Weer</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Vernieuwingsfrequentie</string>
+    <string name="auto_mode_label">Automatisch</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Lang indrukken - geselecteerde regio</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Taal</string>
+    <string name="quick_settings_locale_more_locales_toast">Eerst meerdere talen configureren</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistent</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">Gezicht herkennen...</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>
+    <!-- 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 apparaat verbonden</item>
+        <item quantity="other">%d apparaten verbonden</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">5G inschakelen</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Verwijderen</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Schermopname verwijderd</string>
+</resources>
diff --git a/packages/SystemUI/res/values-pl-rPL/cr_strings.xml b/packages/SystemUI/res/values-pl-rPL/cr_strings.xml
new file mode 100644
index 0000000000000..2a95891578888
--- /dev/null
+++ b/packages/SystemUI/res/values-pl-rPL/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Oszczędzanie danych</string>
+    <string name="status_bar_call_strength">Siła połączenia</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Wskaźnik roamingu</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Połączenia HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Połączenia poprzez Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Ikona wyłączonych danych</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Ikona 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Pochmurno</string>
+    <string name="weather_condition_rain">Deszczowo</string>
+    <string name="weather_condition_clear">Czyste niebo</string>
+    <string name="weather_condition_storm">Burzowo</string>
+    <string name="weather_condition_snow">Śnieżnie</string>
+    <string name="weather_condition_wind">Wietrznie</string>
+    <string name="weather_condition_mist">Mgliście</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> • Ładowanie Dash (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do pełnego naładowania)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="Percentage">%s</xliff:g> • Ładowanie 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> • Ładowanie Warp (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do pełnego naładowania)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="Percentage">%s</xliff:g> • Ładowanie 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> • Ładowanie VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do pełnego naładowania)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="Percentage">%s</xliff:g> • Ładowanie 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> • Szybkie ładowanie (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do naładowania)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Szybkie ładowanie</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"> Aktywowano tryb \"w ruchu\"</string>
+    <string name="onthego_notif_title">Tryb \"w ruchu\" jest aktywny</string>
+    <string name="onthego_notif_stop">Zatrzymaj</string>
+    <string name="onthego_notif_options">Opcje</string>
+    <string name="onthego_notif_error">Nie można uruchomić trybu \"w ruchu\"</string>
+    <string name="onthego_notif_restart">Uruchom ponownie tryb \"w ruchu\"</string>
+    <string name="onthego_notif_camera_changed">Zmieniono tryb pracy aparatu</string>
+    <string name="onthego_transparency">Przezroczystość</string>
+    <string name="onthego_front_camera">Użyj przedniego aparatu</string>
+    <string name="onthego_service_toggle">Automatycznie uruchom ponownie usługę</string>
+    <string name="onthego_channel_name">Główny</string>
+    <string name="global_action_onthego">W ruchu</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Priorytetowe</string>
+    <string name="volume_ringer_alarms_only">Alarmy</string>
+    <string name="volume_ringer_dnd">Nie przeszkadzać</string>
+    <string name="tristate_flashlight">Latarka</string>
+    <string name="tristate_flashlight_on">Latarka włączona</string>
+    <string name="tristate_flashlight_off">Latarka wyłączona</string>
+    <string name="tristate_flashlight_blink">Miganie latarki</string>
+    <string name="tristate_brightness_bright">Maksymalna jasność</string>
+    <string name="tristate_brightness_dark">Minimalna jasność</string>
+    <string name="tristate_brightness_auto">Automatyczna jasność</string>
+    <string name="tristate_rotation_auto">Automatyczne obracanie</string>
+    <string name="tristate_rotation_0">Pionowo</string>
+    <string name="tristate_rotation_90">Poziomo (90°)</string>
+    <string name="tristate_rotation_270">Poziomo (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">użyto dzisiaj</string>
+    <string name="usage_data_weekly">użyto w tym tygodniu</string>
+    <string name="usage_data_default_suffix">Dane</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Wymusić zatrzymanie?</string>
+    <string name="force_stop_dlg_text">Wymuszenie zatrzymania aplikacji może spowodować jej nieprawidłowe działanie.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Obiektyw</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Dźwięk</string>
+    <string name="quick_settings_sound_ring">Dzwonek</string>
+    <string name="quick_settings_sound_vibrate">Wibracje</string>
+    <string name="quick_settings_sound_silent">Tryb cichy</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informacje o CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Informacje o FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" przykład="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Kompas</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">Inicjowanie\u2026</string>
+    <string name="quick_settings_compass_N">Płn</string>
+    <string name="quick_settings_compass_NE">Płn.-Wsch.</string>
+    <string name="quick_settings_compass_E">Wsch.</string>
+    <string name="quick_settings_compass_SE">Płd.-Wsch.</string>
+    <string name="quick_settings_compass_S">Płd.</string>
+    <string name="quick_settings_compass_SW">Płd.-Zach.</string>
+    <string name="quick_settings_compass_W">Zach.</string>
+    <string name="quick_settings_compass_NW">Płn.-Zach.</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Przełączanie SIM dla danych</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panel głośności</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Inteligentne piksele</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Automatyczne włączanie Inteligentnych pikseli</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Błąd wczytywania danych o pogodzie</string>
+    <string name="omnijaws_service_unknown">Brak danych o pogodzie</string>
+    <string name="omnijaws_label_default">Pogoda</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Częstotliwość odświeżania</string>
+    <string name="auto_mode_label">Automatycznie</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Długie dotknięcie - wybrany obszar</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Język</string>
+    <string name="quick_settings_locale_more_locales_toast">Najpierw skonfiguruj wiele języków</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Asystent SI</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferowana sieć</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">Nieobsługiwana</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Rozpoznawanie twarzy...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Moc latarki</string>
+    <string name="flashlight_strength_turn_off">Wyłącz</string>
+    <string name="flashlight_strength_turn_on">Włącz</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 połączone urządzenie</item>
+        <item quantity="few">%d połączone urządzenia</item>
+        <item quantity="many">%d połączonych urządzeń</item>
+        <item quantity="other">%d połączonych urządzeń</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Włącz 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Usuń</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Usunięto nagranie ekranu</string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/cr_strings.xml b/packages/SystemUI/res/values-pt-rBR/cr_strings.xml
new file mode 100644
index 0000000000000..cdc43f66b0ac8
--- /dev/null
+++ b/packages/SystemUI/res/values-pt-rBR/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Economia de dados</string>
+    <string name="status_bar_call_strength">Intensidade do sinal para chamadas</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicador de Roaming</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Chamadas HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Chamadas Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Ícone de dados desativado</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Nublado</string>
+    <string name="weather_condition_rain">Chuvoso</string>
+    <string name="weather_condition_clear">Céu Limpo</string>
+    <string name="weather_condition_storm">Tempestuoso</string>
+    <string name="weather_condition_snow">Neve</string>
+    <string name="weather_condition_wind">Ventania</string>
+    <string name="weather_condition_mist">Nevoeiro</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> • Carregamento Dash (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até a carga completa)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Carregamento 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> • Carregamento Warp (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até concluir)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Carregando Rapidamente</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> • Carregamento rápido (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até concluir)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Carregando rapidamente</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> • Carregamento Turbo (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até concluir)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Carregamento Turbo</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Interface do sistema</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">OTG ativado</string>
+    <string name="onthego_notif_title">OTG está ativo</string>
+    <string name="onthego_notif_stop">Parar</string>
+    <string name="onthego_notif_options">Opções</string>
+    <string name="onthego_notif_error">Não foi possível iniciar OTG</string>
+    <string name="onthego_notif_restart">Reiniciar OTG</string>
+    <string name="onthego_notif_camera_changed">Modo câmera alterado</string>
+    <string name="onthego_transparency">Transparência</string>
+    <string name="onthego_front_camera">Usar câmera frontal</string>
+    <string name="onthego_service_toggle">Reiniciar automaticamente o serviço</string>
+    <string name="onthego_channel_name">Principal</string>
+    <string name="global_action_onthego">OTG</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioridade</string>
+    <string name="volume_ringer_alarms_only">Alarmes</string>
+    <string name="volume_ringer_dnd">Não Perturbe</string>
+    <string name="tristate_flashlight">Lanterna</string>
+    <string name="tristate_flashlight_on">Lanterna ligada</string>
+    <string name="tristate_flashlight_off">Lanterna desligada</string>
+    <string name="tristate_flashlight_blink">Piscar lanterna</string>
+    <string name="tristate_brightness_bright">Brilho máximo</string>
+    <string name="tristate_brightness_dark">Brilho mínimo</string>
+    <string name="tristate_brightness_auto">Brilho automático</string>
+    <string name="tristate_rotation_auto">Girar automaticamente</string>
+    <string name="tristate_rotation_0">Retrato</string>
+    <string name="tristate_rotation_90">Paisagem (90°)</string>
+    <string name="tristate_rotation_270">Paisagem (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">usado hoje</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Dados</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Forçar parada?</string>
+    <string name="force_stop_dlg_text">Se você forçar a parada de um app, ele pode apresentar mau funcionamento.</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">Som</string>
+    <string name="quick_settings_sound_ring">Campainha</string>
+    <string name="quick_settings_sound_vibrate">Vibração</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informações da CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Informação de FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" exemplo="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Bússola</string>
+    <string name="quick_settings_compass_value"><xliff:g id="graus">%1$.0f</xliff:g>\u00b0 <xliff:g id="direção">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Inicializando\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">L</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">Trocar cartão de dados</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Painel de volume</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Pixels Inteligentes</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Ativar pixels inteligentes automaticamente</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Erro ao carregar as informações do clima</string>
+    <string name="omnijaws_service_unknown">Sem informações do clima</string>
+    <string name="omnijaws_label_default">Clima</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Taxa de atualização</string>
+    <string name="auto_mode_label">Automático</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Toque longo - região selecionada</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Idioma</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure vários idiomas primeiro</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Assistente de IA</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">Reconhecendo...</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>
+    <!-- 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 dispositivo conectado</item>
+        <item quantity="other">%d dispositivos conectados</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Ativar 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Excluir</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Gravação de tela excluída</string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/cr_strings.xml b/packages/SystemUI/res/values-pt-rPT/cr_strings.xml
new file mode 100644
index 0000000000000..e666259844aef
--- /dev/null
+++ b/packages/SystemUI/res/values-pt-rPT/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Poupança de dados</string>
+    <string name="status_bar_call_strength">Intensidade do sinal</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicador de roaming</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Chamada alta definição (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Chamada Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Com nuvens</string>
+    <string name="weather_condition_rain">Chuvoso</string>
+    <string name="weather_condition_clear">Céu limpo</string>
+    <string name="weather_condition_storm">Tempestuoso</string>
+    <string name="weather_condition_snow">Nevado</string>
+    <string name="weather_condition_wind">Ventoso</string>
+    <string name="weather_condition_mist">Enevoado</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> • Carregamento Dash (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até estar completo)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Carregamento 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> • Carregamento Rápido (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até esta completo)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Carregamento 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> • Carregamento Rápido (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até estar completo)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Carregamento Rápido</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> • Carregamento Turbo (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> até estar completo)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Carregamento Turbo</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">IU do Sistema</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">OTG ativado</string>
+    <string name="onthego_notif_title">OTG está ativo</string>
+    <string name="onthego_notif_stop">Parar</string>
+    <string name="onthego_notif_options">Opções</string>
+    <string name="onthego_notif_error">Não é possível iniciar OTG</string>
+    <string name="onthego_notif_restart">Reiniciar OTG</string>
+    <string name="onthego_notif_camera_changed">Modo de câmara alterado</string>
+    <string name="onthego_transparency">Transparência</string>
+    <string name="onthego_front_camera">Usar a câmara frontal</string>
+    <string name="onthego_service_toggle">Reiniciar o serviço automaticamente</string>
+    <string name="onthego_channel_name">Principal</string>
+    <string name="global_action_onthego">OTG</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioridade</string>
+    <string name="volume_ringer_alarms_only">Alarmes</string>
+    <string name="volume_ringer_dnd">Não incomodar</string>
+    <string name="tristate_flashlight">Lanterna</string>
+    <string name="tristate_flashlight_on">Lanterna ligada</string>
+    <string name="tristate_flashlight_off">Lanterna desligada</string>
+    <string name="tristate_flashlight_blink">Lanterna a piscar</string>
+    <string name="tristate_brightness_bright">Brilho máximo</string>
+    <string name="tristate_brightness_dark">Brilho mínimo</string>
+    <string name="tristate_brightness_auto">Brilho automático</string>
+    <string name="tristate_rotation_auto">Rotação automática</string>
+    <string name="tristate_rotation_0">Retrato</string>
+    <string name="tristate_rotation_90">Paisagem (90°)</string>
+    <string name="tristate_rotation_270">Paisagem (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">utilizado hoje</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Dados</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Forçar paragem?</string>
+    <string name="force_stop_dlg_text">Se forçar a paragem de uma aplicação, esta poderá ter um comportamento anormal.</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">Som</string>
+    <string name="quick_settings_sound_ring">Toque</string>
+    <string name="quick_settings_sound_vibrate">Vibrar</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informação do dispositivo</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Informação de FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" exemplo="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Bússola</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">A iniciar\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">Trocar cartão de dados</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Painel de volume</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Pixeis Inteligentes</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Autoativação dos Pixeis Inteligentes</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Erro ao carregar dados meteorológicos</string>
+    <string name="omnijaws_service_unknown">Sem dados de meteorologia</string>
+    <string name="omnijaws_label_default">Meteorologia</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Taxa de atualização</string>
+    <string name="auto_mode_label">Automático</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Toque longo - região selecionada</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Idioma</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure vários idiomas primeiro</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Assistente IA</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">A reconhecer rosto...</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>
+    <!-- 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 dispositivo conectado</item>
+        <item quantity="other">%d dispositivos conectados</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Ativar 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Eliminar</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Gravação de ecrã eliminada</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ro-rRO/cr_strings.xml b/packages/SystemUI/res/values-ro-rRO/cr_strings.xml
new file mode 100644
index 0000000000000..d1243f1cef627
--- /dev/null
+++ b/packages/SystemUI/res/values-ro-rRO/cr_strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Economizor date</string>
+    <string name="status_bar_call_strength">Putere apel</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicator roaming</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Apel HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Apel Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Pictograma datelor dezactivată</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Pictograma 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Înnorat</string>
+    <string name="weather_condition_rain">Ploios</string>
+    <string name="weather_condition_clear">Însorit</string>
+    <string name="weather_condition_storm">Furtunos</string>
+    <string name="weather_condition_snow">Ninsoare</string>
+    <string name="weather_condition_wind">Vânt</string>
+    <string name="weather_condition_mist">Cețos</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> • Încărcare DASH (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> până la finalizare)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Încărcare 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> • Încărcare Warp (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> până la finalizare)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Încărcare 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> • Încărcare VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> până la finalizare)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Încărcare 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> • Încărcare Turbo (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> până la finalizare)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Încărcare Turbo</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Interfață sistem</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activat</string>
+    <string name="onthego_notif_title">On-The-Go este activ</string>
+    <string name="onthego_notif_stop">Oprește</string>
+    <string name="onthego_notif_options">Opţiuni</string>
+    <string name="onthego_notif_error">Pornirea On-The-Go a eșuat</string>
+    <string name="onthego_notif_restart">Repornire On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Mod cameră schimbat</string>
+    <string name="onthego_transparency">Transparență</string>
+    <string name="onthego_front_camera">Folosește camera frontală</string>
+    <string name="onthego_service_toggle">Repornire automată a serviciului</string>
+    <string name="onthego_channel_name">Principal</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Prioritate</string>
+    <string name="volume_ringer_alarms_only">Alarme</string>
+    <string name="volume_ringer_dnd">Nu deranjați</string>
+    <string name="tristate_flashlight">Lanternă</string>
+    <string name="tristate_flashlight_on">Lanternă activată</string>
+    <string name="tristate_flashlight_off">Lanternă oprită</string>
+    <string name="tristate_flashlight_blink">Lanternă clipire</string>
+    <string name="tristate_brightness_bright">Luminozitate maximă</string>
+    <string name="tristate_brightness_dark">Luminozitate minimă</string>
+    <string name="tristate_brightness_auto">Luminozitate minimă</string>
+    <string name="tristate_rotation_auto">Auto-rotire</string>
+    <string name="tristate_rotation_0">Portret</string>
+    <string name="tristate_rotation_90">Peisaj (90°)</string>
+    <string name="tristate_rotation_270">Peisaj (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">utilizat azi</string>
+    <string name="usage_data_weekly">utilizat în această săptămână</string>
+    <string name="usage_data_default_suffix">Date</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Oprire forțată?</string>
+    <string name="force_stop_dlg_text">Dacă forțați oprirea unei aplicații, aceasta se poate comporta necorespunzător.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Obiectiv</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sunet</string>
+    <string name="quick_settings_sound_ring">Sonerie</string>
+    <string name="quick_settings_sound_vibrate">Vibrează</string>
+    <string name="quick_settings_sound_silent">Silențios</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Info procesor</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Info 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">Busolă</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">Initializare\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">SV</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NV</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Comutați SIM-ul de date mobile</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panou de volum</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Pixeli inteligenți</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Auto-activare pixeli inteligenți</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Eroare la incărcare data vreme</string>
+    <string name="omnijaws_service_unknown">Fară informatii vreme</string>
+    <string name="omnijaws_label_default">Vremea</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Frecvența de reîmprospătare</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Apăsare lungă - regiunea selectată</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Limba</string>
+    <string name="quick_settings_locale_more_locales_toast">Configurați mai întâi limbi multiple</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Asistent IA</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Rețea preferată</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">Neacceptat</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recunoașterea feței...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Putere lanternă</string>
+    <string name="flashlight_strength_turn_off">Opriți</string>
+    <string name="flashlight_strength_turn_on">Porniți</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 dispozitiv conectat</item>
+        <item quantity="few">%d dispozitiv conectat</item>
+        <item quantity="other">%d dispozitive conectate</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Activează 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Șterge</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Înregistrare ecran ștearsă</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ru-rRU/cr_strings.xml b/packages/SystemUI/res/values-ru-rRU/cr_strings.xml
new file mode 100644
index 0000000000000..43df808354acc
--- /dev/null
+++ b/packages/SystemUI/res/values-ru-rRU/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Значок «Данные отключены»</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Значок 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">кбит/с</string>
+    <string name="megabitspersecond_short">Мбит/с</string>
+    <string name="gigabitspersecond_short">Гб/с</string>
+    <string name="kilobytespersecond_short">кБ/с</string>
+    <string name="megabytespersecond_short">МБ/с</string>
+    <string name="gigabytespersecond_short">ГБ/с</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> • Dash зарядка (<xliff:g id="charging_time_left" example="4 часа и 2 минуты">%1$s</xliff:g> до полной)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • 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> • Warp зарядка (<xliff:g id="charging_time_left" example="4 часа и 2 минуты">%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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Приоритетные</string>
+    <string name="volume_ringer_alarms_only">Будильники</string>
+    <string name="volume_ringer_dnd">Не беспокоить</string>
+    <string name="tristate_flashlight">Фонарик</string>
+    <string name="tristate_flashlight_on">Фонарик включен</string>
+    <string name="tristate_flashlight_off">Фонарик отключен</string>
+    <string name="tristate_flashlight_blink">Мигание фонарика</string>
+    <string name="tristate_brightness_bright">Максимальная яркость</string>
+    <string name="tristate_brightness_dark">Минимальная яркость</string>
+    <string name="tristate_brightness_auto">Автоматическая яркость</string>
+    <string name="tristate_rotation_auto">Автоповорот</string>
+    <string name="tristate_rotation_0">Вертикально</string>
+    <string name="tristate_rotation_90">Горизонтально (90°)</string>
+    <string name="tristate_rotation_270">Горизонтально (270°)</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">Звонок</string>
+    <string name="quick_settings_sound_vibrate">Вибрация</string>
+    <string name="quick_settings_sound_silent">Беззвучный</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Информация о CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Информация о FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" примерно="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="градусы">%1$.0f</xliff:g>\u00b0 <xliff:g id="направление">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Инициализация\u2026</string>
+    <string name="quick_settings_compass_N">C</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">Переключить SIM</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Панель громкости</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">«Умные пиксели»</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Автовключение «Умных пикселей»</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="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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Яркость фонарика</string>
+    <string name="flashlight_strength_turn_off">Отключить</string>
+    <string name="flashlight_strength_turn_on">Включить</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>
+</resources>
diff --git a/packages/SystemUI/res/values-sat-rIN/cr_strings.xml b/packages/SystemUI/res/values-sat-rIN/cr_strings.xml
new file mode 100644
index 0000000000000..f3ad70a35714d
--- /dev/null
+++ b/packages/SystemUI/res/values-sat-rIN/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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> • ᱰᱮᱥ ᱪᱟᱨᱡᱤᱝ (<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> • 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>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">ᱥᱤᱥᱴᱮᱢ UI</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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">ᱯᱨᱟᱭᱚᱨᱤᱴᱭ</string>
+    <string name="volume_ringer_alarms_only">ᱟᱠᱟᱨᱟᱢᱠᱚ</string>
+    <string name="volume_ringer_dnd">DnD</string>
+    <string name="tristate_flashlight">Torch</string>
+    <string name="tristate_flashlight_on">ᱴᱚᱨᱪ ᱮᱢ ᱪᱷᱚ</string>
+    <string name="tristate_flashlight_off">ᱴᱚᱨᱪ ᱵᱚᱸᱫ</string>
+    <string name="tristate_flashlight_blink">ᱴᱚᱨᱪ ᱡᱤᱲᱤᱵ</string>
+    <string name="tristate_brightness_bright">ᱡᱟᱹᱥᱼᱡᱷᱟᱞᱠᱟᱣᱠᱚ</string>
+    <string name="tristate_brightness_dark">ᱢᱤᱱᱼᱡᱷᱟᱞᱠᱟᱣᱠᱚ</string>
+    <string name="tristate_brightness_auto">ᱟᱡᱼᱛᱮᱡᱷᱟᱞᱠᱟᱣ</string>
+    <string name="tristate_rotation_auto">ᱟᱡ ᱛᱮ ᱟᱹᱪᱩᱨ</string>
+    <string name="tristate_rotation_0">ᱯᱚᱴᱨᱮᱴ</string>
+    <string name="tristate_rotation_90">ᱞᱮᱸᱰᱥᱠᱮᱯ (᱙᱐°)</string>
+    <string name="tristate_rotation_270">ᱞᱮᱸᱰᱥᱠᱮᱯ (᱒᱗᱐°)</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">ᱡᱩᱨ ᱛᱮ ᱵᱚᱸᱫᱽ ᱟᱢ?</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">Lens</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">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU ᱵᱤᱵᱨᱚᱬ</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">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">ᱠᱚᱢᱯᱟᱥ</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">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">ᱰᱟᱴᱟ ᱠᱟᱰ ᱛᱮ ᱪᱟᱞᱟᱜ ᱢᱮᱸ</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Auto-enabled Smart Pixels</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">Refresh rate</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">ᱯᱟᱹᱨᱥᱤ</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>
+    <!-- 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>
+    <!-- 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">ᱜᱮᱫ ᱜᱤᱰᱤ</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">ᱥᱠᱨᱤᱱ ᱨᱮᱠᱚᱰᱤᱝ ᱢᱮᱴᱟᱣ ᱮᱱᱟ</string>
+</resources>
diff --git a/packages/SystemUI/res/values-sk-rSK/cr_strings.xml b/packages/SystemUI/res/values-sk-rSK/cr_strings.xml
new file mode 100644
index 0000000000000..3016bf20982ed
--- /dev/null
+++ b/packages/SystemUI/res/values-sk-rSK/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Šetrič dát</string>
+    <string name="status_bar_call_strength">Sila hovorov</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indikátor roamingu</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Hovory v HD kvalite (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Hovory cez Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Zamračené</string>
+    <string name="weather_condition_rain">Daždivo</string>
+    <string name="weather_condition_clear">Ani mráčik, čistá obloha</string>
+    <string name="weather_condition_storm">Búrka</string>
+    <string name="weather_condition_snow">Sneženie</string>
+    <string name="weather_condition_wind">Veterno</string>
+    <string name="weather_condition_mist">Hmlisto</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 nabíjanie (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do plného nabitia)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • DASH nabíjanie</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="percent">%2$s</xliff:g> • Warp Nabíjanie (<xliff:g id="charging_time_left" príklad="4 hodiny a 2 minúty">%1$s</xliff:g> do nabitia)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percent">%s</xliff:g> • Warp Nabíjanie</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 nabíjanie (zostáva <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> do úplného nabitia)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC nabíjanie</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="percent">%2$s</xliff:g> • Turbo Nabíjanie (<xliff:g id="charging_time_left" príklad="4 hodiny a 2 minúty">%1$s</xliff:g> do nabitia)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo nabíjanie</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">Režim priehľadnej obrazovky aktivovaný</string>
+    <string name="onthego_notif_title">Režim priehľadnej obrazovky je aktívny</string>
+    <string name="onthego_notif_stop">Zastaviť</string>
+    <string name="onthego_notif_options">Možnosti</string>
+    <string name="onthego_notif_error">Nepodarilo sa spustiť Režim priehľadnej obrazovky</string>
+    <string name="onthego_notif_restart">Reštartovať režim priehľadnej obrazovky</string>
+    <string name="onthego_notif_camera_changed">Režim fotoaparátu bol zmenený</string>
+    <string name="onthego_transparency">Priehľadnosť</string>
+    <string name="onthego_front_camera">Použiť prednú kameru</string>
+    <string name="onthego_service_toggle">Automaticky reštartovať službu</string>
+    <string name="onthego_channel_name">Hlavné</string>
+    <string name="global_action_onthego">Režim priehľadnej obrazovky</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Priorita</string>
+    <string name="volume_ringer_alarms_only">Budíky</string>
+    <string name="volume_ringer_dnd">Nerušiť</string>
+    <string name="tristate_flashlight">Svietidlo</string>
+    <string name="tristate_flashlight_on">Svietidlo zapnuté</string>
+    <string name="tristate_flashlight_off">Svietidlo vypnuté</string>
+    <string name="tristate_flashlight_blink">Blikanie svietidla</string>
+    <string name="tristate_brightness_bright">Maximálny jas</string>
+    <string name="tristate_brightness_dark">Minimálny jas</string>
+    <string name="tristate_brightness_auto">Automatický jas</string>
+    <string name="tristate_rotation_auto">Automatická rotácia</string>
+    <string name="tristate_rotation_0">Na výšku</string>
+    <string name="tristate_rotation_90">Na šírku (90°)</string>
+    <string name="tristate_rotation_270">Na šírku (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">Využité dnes</string>
+    <string name="usage_data_weekly">použité tento týždeň</string>
+    <string name="usage_data_default_suffix">Dáta</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Vynútiť zastavenie?</string>
+    <string name="force_stop_dlg_text">Vynútené ukončenie môže spôsobiť nepredvídateľné správanie aplikácie.</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">Zvuk</string>
+    <string name="quick_settings_sound_ring">Zvonenie</string>
+    <string name="quick_settings_sound_vibrate">Vibrácie</string>
+    <string name="quick_settings_sound_silent">Tichý</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Informácie o CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">Priečinok: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Kompas</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">Inicializácia\u2026</string>
+    <string name="quick_settings_compass_N">S</string>
+    <string name="quick_settings_compass_NE">SV</string>
+    <string name="quick_settings_compass_E">V</string>
+    <string name="quick_settings_compass_SE">JV</string>
+    <string name="quick_settings_compass_S">J</string>
+    <string name="quick_settings_compass_SW">JZ</string>
+    <string name="quick_settings_compass_W">Z</string>
+    <string name="quick_settings_compass_NW">SZ</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Prepnúť SIM pre dáta</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panel hlasitosti</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Režim inteligentných pixelov</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Automaticky zapnúť režim inteligentných pixlov</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Chyba pri načítavaní údajov o počasí</string>
+    <string name="omnijaws_service_unknown">Žiadne údaje o počasí</string>
+    <string name="omnijaws_label_default">Počasie</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Obnovovacia frekvencia</string>
+    <string name="auto_mode_label">Automaticky</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Dlhé stlačenie - vybraný región</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Prebieha rozpoznávanie tváre...</string>
+    <string name="quick_settings_locale_more_locales_toast">Najskôr nastavte viac jazykov</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI asistent</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferovaná sieť</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">Nepodporované</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Prebieha rozpoznávanie tváre...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Jas batérie</string>
+    <string name="flashlight_strength_turn_off">Vypnúť</string>
+    <string name="flashlight_strength_turn_on">Zapnúť</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 pripojené zariadenie</item>
+        <item quantity="few">%d pripojené zariadenia</item>
+        <item quantity="many">%d pripojených zariadení</item>
+        <item quantity="other">%d pripojených zariadení</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Povoliť 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Odstrániť</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Záznam obrazovky bol odstránený</string>
+</resources>
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index d22c8d910230d..bea7141c829dd 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-sw900dp/config.xml b/packages/SystemUI/res/values-sw900dp/config.xml
deleted file mode 100644
index 221b0139e713f..0000000000000
--- a/packages/SystemUI/res/values-sw900dp/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources>
-
-    <!-- Nav bar button default ordering/layout -->
-    <string name="config_navBarLayout" translatable="false">back,home,left;space;right,recent</string>
-
-</resources>
diff --git a/packages/SystemUI/res/values-tr-rTR/cr_strings.xml b/packages/SystemUI/res/values-tr-rTR/cr_strings.xml
new file mode 100644
index 0000000000000..9d93c40f6b9fb
--- /dev/null
+++ b/packages/SystemUI/res/values-tr-rTR/cr_strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Arama gücü</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Dolaşım göstergesi</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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Mobil Veri devre dışı simgesi</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G simgesi</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Bulutlu</string>
+    <string name="weather_condition_rain">Yağmurlu</string>
+    <string name="weather_condition_clear">Açık Hava</string>
+    <string name="weather_condition_storm">Fırtınalı</string>
+    <string name="weather_condition_snow">Karlı</string>
+    <string name="weather_condition_wind">Rüzgârlı</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 (tam 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 (tam 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 (tam 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 (tam 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>
+    <!-- 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üme modu etkinleştirildi</string>
+    <string name="onthego_notif_title">Yürüme modu etkin</string>
+    <string name="onthego_notif_stop">Durdur</string>
+    <string name="onthego_notif_options">Seçenekler</string>
+    <string name="onthego_notif_error">Yürüme modu başlatılamıyor</string>
+    <string name="onthego_notif_restart">Yürüme modunu yeniden başlat</string>
+    <string name="onthego_notif_camera_changed">Kamera modu değiştirildi</string>
+    <string name="onthego_transparency">Şeffaflık</string>
+    <string name="onthego_front_camera">Ön kamerayı kullan</string>
+    <string name="onthego_service_toggle">Servisi otomatik yeniden başlat</string>
+    <string name="onthego_channel_name">Ana menü</string>
+    <string name="global_action_onthego">Yürüme modu</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Öncelik</string>
+    <string name="volume_ringer_alarms_only">Alarmlar</string>
+    <string name="volume_ringer_dnd">Rahatsız etmeyin</string>
+    <string name="tristate_flashlight">Fener</string>
+    <string name="tristate_flashlight_on">Fener açık</string>
+    <string name="tristate_flashlight_off">Fener kapalı</string>
+    <string name="tristate_flashlight_blink">Feneri yakıp söndür</string>
+    <string name="tristate_brightness_bright">Maksimum parlaklık</string>
+    <string name="tristate_brightness_dark">Minimum parlaklık</string>
+    <string name="tristate_brightness_auto">Otomatik parlaklık</string>
+    <string name="tristate_rotation_auto">Otomatik döndürme</string>
+    <string name="tristate_rotation_0">Dikey</string>
+    <string name="tristate_rotation_90">Yatay (90°)</string>
+    <string name="tristate_rotation_270">Yatay (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">bugün kullanılan</string>
+    <string name="usage_data_weekly">bu hafta kullanıldı</string>
+    <string name="usage_data_default_suffix">Veri</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</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">Veri kartını değiştir</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Ses paneli</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Akıllı pikseller</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Otomatik olarak akıllı pikselleri etkinleştir</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Hava durumu verisi yüklenemedi</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="auto_mode_label">Otomatik</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Uzun basma - seçilen bölge</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 Zekâ Yardımcısı</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 tanınıyor...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">El Feneri Şiddeti</string>
+    <string name="flashlight_strength_turn_off">Kapat</string>
+    <string name="flashlight_strength_turn_on">Aç</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>
+</resources>
diff --git a/packages/SystemUI/res/values-uk-rUA/cr_strings.xml b/packages/SystemUI/res/values-uk-rUA/cr_strings.xml
new file mode 100644
index 0000000000000..fe006de5816c9
--- /dev/null
+++ b/packages/SystemUI/res/values-uk-rUA/cr_strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Індикатор вимкнених мобільних даних</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Піктограма 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">кб/с</string>
+    <string name="megabitspersecond_short">Мб/с</string>
+    <string name="gigabitspersecond_short">Гб/с</string>
+    <string name="kilobytespersecond_short">кБ/с</string>
+    <string name="megabytespersecond_short">МБ/с</string>
+    <string name="gigabytespersecond_short">ГБ/с</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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Пріоритет</string>
+    <string name="volume_ringer_alarms_only">Будильники</string>
+    <string name="volume_ringer_dnd">Не турбувати</string>
+    <string name="tristate_flashlight">Ліхтарик</string>
+    <string name="tristate_flashlight_on">Ліхтарик увімкнено</string>
+    <string name="tristate_flashlight_off">Ліхтарик вимк</string>
+    <string name="tristate_flashlight_blink">Ліхтарик</string>
+    <string name="tristate_brightness_bright">Максимальна яскравість</string>
+    <string name="tristate_brightness_dark">Мінімальна яскравість</string>
+    <string name="tristate_brightness_auto">Автояскравість</string>
+    <string name="tristate_rotation_auto">Автоматичне обертання</string>
+    <string name="tristate_rotation_0">Портретна</string>
+    <string name="tristate_rotation_90">Ландшафт (90°)</string>
+    <string name="tristate_rotation_270">Ландшафт (270°)</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">Кільце</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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Смарт Пікселі</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Автоматичне ввімкнення Смарт Пікселів</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="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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Сила ліхтарика</string>
+    <string name="flashlight_strength_turn_off">Вимкнути</string>
+    <string name="flashlight_strength_turn_on">Увімкнути</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">Пристрій під\'єднано</item>
+        <item quantity="few">Підключено пристроїв: %1$d</item>
+        <item quantity="many">Підключено пристроїв: %1$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>
+</resources>
diff --git a/packages/SystemUI/res/values-vi-rVN/cr_strings.xml b/packages/SystemUI/res/values-vi-rVN/cr_strings.xml
new file mode 100644
index 0000000000000..55c5493eb9d88
--- /dev/null
+++ b/packages/SystemUI/res/values-vi-rVN/cr_strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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">Tiết kiệm dữ liệu</string>
+    <string name="status_bar_call_strength">Cường độ cuộc gọi</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Biểu tượng chuyển vùng</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Cuộc gọi HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Cuộc gọi Wi-Fi (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Biểu tượng khi dữ liệu bị tắt</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Biểu tượng 4G</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/ giây</string>
+    <string name="megabitspersecond_short">Mb/ giây</string>
+    <string name="gigabitspersecond_short">Gb/ giây</string>
+    <string name="kilobytespersecond_short">kB/ giây</string>
+    <string name="megabytespersecond_short">MB/ giây</string>
+    <string name="gigabytespersecond_short">GB/ giây</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Nhiều mây</string>
+    <string name="weather_condition_rain">Mưa</string>
+    <string name="weather_condition_clear">Trời quang đãng</string>
+    <string name="weather_condition_storm">Bão</string>
+    <string name="weather_condition_snow">Có tuyết</string>
+    <string name="weather_condition_wind">Có gió</string>
+    <string name="weather_condition_mist">Sương mù</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> • Đang sạc nhanh (<xliff:g id="charging_time_left" example="4 giờ 2 phút">%1$s</xliff:g> đến khi đầy)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="PERCENTAGE">%s</xliff:g> • Đang sạc nhanh</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> • Đang sạc nhanh (<xliff:g id="charging_time_left" example="4 giờ 2 phút">%1$s</xliff:g> nữa sẽ đầy)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Đang sạc nhanh</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> • Sạc nhanh VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> nữa sẽ đầy)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="Percentage">%s</xliff:g> • Sạc nhanh 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> • Đang sạc siêu nhanh (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> nữa sẽ đầy)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Sạc siêu nhanh</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Giao diện người dùng hệ thống</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Đã bật chế độ trên đường đi</string>
+    <string name="onthego_notif_title">Trên đường đi đang hoạt động</string>
+    <string name="onthego_notif_stop">Dừng lại</string>
+    <string name="onthego_notif_options">Tùy chọn</string>
+    <string name="onthego_notif_error">Không thể khởi động trên đường đi</string>
+    <string name="onthego_notif_restart">Khởi động lại trên đường đi</string>
+    <string name="onthego_notif_camera_changed">Đã thay đổi chế độ máy ảnh</string>
+    <string name="onthego_transparency">Độ trong suốt</string>
+    <string name="onthego_front_camera">Sử dụng máy ảnh trước</string>
+    <string name="onthego_service_toggle">Tự khởi động lại dịch vụ</string>
+    <string name="onthego_channel_name">Điều khiển chính</string>
+    <string name="global_action_onthego">Trên đường đi</string>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Ưu tiên</string>
+    <string name="volume_ringer_alarms_only">Báo thức</string>
+    <string name="volume_ringer_dnd">Không làm phiền</string>
+    <string name="tristate_flashlight">Đèn pin</string>
+    <string name="tristate_flashlight_on">Bật đèn pin</string>
+    <string name="tristate_flashlight_off">Tắt đèn pin</string>
+    <string name="tristate_flashlight_blink">Đèn pin nhấp nháy</string>
+    <string name="tristate_brightness_bright">Độ sáng tối đa</string>
+    <string name="tristate_brightness_dark">Độ sáng tối thiểu</string>
+    <string name="tristate_brightness_auto">Độ sáng tự động</string>
+    <string name="tristate_rotation_auto">Tự động xoay</string>
+    <string name="tristate_rotation_0">Màn hình dọc</string>
+    <string name="tristate_rotation_90">Ngang (90°)</string>
+    <string name="tristate_rotation_270">Ngang (270°)</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">hôm nay dùng</string>
+    <string name="usage_data_weekly">đã dùng trong tuần</string>
+    <string name="usage_data_default_suffix">Dữ liệu</string>
+    <string name="usage_wifi_default_suffix">Wifi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Buộc dừng?</string>
+    <string name="force_stop_dlg_text">Nếu buộc dừng thì ứng dụng có thể hoạt động sai.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Ống kính</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Âm thanh</string>
+    <string name="quick_settings_sound_ring">Chuông</string>
+    <string name="quick_settings_sound_vibrate">Rung</string>
+    <string name="quick_settings_sound_silent">Im lặng</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Thông tin CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Thông tin 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">La bàn</string>
+    <string name="quick_settings_compass_value"><xliff:g id="độ">%1$.0f</xliff:g>\u00b0 <xliff:g id="hướng">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Đang khởi tạo\u2026</string>
+    <string name="quick_settings_compass_N">Bắc</string>
+    <string name="quick_settings_compass_NE">Đông Bắc</string>
+    <string name="quick_settings_compass_E">Đông</string>
+    <string name="quick_settings_compass_SE">Đông Nam</string>
+    <string name="quick_settings_compass_S">Nam</string>
+    <string name="quick_settings_compass_SW">Tây Nam</string>
+    <string name="quick_settings_compass_W">Tây</string>
+    <string name="quick_settings_compass_NW">Tây Bắc</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Chuyển SIM dữ liệu</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Bảng điều chỉnh âm lượng</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Điểm ảnh thông minh</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Tự động bật điểm ảnh thông minh</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Lỗi khi tải dữ liệu thời tiết</string>
+    <string name="omnijaws_service_unknown">Không có dữ liệu thời tiết</string>
+    <string name="omnijaws_label_default">Thời tiết</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Tốc độ làm mới</string>
+    <string name="auto_mode_label">Tự động</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Nhấn giữ - vùng đã chọn</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Ngôn ngữ</string>
+    <string name="quick_settings_locale_more_locales_toast">Vui lòng thiết lập nhiều ngôn ngữ để kích hoạt chức năng chuyển đổi</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Trợ lý trí tuệ nhân tạo</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Mạng ưa thích</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">Không hỗ trợ</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Đang nhận diện khuôn mặt...</string>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Độ mạnh của đèn pin</string>
+    <string name="flashlight_strength_turn_off">Tắt</string>
+    <string name="flashlight_strength_turn_on">Bật</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 thiết bị được kết nối</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Bật 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Xóa</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Đã xóa ghi màn hình</string>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/cr_strings.xml b/packages/SystemUI/res/values-zh-rCN/cr_strings.xml
new file mode 100644
index 0000000000000..84c9da5038222
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rCN/cr_strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">高清通话 (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi 通话 (VoWiFi)</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">数据已停用图标</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G 图标</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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> • Dash 闪充中 (还需 <xliff:g id="charging_time_left">%1$s</xliff:g>充满)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • 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> • 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> • 快速充电中 (<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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">优先级</string>
+    <string name="volume_ringer_alarms_only">闹钟</string>
+    <string name="volume_ringer_dnd">勿扰</string>
+    <string name="tristate_flashlight">手电筒</string>
+    <string name="tristate_flashlight_on">手电筒开启</string>
+    <string name="tristate_flashlight_off">手电筒关闭</string>
+    <string name="tristate_flashlight_blink">闪光灯</string>
+    <string name="tristate_brightness_bright">最大亮度</string>
+    <string name="tristate_brightness_dark">最小亮度</string>
+    <string name="tristate_brightness_auto">自动亮度</string>
+    <string name="tristate_rotation_auto">自动旋转</string>
+    <string name="tristate_rotation_0">纵向</string>
+    <string name="tristate_rotation_90">横向 (90°)</string>
+    <string name="tristate_rotation_270">横向 (270°)</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">铃声</string>
+    <string name="quick_settings_sound_vibrate">振动</string>
+    <string name="quick_settings_sound_silent">静音</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU 信息</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">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">指南针</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>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">智能像素</string>
+    <string name="quick_settings_smart_pixels_on_power_save">自动启用智能像素</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="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">AI 助手</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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">手电筒强度</string>
+    <string name="flashlight_strength_turn_off">关闭</string>
+    <string name="flashlight_strength_turn_on">开启</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 台设备</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>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/cr_strings.xml b/packages/SystemUI/res/values-zh-rTW/cr_strings.xml
new file mode 100644
index 0000000000000..1325f2521d9b7
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rTW/cr_strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     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>
+    <!-- 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>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">關閉行動網路的圖示</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G 圖示</string>
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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> • Dash 快速充電中 (<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> • 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> • 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>
+    <!-- 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>
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">優先</string>
+    <string name="volume_ringer_alarms_only">鬧鐘</string>
+    <string name="volume_ringer_dnd">請勿打擾</string>
+    <string name="tristate_flashlight">手電筒</string>
+    <string name="tristate_flashlight_on">手電筒已開啟</string>
+    <string name="tristate_flashlight_off">手電筒已關閉</string>
+    <string name="tristate_flashlight_blink">手電筒閃爍</string>
+    <string name="tristate_brightness_bright">最大亮度</string>
+    <string name="tristate_brightness_dark">最低亮度</string>
+    <string name="tristate_brightness_auto">自動調整亮度</string>
+    <string name="tristate_rotation_auto">自動旋轉</string>
+    <string name="tristate_rotation_0">縱向顯示</string>
+    <string name="tristate_rotation_90">橫向 (90°)</string>
+    <string name="tristate_rotation_270">橫向 (270°)</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">鈴聲</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">切換上網 SIM 卡</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">音量面板</string>
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">智慧像素</string>
+    <string name="quick_settings_smart_pixels_on_power_save">自動啟用智慧像素</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="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">AI 助理</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>
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">手電筒強度</string>
+    <string name="flashlight_strength_turn_off">關閉</string>
+    <string name="flashlight_strength_turn_on">開啟</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 台裝置</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>
+</resources>
diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index f918477d575bc..381dc02c91103 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -129,4 +129,10 @@
     <string name="screenrecord_skip_time_summary">Remove the 3 second wait</string>
     <string name="screenrecord_hevc_switch_label">HEVC encoding</string>
     <string name="screenrecord_hevc_switch_summary">Use the more efficient HEVC encoder</string>
+
+    <!-- Screen pinning dialog description. (for devices without navbar) -->
+    <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch &amp; hold Back to unpin.</string>
+
+    <!-- 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>
 </resources>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 1b087d9134cbe..31263047cfbef 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 -->
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 142de300aa223..92e85047ce687 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,smartpixels,weather,refresh_rate,screenshot,locale,dns,preferred_network
     </string>
 
     <!-- The tiles to display in QuickSettings -->
diff --git a/packages/SystemUI/res/values/cr_arrays.xml b/packages/SystemUI/res/values/cr_arrays.xml
new file mode 100644
index 0000000000000..ea2080c3df2b2
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_arrays.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     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/cr_attrs.xml b/packages/SystemUI/res/values/cr_attrs.xml
new file mode 100644
index 0000000000000..418d200cd2af7
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_attrs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+</resources>
diff --git a/packages/SystemUI/res/values/cr_colors.xml b/packages/SystemUI/res/values/cr_colors.xml
new file mode 100644
index 0000000000000..52cab3a9784c0
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- Notification counter -->
+    <color name="notification_number_text_color">#ff000000</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_100</color>
+</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..dd952dc8dc209
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_config.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 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>
+
+    <!-- Update battery info every second when device is charging -->
+    <bool name="config_alternateFastchargeInfoUpdate">false</bool>
+
+    <!-- On-The-Go -->
+    <integer name="quick_settings_onthego_dialog_short_timeout">3000</integer>
+    <integer name="quick_settings_onthego_dialog_long_timeout">6000</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>
+
+    <!-- Whether to disable Smart Pixels on UDFPS -->
+    <bool name="config_disableSmartPixelsOnUDFPS">false</bool>
+
+    <!-- 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>
+
+    <!-- Show 5G toggle in internet dialog when available -->
+    <bool name="config_supportsVONR">true</bool>
+</resources>
diff --git a/packages/SystemUI/res/values/cr_dimens.xml b/packages/SystemUI/res/values/cr_dimens.xml
new file mode 100644
index 0000000000000..08541a24ac0c0
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_dimens.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<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>
+
+    <!-- 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>
+
+    <!-- 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>
+
+    <!-- The height of the WiFi toggle layout in Internet panel -->
+    <dimen name="internet_dialog_wifi_toggle_height">56dp</dimen>
+</resources>
diff --git a/packages/SystemUI/res/values/cr_strings.xml b/packages/SystemUI/res/values/cr_strings.xml
new file mode 100644
index 0000000000000..8ecea4d955f5e
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_strings.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     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 -->
+    <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>
+
+    <!-- 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>
+
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+
+    <!-- Status bar network traffic monitor strings -->
+    <string name="kilobitspersecond_short">kb/s</string>
+    <string name="megabitspersecond_short">Mb/s</string>
+    <string name="gigabitspersecond_short">Gb/s</string>
+    <string name="kilobytespersecond_short">kB/s</string>
+    <string name="megabytespersecond_short">MB/s</string>
+    <string name="gigabytespersecond_short">GB/s</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>
+
+    <!-- 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>
+
+    <!-- Alert slide extras -->
+    <string name="volume_ringer_priority_only">Priority</string>
+    <string name="volume_ringer_alarms_only">Alarms</string>
+    <string name="volume_ringer_dnd">DnD</string>
+    <string name="tristate_flashlight">Torch</string>
+    <string name="tristate_flashlight_on">Torch on</string>
+    <string name="tristate_flashlight_off">Torch off</string>
+    <string name="tristate_flashlight_blink">Torch blink</string>
+    <string name="tristate_brightness_bright">Max-brightness</string>
+    <string name="tristate_brightness_dark">Min-brightness</string>
+    <string name="tristate_brightness_auto">Auto-brightness</string>
+    <string name="tristate_rotation_auto">Auto-rotate</string>
+    <string name="tristate_rotation_0">Portrait</string>
+    <string name="tristate_rotation_90">Landscape (90°)</string>
+    <string name="tristate_rotation_270">Landscape (270°)</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>
+
+    <!-- Smart Pixels QS Tile -->
+    <string name="quick_settings_smart_pixels">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on_power_save">Auto-enabled Smart Pixels</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="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>
+
+    <!-- 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>
+
+    <!-- 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>
+</resources>
diff --git a/packages/SystemUI/res/values/cr_styles.xml b/packages/SystemUI/res/values/cr_styles.xml
new file mode 100644
index 0000000000000..f999a145ba7be
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- 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/cr_symbols.xml b/packages/SystemUI/res/values/cr_symbols.xml
new file mode 100644
index 0000000000000..ecf4ef8141395
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_symbols.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2025 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<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/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index b5fb651f7a36b..f5a62030df6f6 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -373,7 +373,7 @@
     <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>
@@ -447,9 +447,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>
 
@@ -898,9 +898,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>
 
@@ -973,7 +973,7 @@
     <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. -->
@@ -1110,7 +1110,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>
@@ -1282,6 +1282,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>
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/styles.xml b/packages/SystemUI/res/values/styles.xml
index 4eb881d9cad2b..7f9845be656b3 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -1710,13 +1710,13 @@
     <style name="TextAppearance.MagnificationSetting" />
 
     <style name="TextAppearance.MagnificationSetting.Title">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textColor">?androidprv:attr/textColorPrimary</item>
         <item name="android:textSize">@dimen/magnification_setting_text_size</item>
     </style>
 
     <style name="TextAppearance.MagnificationSetting.EditButton">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textColor">?androidprv:attr/colorAccent</item>
         <item name="android:textSize">@dimen/magnification_setting_text_size</item>
         <item name="android:lineHeight">@dimen/magnification_setting_button_line_height</item>
@@ -1724,7 +1724,7 @@
     </style>
 
     <style name="TextAppearance.MagnificationSetting.DoneButton">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textColor">?androidprv:attr/textColorPrimary</item>
         <item name="android:textSize">@dimen/magnification_setting_text_size</item>
         <item name="android:lineHeight">@dimen/magnification_setting_button_line_height</item>
diff --git a/packages/SystemUI/res/xml/status_bar_prefs.xml b/packages/SystemUI/res/xml/status_bar_prefs.xml
index 0c6a850b7fe99..d04295df6e177 100644
--- a/packages/SystemUI/res/xml/status_bar_prefs.xml
+++ b/packages/SystemUI/res/xml/status_bar_prefs.xml
@@ -57,12 +57,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 +97,50 @@
         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_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
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java
index f97ed834cfd39..b3c833dfb8c92 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java
@@ -335,12 +335,6 @@ private ClassLoader getParentClassLoader(ClassLoader baseClassLoader) {
         /** Returns class loader specific for the given plugin. */
         private ClassLoader getClassLoader(ApplicationInfo appInfo,
                 ClassLoader baseClassLoader) {
-            if (!mIsDebug && !isPluginPackagePrivileged(appInfo.packageName)) {
-                Log.w(TAG, "Cannot get class loader for non-privileged plugin. Src:"
-                        + appInfo.sourceDir + ", pkg: " + appInfo.packageName);
-                return null;
-            }
-
             List<String> zipPaths = new ArrayList<>();
             List<String> libPaths = new ArrayList<>();
             LoadedApk.makePaths(null, true, appInfo, zipPaths, libPaths);
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
index 9a264c6ca4144..6f77ec5a20327 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
@@ -49,6 +49,7 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage
 
     private static final String TAG = PluginManagerImpl.class.getSimpleName();
     static final String DISABLE_PLUGIN = "com.android.systemui.action.DISABLE_PLUGIN";
+    private static final String CLOCK_PLUGINS_PREFIX = "com.android.systemui.clocks";
 
     private final ArrayMap<PluginListener<?>, PluginActionManager<?>> mPluginMap
             = new ArrayMap<>();
@@ -70,7 +71,7 @@ public PluginManagerImpl(Context context,
             List<String> privilegedPlugins) {
         mContext = context;
         mActionManagerFactory = actionManagerFactory;
-        mIsDebuggable = debuggable;
+        mIsDebuggable = true; // Set to true to allow clock plugins on user builds
         mPrivilegedPlugins.addAll(privilegedPlugins);
         mPluginPrefs = pluginPrefs;
         mPluginEnabler = pluginEnabler;
@@ -239,10 +240,12 @@ private boolean isPluginPrivileged(ComponentName pluginName) {
         for (String componentNameOrPackage : mPrivilegedPlugins) {
             ComponentName componentName = ComponentName.unflattenFromString(componentNameOrPackage);
             if (componentName != null) {
-                if (componentName.equals(pluginName)) {
+                if (componentName.equals(pluginName) 
+                    || componentName.getPackageName().startsWith(CLOCK_PLUGINS_PREFIX)) {
                     return true;
                 }
-            } else if (componentNameOrPackage.equals(pluginName.getPackageName())) {
+            } else if (componentNameOrPackage.equals(pluginName.getPackageName())
+                || componentNameOrPackage.startsWith(CLOCK_PLUGINS_PREFIX)) {
                 return true;
             }
         }
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 0cb9272af53b6..d3be251fbfd8c 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
@@ -35,14 +35,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;
@@ -121,6 +124,7 @@ public class RotationButtonController {
     private boolean mSkipOverrideUserLockPrefsOnce;
     private final int mLightIconColor;
     private final int mDarkIconColor;
+    private boolean mButtonEnabled = true;
 
     @DrawableRes
     private final int mIconCcwStart0ResId;
@@ -195,6 +199,21 @@ public RotationButtonController(Context context,
         mWindowRotationProvider = windowRotationProvider;
 
         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,
@@ -443,7 +462,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/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 756958aee20ab..f96f131a8e756 100644
--- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
+++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
@@ -463,9 +463,11 @@ constructor(
         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
                 }
             )
@@ -595,6 +597,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) }
@@ -623,7 +629,7 @@ constructor(
             keyguardTransitionInteractor
                 .transition(Edge.create(to = LOCKSCREEN))
                 .filter { it.transitionState == TransitionState.STARTED }
-                .filter { it.from != AOD }
+                .filter { it.from != AOD && it.from != DOZING }
                 .collect { handleDoze(0f) }
         }
     }
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
index 641c5dd756336..58fceb002a149 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/KeyguardSimPukViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
index adede3dc058d0..ff868b6e04b76 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
@@ -247,7 +247,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..caf2874dfee7c 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
@@ -452,7 +452,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 6ae2b97a6eb21..55966560c0d8b 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -92,6 +92,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;
@@ -166,6 +168,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;
 
@@ -235,6 +238,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;
@@ -435,6 +441,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() {
@@ -2063,6 +2089,8 @@ protected void handleStartedWakingUp(@PowerManager.WakeReason int pmWakeReason)
             }
         }
         Trace.endSection();
+
+        ScrimUtils.get().onStartedWakingUp();
     }
 
     protected void handleStartedGoingToSleep(int arg1) {
@@ -2099,6 +2127,7 @@ protected void handleFinishedGoingToSleep(int arg1) {
     private void handleScreenTurnedOff() {
         Assert.isMainThread();
         mHardwareFingerprintUnavailableRetryCount = 0;
+        ScrimUtils.get().onScreenTurnedOff();
     }
 
     private void handleDreamingStateChanged(int dreamStart) {
@@ -2264,6 +2293,11 @@ protected KeyguardUpdateMonitor(
         mCommunalSceneInteractor = communalSceneInteractor;
         mKeyguardServiceShowLockscreenInteractor = keyguardServiceShowLockscreenInteractor;
 
+        mPocketManager = (PocketManager) context.getSystemService(Context.POCKET_SERVICE);
+        if (mPocketManager != null) {
+            mPocketManager.addCallback(mPocketCallback);
+        }
+
         mHandler = new Handler(mainLooper) {
             @Override
             public void handleMessage(Message msg) {
@@ -2368,6 +2402,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;
@@ -2409,7 +2446,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);
@@ -2670,6 +2708,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();
         }
     };
 
@@ -3052,7 +3091,7 @@ protected boolean shouldListenForFingerprint(boolean isUdfps) {
 
         boolean shouldListen = shouldListenKeyguardState && shouldListenUserState
                 && shouldListenBouncerState && shouldListenUdfpsState && !mBiometricPromptShowing
-                && shouldListenFpsState;
+                && shouldListenFpsState && !mIsDeviceInPocket;
         logListenerModelData(
                 new KeyguardFingerprintListenModel(
                     System.currentTimeMillis(),
@@ -3697,7 +3736,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;
         }
 
@@ -3706,6 +3753,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;
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
index 8a307145023d8..754b40c9a1e83 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
@@ -205,4 +205,6 @@ void registerCentralSurfaces(CentralSurfaces centralSurfaces,
             @Nullable ShadeExpansionStateManager shadeExpansionStateManager,
             BiometricUnlockController biometricUnlockController,
             View notificationContainer);
+
+    void setIsFromBiometric(boolean isFromBiometric);
 }
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..db2956a6b23cf 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -52,6 +52,7 @@
 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;
 
@@ -117,6 +118,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;
@@ -165,6 +167,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);
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/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
index e1aa0fc518756..cbd69218895b5 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
@@ -1206,7 +1212,12 @@ public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
                 }
             }
         }
-        mRoundedCornerResDelegate.dump(pw, args);
+        if (!DEBUG_DISABLE_SCREEN_DECORATIONS) {
+            mRoundedCornerResDelegate.dump(pw, args);
+        } else {
+            pw.println("  RoundedCornerResDelegate state:" +
+                       " skipped due to ScreenDecorations disabled");
+        }
         mDebugRoundedCornerDelegate.dump(pw);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
index 981732278acd7..ebbac85c4300c 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
@@ -498,4 +498,8 @@ public static void overrideNotificationAppName(Context context, Notification.Bui
     public WMComponent getWMComponent() {
         return mInitializer.getWMComponent();
     }
+
+    public SysUIComponent getSysUIComponent() {
+        return mSysUIComponent;
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
index 87e9784ddbc9f..f074cd29e12f2 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
@@ -23,10 +23,13 @@ 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
 import com.android.app.animation.Interpolators
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.keyguard.KeyguardUpdateMonitor
 import com.android.keyguard.KeyguardUpdateMonitorCallback
 import com.android.keyguard.logging.KeyguardLogger
@@ -42,7 +45,6 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockSource
 import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.plugins.statusbar.StatusBarStateController
 import com.android.systemui.res.R
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.statusbar.CircleReveal
 import com.android.systemui.statusbar.LiftReveal
 import com.android.systemui.statusbar.LightRevealEffect
@@ -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/UdfpsAnimation.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimation.java
new file mode 100644
index 0000000000000..b827a9268e9e7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimation.java
@@ -0,0 +1,278 @@
+/**
+ * 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 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.crdroid.udfps.animations";
+
+    private final KeyguardStateController mKeyguardStateController;
+    private final AuthController mAuthController;
+    private final FingerprintSensorPropertiesInternal mProps;
+
+    private boolean mAnimationAdded = false;
+
+    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();
+            }
+        }
+    };
+
+    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);
+
+        mAnimationSize = mContext.getResources().getDimensionPixelSize(R.dimen.udfps_animation_size);
+
+        mAnimParams.height = mAnimationSize;
+        mAnimParams.width = mAnimationSize;
+
+        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 addAnimation() {
+        if (!mAnimationAdded) {
+            IntentFilter filter = new IntentFilter(ACTION_USER_SWITCHED);
+            mContext.registerReceiverAsUser(mIntentReceiver, UserHandle.ALL, filter, null, null);
+
+            updateAnimationStyle();
+
+            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;
+        int animationOffset = (int) (mContext.getResources().getDimensionPixelSize(R.dimen.udfps_animation_offset) * scaleFactor);
+        mAnimParams.y = (int) (udfpsLocationY * scaleFactor) - (int) (udfpsRadius * scaleFactor)
+                        - (mAnimationSize / 2) + animationOffset;
+        if (DEBUG) {
+            Log.d(LOG_TAG, "updatePosition: displaySize=" + displaySize + 
+                           ", isFullResolution=" + isFullResolution + 
+                           ", udfpsLocation=" + udfpsLocation + 
+                           ", udfpsRadius=" + udfpsRadius + 
+                           ", scaleFactor=" + scaleFactor + 
+                           ", udfpsLocationY=" + udfpsLocationY + 
+                           ", animationOffset=" + animationOffset + 
+                           ", 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();
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
index 13094fc126297..b357929a69527 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.Preconditions.checkNotNull;
@@ -33,9 +34,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;
@@ -69,10 +72,12 @@
 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.systemui.Dumpable;
 import com.android.systemui.Flags;
 import com.android.systemui.animation.ActivityTransitionAnimator;
+import com.android.systemui.biometrics.AuthController;
 import com.android.systemui.biometrics.dagger.BiometricsBackground;
 import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor;
 import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
@@ -99,6 +104,7 @@
 import com.android.systemui.plugins.FalsingManager;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.power.domain.interactor.PowerInteractor;
+import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor;
 import com.android.systemui.shade.ShadeDisplayAware;
 import com.android.systemui.shade.domain.interactor.ShadeInteractor;
 import com.android.systemui.shared.system.SysUiStatsLog;
@@ -185,8 +191,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
     @NonNull private final AlternateBouncerInteractor mAlternateBouncerInteractor;
     @NonNull private final UdfpsOverlayInteractor mUdfpsOverlayInteractor;
     @NonNull private final PowerInteractor mPowerInteractor;
+    @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;
     private final boolean mIgnoreRefreshRate;
     private final KeyguardTransitionInteractor mKeyguardTransitionInteractor;
@@ -227,6 +235,14 @@ public class UdfpsController implements DozeReceiver, Dumpable {
     private boolean mAttemptedToDismissKeyguard;
     private final Set<Callback> mCallbacks = new HashSet<>();
 
+    private UdfpsAnimation mUdfpsAnimation;
+    private boolean mKeyguardCallbackRegistered = false;
+
+    private boolean mDisableSmartPixels;
+    private boolean mSmartPixelsFlag;
+    private boolean mSmartPixelsEnabled;
+    private boolean mSmartPixelsOnPowerSave;
+
     @VisibleForTesting
     public static final VibrationAttributes UDFPS_VIBRATION_ATTRIBUTES =
             new VibrationAttributes.Builder()
@@ -248,6 +264,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();
@@ -261,6 +280,56 @@ public void onScreenTurnedOff() {
         }
     };
 
+    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(
@@ -297,6 +366,7 @@ public void showUdfpsOverlay(long requestId, int sensorId, int reason,
                         mShadeInteractor,
                         mUdfpsOverlayInteractor,
                         mPowerInteractor,
+                        mBrightnessMirrorShowingInteractor,
                         mScope
                     )));
         }
@@ -695,8 +765,10 @@ public UdfpsController(@NonNull @Main Context context,
             Lazy<PromptUdfpsTouchOverlayViewModel> promptUdfpsTouchOverlayViewModel,
             @NonNull UdfpsOverlayInteractor udfpsOverlayInteractor,
             @NonNull PowerInteractor powerInteractor,
+            @NonNull BrightnessMirrorShowingInteractor brightnessMirrorShowingInteractor,
             @Application CoroutineScope scope,
-            UserActivityNotifier userActivityNotifier) {
+            UserActivityNotifier userActivityNotifier,
+            @NonNull AuthController authController) {
         mContext = context;
         mExecution = execution;
         mVibrator = vibrator;
@@ -725,13 +797,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;
@@ -739,6 +805,7 @@ public UdfpsController(@NonNull @Main Context context,
         mAlternateBouncerInteractor = alternateBouncerInteractor;
         mUdfpsOverlayInteractor = udfpsOverlayInteractor;
         mPowerInteractor = powerInteractor;
+        mBrightnessMirrorShowingInteractor = brightnessMirrorShowingInteractor;
         mScope = scope;
         mInputManager = inputManager;
         mSelectedUserInteractor = selectedUserInteractor;
@@ -752,6 +819,8 @@ public UdfpsController(@NonNull @Main Context context,
 
         mDumpManager.registerDumpable(TAG, this);
 
+        mAuthController = authController;
+
         mOrientationListener = new BiometricDisplayListener(
                 context,
                 displayManager,
@@ -775,6 +844,66 @@ public UdfpsController(@NonNull @Main Context context,
 
         udfpsHapticsSimulator.setUdfpsController(this);
         udfpsShell.setUdfpsOverlayController(mUdfpsOverlayController);
+
+        mDisableSmartPixels = mContext.getResources().getBoolean(com.android.systemui.res.R.bool.config_disableSmartPixelsOnUDFPS);
+
+        if (com.android.internal.util.crdroid.Utils.isPackageInstalled(mContext,
+                "com.crdroid.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.System.getIntForUser(
+                    mContext.getContentResolver(), Settings.System.SMART_PIXELS_ENABLE,
+                    0, mContext.getUserId()) != 0;
+            Log.i(TAG, "SmartPixels: SmartPixels enabled - " + mSmartPixelsEnabled);
+            mSmartPixelsOnPowerSave = Settings.System.getIntForUser(
+                    mContext.getContentResolver(), Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                    0, mContext.getUserId()) != 0;
+            Log.i(TAG, "SmartPixels: SmartPixels on Power Save enabled - " + mSmartPixelsOnPowerSave);
+        }
+    }
+
+    private void disableSmartPixels() {
+        Log.i(TAG, "SmartPixels: Disable SmartPixels");
+        if (mSmartPixelsEnabled) {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ENABLE,
+                    0, mContext.getUserId());
+        }
+        if (mSmartPixelsOnPowerSave) {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                    0, mContext.getUserId());
+        }
+    }
+
+    private void enableSmartPixels() {
+        Log.i(TAG, "SmartPixels: Enable SmartPixels");
+        if (mSmartPixelsEnabled) {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ENABLE,
+                    1, mContext.getUserId());
+        }
+        if (mSmartPixelsOnPowerSave) {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                    1, mContext.getUserId());
+        }
     }
 
     /**
@@ -795,6 +924,17 @@ public void playStartHaptic() {
         }
     }
 
+    @Nullable
+    private FingerprintSensorPropertiesInternal findFirstUdfps() {
+        for (FingerprintSensorPropertiesInternal props :
+                mFingerprintManager.getSensorPropertiesInternal()) {
+            if (props.isAnyUdfpsType()) {
+                return props;
+            }
+        }
+        return null;
+    }
+
     @Override
     public void dozeTimeTick() {
 
@@ -818,6 +958,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"
@@ -836,6 +981,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() {
@@ -849,11 +999,17 @@ private void hideUdfpsOverlay() {
             }
             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();
     }
@@ -934,7 +1090,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;
     }
 
@@ -1043,6 +1199,12 @@ private void onFingerDown(
                     + " current: " + mOverlay.getRequestId());
             return;
         }
+        if (mDisableSmartPixels) {
+            if (!mSmartPixelsFlag && (mSmartPixelsEnabled || mSmartPixelsOnPowerSave)) {
+                disableSmartPixels();
+            }
+            mSmartPixelsFlag = true;
+        }
         if (isOptical()) {
             mLatencyTracker.onActionStart(ACTION_UDFPS_ILLUMINATE);
         }
@@ -1079,6 +1241,7 @@ private void onFingerDown(
                 cb.onFingerDown();
             }
         }
+        showUdfpsAnimation();
     }
 
     private void onFingerUp(long requestId, @NonNull View view) {
@@ -1111,6 +1274,14 @@ private void onFingerUp(
         mExecution.assertIsMainThread();
         mActivePointerId = MotionEvent.INVALID_POINTER_ID;
         mAcquiredReceived = false;
+
+        if (mDisableSmartPixels) {
+            if (mSmartPixelsFlag && (mSmartPixelsEnabled || mSmartPixelsOnPowerSave)) {
+                enableSmartPixels();
+            }
+            mSmartPixelsFlag = false;
+        }
+
         if (mOnFingerDown) {
             mFingerprintManager.onPointerUp(requestId, mSensorProps.sensorId, pointerId, x,
                     y, minor, major, orientation, time, gestureStart, isAod);
@@ -1119,12 +1290,29 @@ private void onFingerUp(
                     cb.onFingerUp();
                 }
             }
+            hideUdfpsAnimation();
         }
         mOnFingerDown = false;
         unconfigureDisplay(view);
         cancelAodSendFingerUpAction();
     }
 
+    public boolean isAnimationEnabled() {
+        return mUdfpsAnimation != null && mUdfpsAnimation.isAnimationEnabled();
+    }
+
+    private void showUdfpsAnimation() {
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.show();
+        }
+    }
+
+    private void hideUdfpsAnimation() {
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.hide();
+        }
+    }
+
     /**
      * Callback for fingerUp and fingerDown events.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
index 0ec0a91eb328c..c3eef1f06aa65 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
@@ -52,6 +52,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac
 import com.android.systemui.keyguard.shared.model.KeyguardState
 import com.android.systemui.power.domain.interactor.PowerInteractor
 import com.android.systemui.res.R
+import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor
 import com.android.systemui.shade.domain.interactor.ShadeInteractor
 import com.android.systemui.statusbar.policy.KeyguardStateController
 import dagger.Lazy
@@ -88,6 +89,7 @@ constructor(
     private val shadeInteractor: ShadeInteractor,
     private val udfpsOverlayInteractor: UdfpsOverlayInteractor,
     private val powerInteractor: PowerInteractor,
+    private val brightnessMirrorShowingInteractor: BrightnessMirrorShowingInteractor,
     @Application private val scope: CoroutineScope,
 ) {
     private val currentStateUpdatedToOffAodOrDozing: Flow<Unit> =
@@ -119,7 +121,8 @@ constructor(
     )
 
     private val udfpsHelper: UdfpsHelper? = if (useFrameworkDimming) {
-        UdfpsHelper(context, windowManager, shadeInteractor, requestReason)
+        UdfpsHelper(context, windowManager, shadeInteractor, requestReason,
+                brightnessMirrorShowingInteractor)
     } else {
         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..38217da37cb60
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsFpIconDrawable.kt
@@ -0,0 +1,37 @@
+/*
+ * 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
+
+/**
+ * Draws udfps fingerprint if sensor isn't illuminating.
+ */
+class UdfpsFpIconDrawable(context: Context) : UdfpsIconDrawable(context) {
+    override fun draw(canvas: Canvas) {
+        val udfpsDrawable = getUdfpsDrawable()
+        udfpsDrawable?.apply {
+            setBounds(bounds)
+            draw(canvas)
+        }
+    }
+
+    override fun getOpacity(): Int {
+        return PixelFormat.TRANSLUCENT
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt
index d16db5e8cbfe4..cd44c14db3de0 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt
@@ -1,17 +1,6 @@
 /*
- * 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.
+ * SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.systemui.biometrics
@@ -32,6 +21,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.systemui.lifecycle.repeatWhenAttached
+import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor
 import com.android.systemui.shade.domain.interactor.ShadeInteractor
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -49,6 +39,7 @@ class UdfpsHelper(
     private val windowManager: WindowManager,
     private val shadeInteractor: ShadeInteractor,
     @RequestReason val requestReason: Int,
+    private val brightnessMirrorShowingInteractor: BrightnessMirrorShowingInteractor,
     private var view: View = View(context).apply {
         setBackgroundColor(Color.BLACK)
         visibility = View.GONE
@@ -56,7 +47,6 @@ class UdfpsHelper(
 ) {
     private val displayManager = context.getSystemService(DisplayManager::class.java)!!
     private val isKeyguard = requestReason == REASON_AUTH_KEYGUARD
-    private var newIsQsExpanded = false
 
     private val currentBrightness: Float get() =
         displayManager.getBrightness(Display.DEFAULT_DISPLAY)
@@ -165,16 +155,23 @@ class UdfpsHelper(
     fun addDimLayer() {
         brightnessToAlpha()
         windowManager.addView(view, dimLayoutParams)
+        displayManager.registerDisplayListener(
+            displayListener,
+            null,
+            /* eventFlags */ 0,
+            DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_BRIGHTNESS,
+        )
     }
 
     fun removeDimLayer() {
         windowManager.removeView(view)
+        displayManager.unregisterDisplayListener(displayListener)
     }
 
     init {
         view.repeatWhenAttached {
             repeatOnLifecycle(Lifecycle.State.CREATED) {
-                listenForQsExpansion(this)
+                listenForBrightnessMirror(this)
 
                 if (isKeyguard) {
                     listenForShadeTouchability(this)
@@ -187,25 +184,10 @@ class UdfpsHelper(
         }
     }
 
-    // We don't have ways to get temporary brightness when operating the brightness slider.
-    // Therefore, the dim layer is hidden when the slider is expected to be utilized.
-    private suspend fun listenForQsExpansion(scope: CoroutineScope): Job {
+    private suspend fun listenForBrightnessMirror(scope: CoroutineScope): Job {
         return scope.launch {
-            shadeInteractor.qsExpansion.collect { qsExpansion ->
-                if (qsExpansion == 1f && !newIsQsExpanded) {
-                    newIsQsExpanded = true
-                    displayManager.registerDisplayListener(
-                        displayListener,
-                        null,
-                        /* eventFlags */ 0,
-                        DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_BRIGHTNESS,
-                    )
-                    view.isVisible = false
-                } else if (qsExpansion == 0f && newIsQsExpanded) {
-                    newIsQsExpanded = false
-                    displayManager.unregisterDisplayListener(displayListener)
-                    view.isVisible = true
-                }
+            brightnessMirrorShowingInteractor.isShowing.collect {
+                view.isVisible = !it
             }
         }
     }
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..859df5461db7f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsIconDrawable.java
@@ -0,0 +1,138 @@
+/*
+ * 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.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.ColorFilter;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+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.crdroid.Utils;
+import com.android.systemui.Dependency;
+import com.android.systemui.res.R;
+import com.android.systemui.tuner.TunerService;
+
+/**
+ * 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 UDFPS_ICON = "system:" + Settings.System.UDFPS_ICON;
+    private final String udfpsResourcesPackage = "com.crdroid.udfps.icons";
+
+    @NonNull private final Context mContext;
+    private Drawable mUdfpsDrawable;
+    private Resources udfpsRes;
+    private String[] mUdfpsIcons;
+
+    private final TunerService.Tunable mTunable = (key, newValue) -> {
+        if (UDFPS_ICON.equals(key)) {
+            int selectedIcon = newValue == null ? 0 : Integer.parseInt(newValue);
+            if (mUdfpsDrawable != null) {
+                mUdfpsDrawable.setCallback(null);  // Clear previous drawable callback to avoid leaks
+                mUdfpsDrawable = null;
+            }
+            mUdfpsDrawable = selectedIcon == 0 ? null : loadDrawable(udfpsRes, mUdfpsIcons[selectedIcon]);
+        }
+    };
+
+    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);
+                Dependency.get(TunerService.class).addTunable(mTunable, UDFPS_ICON);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.e("UdfpsIconDrawable", "UDFPS package not found", e);
+            }
+        }
+    }
+
+    public void destroy() {
+        Dependency.get(TunerService.class).removeTunable(mTunable);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        if (mUdfpsDrawable != null) {
+            mUdfpsDrawable.setAlpha(alpha);
+        }
+        invalidateSelf();
+    }
+
+    Drawable getUdfpsDrawable() {
+        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) {
+        if (mUdfpsDrawable != null) {
+            mUdfpsDrawable.setBounds(left , top, right, bottom);
+        }
+        invalidateSelf();
+    }
+
+    @Override
+    public void setBounds(Rect bounds) {
+        if (mUdfpsDrawable != null) {
+            mUdfpsDrawable.setBounds(bounds);
+        }
+        invalidateSelf();
+    }
+
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        if (mUdfpsDrawable != null) {
+            mUdfpsDrawable.setBounds(bounds);
+        }
+        invalidateSelf();
+    }
+
+    @Override
+    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+        // Do not set color filter
+    }
+
+    @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 d2b7180e40fa7..baf9bd87a2b8f 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
@@ -36,6 +37,7 @@ import androidx.constraintlayout.widget.ConstraintSet
 import androidx.constraintlayout.widget.Guideline
 import androidx.core.animation.addListener
 import androidx.core.view.doOnLayout
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import com.android.app.tracing.coroutines.launchTraced as launch
 import com.android.systemui.biometrics.Utils
@@ -50,6 +52,7 @@ import com.android.systemui.biometrics.ui.viewmodel.isTop
 import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.res.R
 import com.android.systemui.util.kotlin.Quad
+import com.android.systemui.util.kotlin.Quint
 import com.android.systemui.utils.windowmanager.WindowManagerUtils
 import kotlin.math.abs
 import kotlinx.coroutines.flow.combine
@@ -90,6 +93,7 @@ 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 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)
@@ -272,6 +276,98 @@ object BiometricViewSizeBinder {
                 }
 
                 lifecycleScope.launch {
+                        combine(
+                            viewModel.isUdfpsIndicating,
+                            viewModel.position,
+                            viewModel.iconPosition,
+                            viewModel.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
+                                        // 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
+                                                )
+                                                connect(
+                                                    R.id.indicator,
+                                                    ConstraintSet.BOTTOM,
+                                                    R.id.biometric_icon,
+                                                    ConstraintSet.TOP
+                                                )
+                                                setMargin(
+                                                    R.id.indicator,
+                                                    ConstraintSet.BOTTOM,
+                                                    indicatorMarginTop
+                                                )
+                                            }
+                                            indicatorView
+                                                .updateLayoutParams<ConstraintLayout.LayoutParams> {
+                                                    topToBottom =
+                                                        ConstraintLayout.LayoutParams.UNSET
+                                                    bottomToTop = R.id.biometric_icon
+                                                    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.iconSize.collect { iconSize ->
                         iconHolderView.layoutParams.width = iconSize.first
                         iconHolderView.layoutParams.height = iconSize.second
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 f449a55b420ff..c72ba74d337ab 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
@@ -435,10 +435,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
@@ -709,6 +706,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
 
@@ -886,11 +908,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/brightness/ui/compose/BrightnessSlider.kt b/packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt
index 4762630f3558c..b81e4e79e8f92 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
@@ -91,6 +92,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.text
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
@@ -145,6 +147,19 @@ fun BrightnessSlider(
     showToast: () -> Unit = {},
     hapticsViewModelFactory: SliderHapticsViewModel.Factory,
 ) {
+    val context = LocalContext.current
+    val cr = context.contentResolver
+
+    var hapticsEnabled by remember { mutableStateOf(readEnableHaptics(cr)) }
+
+    val shapeMode = rememberSliderShapeMode()
+    val trackCornerDp: Dp = when (shapeMode) {
+        1 -> 24.dp  /* Circle */
+        2 -> 12.dp  /* Rounded Square */
+        3 -> 0.dp /* Square */
+        else -> Dimensions.SliderTrackRoundedCorner
+    }
+
     var value by remember(gammaValue) { mutableIntStateOf(gammaValue) }
     val animatedValue by
         animateFloatAsState(targetValue = value.toFloat(), label = "BrightnessSliderAnimatedValue")
@@ -153,17 +168,21 @@ 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 colors = colors()
 
@@ -178,7 +197,6 @@ fun BrightnessSlider(
                 iconResProvider(percentage)
             }
         }
-    val context = LocalContext.current
     val painter: Painter by
         produceState<Painter>(
             initialValue = ColorPainter(Color.Transparent),
@@ -213,7 +231,6 @@ fun BrightnessSlider(
         }
     }
 
-    val cr = context.contentResolver
     val hasAutoBrightness = context.resources.getBoolean(
         com.android.internal.R.bool.config_automatic_brightness_available
     )
@@ -224,6 +241,7 @@ fun BrightnessSlider(
             override fun onChange(selfChange: Boolean) {
                 context.mainExecutor.execute {
                     showAutoBrightness = readShowAutoBrightness(cr)
+                    hapticsEnabled = readEnableHaptics(cr)
                 }
             }
         }
@@ -233,6 +251,11 @@ fun BrightnessSlider(
             false, observer, UserHandle.USER_ALL
         )
 
+        cr.registerContentObserver(
+            LineageSettings.Secure.getUriFor(Settings.System.QS_BRIGHTNESS_SLIDER_HAPTIC),
+            false, observer, UserHandle.USER_ALL
+        )
+
         onDispose {
             cr.unregisterContentObserver(observer)
         }
@@ -250,7 +273,7 @@ fun BrightnessSlider(
             onValueChange = {
                 if (enabled) {
                     if (!overriddenByAppState) {
-                        hapticsViewModel.onValueChange(it)
+                        hapticsViewModel?.onValueChange(it)
                         value = it.toInt()
                         onDrag(value)
                     }
@@ -259,7 +282,7 @@ fun BrightnessSlider(
             onValueChangeFinished = {
                 if (enabled) {
                     if (!overriddenByAppState) {
-                        hapticsViewModel.onValueChangeEnded()
+                        hapticsViewModel?.onValueChangeEnded()
                         onStop(value)
                     }
                 }
@@ -367,7 +390,7 @@ fun BrightnessSlider(
                                     )
                                 }
                             },
-                    trackCornerSize = SliderTrackRoundedCorner,
+                    trackCornerSize = trackCornerDp,
                     trackInsideCornerSize = 2.dp,
                     drawStopIndicator = null,
                     thumbTrackGapSize = ThumbTrackGapSize,
@@ -378,7 +401,11 @@ fun BrightnessSlider(
 
         if (hasAutoBrightness && showAutoBrightness) {
             Spacer(modifier = Modifier.width(10.dp))
-            drawAutoBrightnessButton(autoMode = autoMode, onIconClick = onIconClick)
+            drawAutoBrightnessButton(
+                autoMode = autoMode,
+                hapticsEnabled = hapticsEnabled,
+                onIconClick = onIconClick
+            )
         }
     }
 
@@ -394,11 +421,51 @@ fun BrightnessSlider(
     }
 }
 
-private fun Modifier.sliderBackground(color: Color) = drawWithCache {
+@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 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)
     }
@@ -414,9 +481,20 @@ private fun readShowAutoBrightness(cr: ContentResolver): Boolean =
         false
     }
 
+private fun readEnableHaptics(cr: ContentResolver): Boolean =
+    try {
+        Settings.Secure.getIntForUser(
+            cr, Settings.System.QS_BRIGHTNESS_SLIDER_HAPTIC,
+            1, UserHandle.USER_CURRENT
+        ) != 0
+    } catch (_: Throwable) {
+        false
+    }
+
 @Composable
 private fun drawAutoBrightnessButton(
     autoMode: Boolean,
+    hapticsEnabled: Boolean,
     onIconClick: suspend () -> Unit,
 ) {
     val view = LocalView.current
@@ -428,6 +506,13 @@ 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 backgroundColor by animateColorAsState(
         targetValue = if (autoMode) {
             MaterialTheme.colorScheme.primary
@@ -456,13 +541,15 @@ private fun drawAutoBrightnessButton(
     Box(
         modifier = Modifier
             .size(45.dp)
-            .clip(RoundedCornerShape(animatedCornerRadius))
+            .clip(autoIconShape)
             .background(backgroundColor)
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = null, // Disable ripple effect
                 onClick = {
-                    view.performHapticFeedback(hapticConstant)
+                    if (hapticsEnabled) {
+                        view.performHapticFeedback(hapticConstant)
+                    }
                     coroutineScope.launch { onIconClick() }
                 }
             ),
@@ -499,6 +586,20 @@ fun BrightnessSliderContainer(
 
     var dragging by remember { mutableStateOf(false) }
 
+    val shapeMode = rememberSliderShapeMode()
+    val trackCornerDp: Dp = when (shapeMode) {
+        1 -> 24.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
@@ -536,10 +637,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 (
diff --git a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
index 047d15daf6f80..96c65eedfe569 100644
--- a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
@@ -87,6 +87,7 @@ private void init(Context context, AttributeSet attrs, int transmittingBatteryLe
 
         // 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) {
             percentage.setText(NumberFormat.getPercentInstance().format(batteryLevel / 100f));
@@ -102,6 +103,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,9 +136,30 @@ 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. 
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/crdroid/batterybar/BatteryBar.java b/packages/SystemUI/src/com/android/systemui/crdroid/batterybar/BatteryBar.java
new file mode 100644
index 0000000000000..de44f51c1a41c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/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.crdroid.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/crdroid/batterybar/BatteryBarController.java b/packages/SystemUI/src/com/android/systemui/crdroid/batterybar/BatteryBarController.java
new file mode 100644
index 0000000000000..edde3dedcffce
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/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.crdroid.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/crdroid/batterybar/Prefs.java b/packages/SystemUI/src/com/android/systemui/crdroid/batterybar/Prefs.java
new file mode 100644
index 0000000000000..48fa4c5550e1e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/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.crdroid.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/crdroid/header/DaylightHeaderProvider.java b/packages/SystemUI/src/com/android/systemui/crdroid/header/DaylightHeaderProvider.java
new file mode 100644
index 0000000000000..5764a0368e479
--- /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.crdroid.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..a763557194c16
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/header/FileHeaderProvider.java
@@ -0,0 +1,138 @@
+/*
+ *  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.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.internal.util.crdroid.ImageHelper;
+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;
+
+    public FileHeaderProvider(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public String getName() {
+        return "file";
+    }
+
+    @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;
+
+        if (uri != null && uri.equals(Settings.System.getUriFor(
+                Settings.System.STATUS_BAR_FILE_HEADER_IMAGE))) {
+            String imageUri = Settings.System.getStringForUser(mContext.getContentResolver(),
+                    Settings.System.STATUS_BAR_FILE_HEADER_IMAGE,
+                    UserHandle.USER_CURRENT);
+            if (imageUri != null) {
+                saveHeaderImage(Uri.parse(imageUri));
+            }
+        }
+        if (mImage != null) {
+            mImage = null;
+        }
+        if (customHeader) {
+            loadHeaderImage();
+        }
+    }
+
+    @Override
+    public void enableProvider() {
+        settingsChanged(null);
+    }
+
+    @Override
+    public void disableProvider() {
+    }
+
+    private void saveHeaderImage(Uri imageUri) {
+        if (DEBUG) Log.i(TAG, "Save header image " + imageUri);
+
+        if (imageUri == null) {
+            Log.e(TAG, "Image URI is null");
+            return;
+        }
+
+        File file = new File(mContext.getFilesDir(), HEADER_FILE_NAME);
+        try (InputStream imageStream = mContext.getContentResolver().openInputStream(imageUri);
+             FileOutputStream output = new FileOutputStream(file)) {
+
+            if (imageStream == null) {
+                Log.e(TAG, "Unable to open input stream for URI: " + imageUri);
+                return;
+            }
+            byte[] buffer = new byte[8 * 1024];
+            int read;
+
+            while ((read = imageStream.read(buffer)) != -1) {
+                output.write(buffer, 0, read);
+            }
+            output.flush();
+            if (DEBUG) Log.i(TAG, "Saved header image " + file.getAbsolutePath());
+        } catch (IOException e) {
+            Log.e(TAG, "Save header image failed for URI: " + imageUri, e);
+        }
+    }
+
+    private void loadHeaderImage() {
+        File file = new File(mContext.getFilesDir(), HEADER_FILE_NAME);
+        if (file.exists()) {
+            if (DEBUG) Log.i(TAG, "Load header image");
+            Bitmap image = ImageHelper.getCompressedBitmap(file.getAbsolutePath());
+            if (image != null) {
+                mImage = new BitmapDrawable(mContext.getResources(), image);
+            }
+        }
+    }
+
+    @Override
+    public Drawable getCurrent(final Calendar now) {
+        return mImage;
+    }
+}
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..6918a343f6d3b
--- /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.crdroid.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/logo/LogoImage.java b/packages/SystemUI/src/com/android/systemui/crdroid/logo/LogoImage.java
new file mode 100644
index 0000000000000..7ab35e46a4283
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/logo/LogoImage.java
@@ -0,0 +1,241 @@
+/*
+ * 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.crdroid.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_crdroid_logo);
+                break;
+            case 1:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_android_logo);
+                break;
+            case 2:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_adidas);
+                break;
+            case 3:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_alien);
+                break;
+            case 4:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_apple_logo);
+                break;
+            case 5:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_avengers);
+                break;
+            case 6:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_batman);
+                break;
+            case 7:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_batman_tdk);
+                break;
+            case 8:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_beats);
+                break;
+            case 9:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_biohazard);
+                break;
+            case 10:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_blackberry);
+                break;
+            case 11:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_cannabis);
+                break;
+            case 12:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_emoticon_cool);
+                break;
+            case 13:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_emoticon_devil);
+                break;
+            case 14:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_fire);
+                break;
+            case 15:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_heart);
+                break;
+            case 16:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_nike);
+                break;
+            case 17:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_pac_man);
+                break;
+            case 18:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_puma);
+                break;
+            case 19:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_rog);
+                break;
+            case 20:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_spiderman);
+                break;
+            case 21:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_superman);
+                break;
+            case 22:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_windows);
+                break;
+            case 23:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_xbox);
+                break;
+            case 24:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ghost);
+                break;
+            case 25:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ninja);
+                break;
+            case 26:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_robot);
+                break;
+            case 27:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ironman);
+                break;
+            case 28:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_captain_america);
+                break;
+            case 29:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_flash);
+                break;
+            case 30:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_tux_logo);
+                break;
+            case 31:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ubuntu_logo);
+                break;
+            case 32:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_mint_logo);
+                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/crdroid/logo/LogoImageView.java b/packages/SystemUI/src/com/android/systemui/crdroid/logo/LogoImageView.java
new file mode 100644
index 0000000000000..49a5af1fdec39
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/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.crdroid.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/crdroid/logo/LogoImageViewRight.java b/packages/SystemUI/src/com/android/systemui/crdroid/logo/LogoImageViewRight.java
new file mode 100644
index 0000000000000..3b9f64b1a0133
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/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.crdroid.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/crdroid/onthego/OnTheGoDialog.java b/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoDialog.java
new file mode 100644
index 0000000000000..cf0759a351eec
--- /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.crdroid.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..282e207a6b7cc
--- /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.crdroid.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/dagger/DefaultBroadcastReceiverBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java
index 93f6a1bc8deab..33c9b42ec699b 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 dagger.Binds;
@@ -46,6 +47,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 876fab1037c4c..886e4bb8a6ca8 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
@@ -99,6 +99,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;
@@ -825,4 +826,10 @@ 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);
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
index b41c67057f9cd..b739a0d9365ca 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
@@ -24,10 +24,14 @@
 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.keyguard.KeyguardSliceProvider;
+import com.android.systemui.media.MediaViewController;
 import com.android.systemui.people.PeopleProvider;
+import com.android.systemui.pulse.PulseViewController;
 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;
@@ -197,4 +201,16 @@ interface Builder {
      * Member injection into the supplied argument.
      */
     void inject(PeopleProvider peopleProvider);
+
+    @SysUISingleton
+    NTForbiddenSwipeDownQSController forbiddenSwipeDownQSController();
+
+    @SysUISingleton
+    MediaViewController mediaViewController();
+
+    @SysUISingleton
+    PulseViewController pulseViewController();
+
+    @SysUISingleton
+    EdgeLightViewController edgeLightViewController();
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt
index 693b0ec828929..0b47d5a18937c 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt
@@ -52,6 +52,7 @@ import com.android.systemui.media.taptotransfer.sender.MediaTttSenderCoordinator
 import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherCoreStartable
 import com.android.systemui.settings.MultiUserUtilsModule
 import com.android.systemui.shortcut.ShortcutKeyDispatcher
+import com.android.systemui.smartpixels.SmartPixelsReceiver
 import com.android.systemui.statusbar.ImmersiveModeConfirmation
 import com.android.systemui.statusbar.gesture.GesturePointerEventListener
 import com.android.systemui.statusbar.notification.InstantAppNotifier
@@ -354,4 +355,10 @@ abstract class SystemUICoreStartableModule {
     abstract fun bindSysUIKeyGestureEventInitializer(
         keyGestureEventInitializer: SysUIKeyGestureEventInitializer
     ): CoreStartable
+
+    /** Inject into SmartPixelsReceiver.  */
+    @Binds
+    @IntoMap
+    @ClassKey(SmartPixelsReceiver::class)
+    abstract fun bindSmartPixelsReceiver(sysui: SmartPixelsReceiver): CoreStartable
 }
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 7c4477980d344..778cd5d6768cf 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
@@ -16,75 +16,398 @@
 
 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 com.android.systemui.development.ui.viewmodel.BuildNumberViewModel
-import com.android.systemui.lifecycle.rememberViewModel
+import androidx.compose.ui.text.AnnotatedString
+import com.android.settingslib.net.DataUsageController
 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: Any? = null,
     modifier: Modifier = Modifier,
     textColor: Color = MaterialTheme.colorScheme.onSurface,
 ) {
-    val viewModel = rememberViewModel(traceName = "BuildNumber") { viewModelFactory.create() }
-
-    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()
-                        }
+    val context = LocalContext.current
+    val haptics = LocalHapticFeedback.current
+
+    var usageText by remember { mutableStateOf<String?>(null) }
+    val subMgr = remember { SubscriptionManager.from(context) }
+    val duc = remember { DataUsageController(context) }
+    val cr = context.contentResolver
+
+    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()
                     }
-                    .basicMarquee(iterations = 1, initialDelayMillis = 2000)
-                    .minimumInteractiveComponentSize(),
-            color = textColor,
-            maxLines = 1,
+                }
+            }
+
+            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)
+                    }
+                    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 d4e48c34ccd94..f6fe080121ec6 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
@@ -236,7 +236,7 @@ constructor(
             )
 
     override fun setLockedOut(isLockedOut: Boolean) {
-        _isLockedOut.value = isLockedOut
+        _isLockedOut.value = false
     }
 
     private val faceLockoutResetCallback =
@@ -501,7 +501,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 82d73548a1bad..a49324133fc34 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.service.dreams.Flags.dreamsV2
 import com.android.keyguard.KeyguardUpdateMonitor
 import com.android.systemui.biometrics.data.repository.FacePropertyRepository
@@ -114,7 +116,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
@@ -351,7 +368,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
@@ -390,17 +407,10 @@ constructor(
     override val isBypassEnabled: StateFlow<Boolean> = repository.isBypassEnabled
 
     private fun runFaceAuth(uiEvent: FaceAuthUiEvent, fallbackToDetect: Boolean) {
-        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)
-        }
+        if (isDeviceInPocket) return
+        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/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index 2e372ff435c28..99242ae6a6739 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -76,7 +76,9 @@ public void onDestroy() {
             mPluginManager.removePluginListener(this);
         }
         super.onDestroy();
-        mDozeMachine.destroy();
+        if (mDozeMachine != null) {
+            mDozeMachine.destroy();
+        }
         mDozeMachine = null;
     }
 
@@ -97,7 +99,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();
@@ -107,7 +111,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/util/BurnInHelper.kt b/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt
index 9204017df6682..ddbc974e90a10 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..ad0163ae3e9aa
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightViewController.kt
@@ -0,0 +1,191 @@
+/*
+ * 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.SystemUIApplication
+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 {
+        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"
+        @JvmStatic
+        fun get(context: Context): EdgeLightViewController {
+            val app = context.applicationContext as SystemUIApplication
+            return app.sysUIComponent.edgeLightViewController()
+        }
+    }
+}
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 f68dfee34982d..c65dcde45be79 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;
@@ -71,6 +71,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;
@@ -152,6 +153,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.NotificationShadeWindowController;
 import com.android.systemui.topui.TopUiController;
 import com.android.systemui.statusbar.VibratorHelper;
@@ -177,6 +179,7 @@
 import org.lineageos.internal.util.PowerMenuUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executor;
 
@@ -211,6 +214,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 +306,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
@@ -435,7 +440,8 @@ public GlobalActionsDialogLite(
             GlobalActionsInteractor interactor,
             ControlsComponent controlsComponent,
             Lazy<DisplayWindowPropertiesRepository> displayWindowPropertiesRepository,
-            PowerManager powerManager) {
+            PowerManager powerManager,
+            BlurUtils blurUtils) {
         mContext = context;
         mWindowManagerFuncs = windowManagerFuncs;
         mAudioManager = audioManager;
@@ -476,6 +482,7 @@ public GlobalActionsDialogLite(
         mInteractor = interactor;
         mDisplayWindowPropertiesRepositoryLazy = displayWindowPropertiesRepository;
         mPowerManager = powerManager;
+        mBlurUtils = blurUtils;
 
         mHandler = new Handler(mMainHandler.getLooper()) {
             public void handleMessage(Message msg) {
@@ -619,13 +626,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,
@@ -721,13 +721,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);
         }
@@ -774,6 +778,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());
@@ -811,6 +821,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);
@@ -911,7 +923,8 @@ protected ActionsDialogLite createDialog(int displayId) {
                 mShadeController,
                 mKeyguardUpdateMonitor,
                 mLockPatternUtils,
-                mSelectedUserInteractor) {
+                mSelectedUserInteractor,
+                mBlurUtils) {
             @Override
             public boolean dispatchTouchEvent(MotionEvent event) {
                 rescheduleBurninTimeout(mGlobalActionDialogTimeout);
@@ -965,6 +978,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()
@@ -976,6 +994,22 @@ public void onConfigChanged(Configuration newConfig) {
         }
     }
 
+    private boolean rebootAction(boolean safeMode) {
+        return rebootAction(safeMode, null);
+    }
+
+    private boolean rebootAction(boolean safeMode, String reason) {
+        if (mKeyguardStateController.isMethodSecure() && mKeyguardStateController.isShowing()) {
+            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.
@@ -1031,7 +1065,7 @@ public boolean onLongPress() {
             }
             mUiEventLogger.log(GlobalActionsEvent.GA_SHUTDOWN_LONG_PRESS);
             if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
-                mWindowManagerFuncs.reboot(true, null);
+                rebootAction(true);
                 return true;
             }
             return false;
@@ -1056,7 +1090,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();
+            }
         }
     }
 
@@ -1181,7 +1221,7 @@ public boolean onLongPress() {
             }
             mUiEventLogger.log(GlobalActionsEvent.GA_REBOOT_LONG_PRESS);
             if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
-                mWindowManagerFuncs.reboot(true, null);
+                rebootAction(true);
                 return true;
             }
             return false;
@@ -1208,7 +1248,7 @@ public void onPress() {
             if (mDialog != null && shouldShowRestartSubmenu()) {
                 mDialog.showRestartOptionsMenu();
             } else {
-                mWindowManagerFuncs.reboot(false, null);
+                rebootAction(false);
             }
         }
     }
@@ -1222,7 +1262,7 @@ public RestartSystemAction() {
         @Override
         public boolean onLongPress() {
             if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
-                mWindowManagerFuncs.reboot(true, null);
+                rebootAction(true);
                 return true;
             }
             return false;
@@ -1240,7 +1280,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, null);
+            rebootAction(false);
         }
     }
 
@@ -1262,7 +1302,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_RECOVERY);
+            rebootAction(false, PowerManager.REBOOT_RECOVERY);
         }
     }
 
@@ -1284,7 +1324,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_BOOTLOADER);
+            rebootAction(false, PowerManager.REBOOT_BOOTLOADER);
         }
     }
 
@@ -1306,7 +1346,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_FASTBOOT);
+            rebootAction(false, PowerManager.REBOOT_FASTBOOT);
         }
     }
 
@@ -1328,7 +1368,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());
         }
     }
 
@@ -1615,6 +1680,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() {
@@ -2826,7 +2919,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 NotificationShadeWindowController mNotificationShadeWindowController;
@@ -2844,6 +2936,7 @@ static class ActionsDialogLite extends SystemUIDialog implements DialogInterface
         private SelectedUserInteractor mSelectedUserInteractor;
         private LockPatternUtils mLockPatternUtils;
         private float mWindowDimAmount;
+        private BlurUtils mBlurUtils;
 
         protected ViewGroup mContainer;
 
@@ -2928,7 +3021,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 */);
@@ -2953,13 +3047,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(
@@ -3025,13 +3118,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();
         }
 
@@ -3041,7 +3135,8 @@ protected void showPowerOverflowMenu() {
         }
 
         public void showUsersMenu() {
-            mUsersDialog = GlobalActionsPowerDialog.create(mContext, mUsersAdapter);
+            mUsersDialog = GlobalActionsPowerDialog.create(mContext,
+                    mUsersAdapter, mBlurUtils);
             mUsersDialog.show();
         }
 
@@ -3093,7 +3188,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/msdl/qs/TileHapticsViewModel.kt b/packages/SystemUI/src/com/android/systemui/haptics/msdl/qs/TileHapticsViewModel.kt
index 70a40d9337245..745ea3430bef7 100644
--- a/packages/SystemUI/src/com/android/systemui/haptics/msdl/qs/TileHapticsViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/haptics/msdl/qs/TileHapticsViewModel.kt
@@ -16,6 +16,8 @@
 
 package com.android.systemui.haptics.msdl.qs
 
+import android.os.VibrationAttributes
+import android.os.VibrationEffect
 import android.service.quicksettings.Tile
 import androidx.compose.runtime.Stable
 import com.android.systemui.Flags
@@ -23,6 +25,7 @@ import com.android.systemui.animation.Expandable
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.lifecycle.ExclusiveActivatable
 import com.android.systemui.qs.panels.ui.viewmodel.TileViewModel
+import com.android.systemui.statusbar.VibratorHelper
 import com.android.systemui.util.kotlin.pairwise
 import com.google.android.msdl.data.model.MSDLToken
 import com.google.android.msdl.domain.MSDLPlayer
@@ -44,6 +47,7 @@ class TileHapticsViewModel
 @AssistedInject
 constructor(
     private val msdlPlayer: MSDLPlayer,
+    private val vibratorHelper: VibratorHelper,
     @Assisted private val tileViewModel: TileViewModel,
 ) : ExclusiveActivatable() {
 
@@ -91,20 +95,72 @@ constructor(
     private val hapticsState: Flow<TileHapticsState> =
         merge(toggleHapticsState, interactionHapticsState)
 
+    private val vibrationAttrs =
+        VibrationAttributes.Builder()
+            .setUsage(VibrationAttributes.USAGE_TOUCH)
+            .setFlags(VibrationAttributes.FLAG_PIPELINED_EFFECT)
+            .build()
+
+    private val clickEffect = VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK)
+    private val heavyClick = VibrationEffect.createPredefined(VibrationEffect.EFFECT_HEAVY_CLICK)
+
+    private val areAllPrimitivesSupported by lazy {
+        vibratorHelper.areAllPrimitivesSupported(
+            VibrationEffect.Composition.PRIMITIVE_CLICK,
+            VibrationEffect.Composition.PRIMITIVE_THUD,
+        ) ?: false
+    }
+
+    private val composedHeavyClick by lazy {
+        VibrationEffect.startComposition()
+            .addPrimitive(VibrationEffect.Composition.PRIMITIVE_THUD, 1f)
+            .compose()
+    }
+
+    private val composedClick by lazy {
+        VibrationEffect.startComposition()
+            .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK)
+            .compose()
+    }
+
+    private fun vibrateToggle() = vibratorHelper.vibrate(composedClick, vibrationAttrs)
+
+    private fun vibrateLongPress() = vibratorHelper.vibrate(composedHeavyClick, vibrationAttrs)
+
     override suspend fun onActivated(): Nothing {
         try {
-            hapticsState.collect { hapticsState ->
-                val tokenToPlay: MSDLToken? =
-                    when (hapticsState) {
-                        TileHapticsState.TOGGLE_ON -> MSDLToken.SWITCH_ON
-                        TileHapticsState.TOGGLE_OFF -> MSDLToken.SWITCH_OFF
-                        TileHapticsState.LONG_PRESS -> MSDLToken.LONG_PRESS
-                        TileHapticsState.NO_HAPTICS -> null
+            hapticsState.collect { state ->
+                if (state == TileHapticsState.NO_HAPTICS) return@collect
+
+                if (Flags.msdlFeedback()) {
+                    val token =
+                        when (state) {
+                            TileHapticsState.TOGGLE_ON -> MSDLToken.SWITCH_ON
+                            TileHapticsState.TOGGLE_OFF -> MSDLToken.SWITCH_OFF
+                            TileHapticsState.LONG_PRESS -> MSDLToken.LONG_PRESS
+                            else -> null
+                        }
+                    token?.let { msdlPlayer.playToken(it) }
+                } else {
+                    if (areAllPrimitivesSupported) {
+                        when (state) {
+                            TileHapticsState.TOGGLE_ON,
+                            TileHapticsState.TOGGLE_OFF -> vibrateToggle()
+                            TileHapticsState.LONG_PRESS -> vibrateLongPress()
+                            else -> Unit
+                        }
+                    } else {
+                        when (state) {
+                            TileHapticsState.TOGGLE_ON,
+                            TileHapticsState.TOGGLE_OFF ->
+                                vibratorHelper.vibrate(clickEffect, vibrationAttrs)
+                            TileHapticsState.LONG_PRESS ->
+                                vibratorHelper.vibrate(heavyClick, vibrationAttrs)
+                            else -> Unit
+                        }
                     }
-                tokenToPlay?.let {
-                    msdlPlayer.playToken(it)
-                    resetStates()
                 }
+                resetStates()
             }
             awaitCancellation()
         } finally {
@@ -178,10 +234,5 @@ constructor(
 class TileHapticsViewModelFactoryProvider
 @Inject
 constructor(private val tileHapticsViewModelFactory: TileHapticsViewModel.Factory) {
-    fun getHapticsViewModelFactory(): TileHapticsViewModel.Factory? =
-        if (Flags.msdlFeedback()) {
-            tileHapticsViewModelFactory
-        } else {
-            null
-        }
+    fun getHapticsViewModelFactory(): TileHapticsViewModel.Factory? = tileHapticsViewModelFactory
 }
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 a15d5b96b5bb7..a20d224c3dfd3 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 9ade5036b9a8d..2618584df769d 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;
@@ -96,6 +98,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.
@@ -106,6 +109,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;
@@ -150,6 +155,9 @@ public class KeyguardSliceProvider extends SliceProvider implements
     protected boolean mDozing;
     private int mStatusBarState;
     private boolean mMediaIsVisible;
+    private boolean mPulseOnNewTracks;
+    private long mLastPulseUptimeMs = 0L;
+
     private SystemUIAppComponentFactoryBase.ContextAvailableCallback mContextAvailableCallback;
     @Inject
     WakeLockLogger mWakeLockLogger;
@@ -219,14 +227,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));
-                }
+                builder.addRow(new RowBuilder(mDateUri).setTitle(mLastText));
                 addNextAlarmLocked(builder);
                 addZenModeLocked(builder);
                 addPrimaryActionLocked(builder);
+                if (needsMediaLocked()) {
+                    addMediaLocked(builder);
+                }
                 slice = builder.build();
             }
         } catch (IllegalStateException e) {
@@ -251,8 +258,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);
@@ -318,7 +328,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\"");
@@ -327,21 +339,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;
     }
@@ -392,7 +408,7 @@ private boolean withinNHoursLocked(AlarmManager.AlarmClockInfo alarmClockInfo, i
         }
 
         long limit = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(hours);
-        return mNextAlarmInfo.getTriggerTime() <= limit;
+        return alarmClockInfo.getTriggerTime() <= limit;
     }
 
     /**
@@ -517,6 +533,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 6caff6432cb2c..f90e09207801e 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
@@ -19,6 +19,7 @@ package com.android.systemui.keyguard
 
 import android.content.Context
 import com.android.internal.jank.InteractionJankMonitor
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.CoreStartable
 import com.android.systemui.biometrics.ui.binder.DeviceEntryUnlockTrackerViewBinder
 import com.android.systemui.common.ui.ConfigurationState
@@ -31,6 +32,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
@@ -45,7 +47,6 @@ import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.shade.domain.interactor.ShadeInteractor
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.statusbar.KeyguardIndicationController
 import com.android.systemui.statusbar.LightRevealScrim
 import com.android.systemui.statusbar.VibratorHelper
@@ -131,6 +132,9 @@ constructor(
     private fun initializeViews() {
         val indicationArea = KeyguardIndicationArea(context, null)
         keyguardIndicationController.setIndicationArea(indicationArea)
+
+        val indicationAreaTop = KeyguardIndicationAreaTop(context, null)
+        keyguardIndicationController.setIndicationAreaTop(indicationAreaTop)
     }
 
     private fun bindKeyguardRootView() {
@@ -145,6 +149,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 34ed3a1091a48..35faede128057 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -87,6 +87,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;
@@ -119,6 +120,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;
@@ -164,6 +166,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;
@@ -1668,8 +1671,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;
@@ -1888,16 +1894,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
@@ -2666,7 +2682,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,
@@ -3146,7 +3163,8 @@ private void handleShowInner(Bundle options) {
             userActivity();
             mUpdateMonitor.setKeyguardGoingAway(false);
             mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
-            mShowKeyguardWakeLock.release();
+            if (mShowKeyguardWakeLock != null)
+                mShowKeyguardWakeLock.release();
         }
         mKeyguardDisplayManager.show();
 
@@ -3893,6 +3911,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..eb90a8af40150
--- /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.crdroid.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/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/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..3219d2b2c888b 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.crdroid.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.crdroid.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)
+                    }
                 }
             }
         }
@@ -80,8 +121,14 @@ object AlternateBouncerUdfpsViewBinder {
         bgView.repeatWhenAttached {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 launch("$TAG#viewModel.bgColor") {
-                    viewModel.bgColor.collect { color ->
-                        bgView.imageTintList = ColorStateList.valueOf(color)
+                    if (!shouldUseCustomUdfpsIcon.value || !packageInstalled) {
+                        viewModel.bgColor.collect { color ->
+                            bgView.imageTintList = ColorStateList.valueOf(color)
+                        }
+                    } else {
+                        viewModel.bgColor.collect { 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 b8b032719ef86..c5fde2149d586 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
@@ -44,6 +44,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
@@ -64,6 +65,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
@@ -248,7 +250,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(
@@ -256,7 +258,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..2ce6c4ac763a4 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.crdroid.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.crdroid.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,10 +143,19 @@ object DeviceEntryIconViewBinder {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
                     launch("$TAG#viewModel.useBackgroundProtection") {
                         viewModel.useBackgroundProtection.collect { useBackgroundProtection ->
-                            if (useBackgroundProtection) {
-                                bgView.visibility = View.VISIBLE
+                            if (shouldUseCustomUdfpsIcon.value && packageInstalled) {
+                                bgView.visibility = View.GONE
                             } else {
+                                bgView.visibility = if (useBackgroundProtection) View.VISIBLE else View.GONE
+                            }
+                        }
+                    }
+                    launch("$TAG#shouldUseCustomUdfpsIcon") {
+                        shouldUseCustomUdfpsIcon.collect { useCustomIcon ->
+                            if (useCustomIcon && packageInstalled) {
                                 bgView.visibility = View.GONE
+                            } else {
+                                bgView.visibility = if (viewModel.useBackgroundProtection.value) View.VISIBLE else View.GONE
                             }
                         }
                     }
@@ -221,6 +265,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 +277,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 +302,11 @@ object DeviceEntryIconViewBinder {
                     }
                     launch("$TAG#bgViewModel.color") {
                         bgViewModel.color.collect { color ->
+                            if (!shouldUseCustomUdfpsIcon.value || !packageInstalled) {
                             bgView.imageTintList = ColorStateList.valueOf(color)
+                            } else {
+                                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/KeyguardRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
index 8184178a1ea29..56ccc76449181 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
@@ -97,6 +100,7 @@ object KeyguardRootViewBinder {
         viewModel: KeyguardRootViewModel,
         blueprintViewModel: KeyguardBlueprintViewModel,
         configuration: ConfigurationState,
+        context: Context,
         occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel?,
         chipbarCoordinator: ChipbarCoordinator?,
         shadeInteractor: ShadeInteractor,
@@ -156,10 +160,15 @@ object KeyguardRootViewBinder {
                                         authInteractionProperties,
                                     )
                                 } else {
-                                    vibratorHelper.performHapticFeedback(
-                                        view,
-                                        HapticFeedbackConstants.BIOMETRIC_CONFIRM,
-                                    )
+                                    var FingerprintVib : Boolean = Settings.System.getIntForUser(
+                                                context.contentResolver,
+                                                Settings.System.FP_SUCCESS_VIBRATE, 1, UserHandle.USER_CURRENT) == 1
+                                    if (FingerprintVib) {
+                                        vibratorHelper.performHapticFeedback(
+                                            view,
+                                            HapticFeedbackConstants.BIOMETRIC_CONFIRM,
+                                        )
+                                    }
                                 }
                             }
                         }
@@ -172,10 +181,15 @@ object KeyguardRootViewBinder {
                                         authInteractionProperties,
                                     )
                                 } else {
-                                    vibratorHelper.performHapticFeedback(
-                                        view,
-                                        HapticFeedbackConstants.BIOMETRIC_REJECT,
-                                    )
+                                    var FingerprintVibErr : Boolean = Settings.System.getIntForUser(
+                                                context.contentResolver,
+                                                Settings.System.FP_ERROR_VIBRATE, 1, UserHandle.USER_CURRENT) == 1
+                                    if (FingerprintVibErr) {
+                                        vibratorHelper.performHapticFeedback(
+                                            view,
+                                            HapticFeedbackConstants.BIOMETRIC_REJECT,
+                                        )
+                                    }
                                 }
                             }
                         }
@@ -203,6 +217,7 @@ object KeyguardRootViewBinder {
                             view.alpha = alpha
                             childViews[burnInLayerId]?.alpha = alpha
                             childViews[sliceViewId]?.alpha = alpha
+                            childViews[weatherAreaId]?.alpha = alpha
                         }
                     }
 
@@ -220,6 +235,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
@@ -237,6 +253,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
                                 }
@@ -286,6 +303,7 @@ object KeyguardRootViewBinder {
                         viewModel.burnInLayerVisibility.collect { visibility ->
                             childViews[burnInLayerId]?.visibility = visibility
                             childViews[sliceViewId]?.visibility = visibility
+                            childViews[weatherAreaId]?.visibility = visibility
                         }
                     }
 
@@ -579,6 +597,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/binder/LightRevealScrimViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/LightRevealScrimViewBinder.kt
index 44505158fc32e..d30be29bdc90b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/LightRevealScrimViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/LightRevealScrimViewBinder.kt
@@ -21,9 +21,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.app.animation.Interpolators.ALPHA_IN
 import com.android.app.tracing.coroutines.launchTraced as launch
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel
 import com.android.systemui.lifecycle.repeatWhenAttached
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.statusbar.LightRevealScrim
 import com.android.systemui.wallpapers.ui.viewmodel.WallpaperViewModel
 
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 13331a4da3f77..705c653cde4a2 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
@@ -19,6 +19,8 @@ package com.android.systemui.keyguard.ui.view
 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
@@ -31,9 +33,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
@@ -42,7 +48,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(
@@ -59,6 +66,15 @@ constructor(
 
     private var animatedIconDrawable: AnimatedStateListDrawable = AnimatedStateListDrawable()
 
+    private final val UDFPS_ICON: String =
+            "system:" + Settings.System.UDFPS_ICON
+
+    private val fingerprintDrawable: UdfpsIconDrawable = UdfpsFpIconDrawable(context)
+
+    private val packageInstalled = com.android.internal.util.crdroid.Utils.isPackageInstalled(
+        context, "com.crdroid.udfps.icons"
+    )
+
     init {
         setupIconStates()
         setupIconTransitions()
@@ -69,6 +85,21 @@ constructor(
         addBgImageView()
         addIconImageView()
         addTouchHandlingView()
+
+        tunerService.addTunable(this, UDFPS_ICON)
+    }
+
+    override fun onTuningChanged(key: String?, value: String?) {
+        when (key) {
+            UDFPS_ICON -> {
+                iconView.setImageDrawable(null)
+                animatedIconDrawable = AnimatedStateListDrawable()
+                setupIconStates()
+                setupIconTransitions()
+                iconView.setImageDrawable(animatedIconDrawable) 
+            }
+            else -> return
+        }
     }
 
     private fun setupAccessibilityDelegate() {
@@ -106,6 +137,10 @@ 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)
+
         // Lockscreen States
         // LOCK
         animatedIconDrawable.addState(
@@ -120,11 +155,20 @@ constructor(
             R.id.unlocked,
         )
         // FINGERPRINT
-        animatedIconDrawable.addState(
-            getIconState(IconType.FINGERPRINT, false),
-            context.getDrawable(R.drawable.ic_fingerprint)!!,
-            R.id.locked_fp,
-        )
+        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),
+                context.getDrawable(R.drawable.ic_fingerprint)!!,
+                R.id.locked_fp
+            )
+        }
 
         // AOD states
         // LOCK
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..8e2fe3d7ba590 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,6 +27,7 @@ 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
@@ -34,6 +35,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSec
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultUdfpsAccessibilityOverlaySection
 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.KeyguardWeatherViewSection
 import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection
 import java.util.Optional
 import javax.inject.Inject
@@ -52,6 +54,7 @@ class DefaultKeyguardBlueprint
 constructor(
     accessibilityActionsSection: AccessibilityActionsSection,
     defaultIndicationAreaSection: DefaultIndicationAreaSection,
+    defaultIndicationAreaTopSection: DefaultIndicationAreaTopSection,
     defaultDeviceEntrySection: DefaultDeviceEntrySection,
     defaultShortcutsSection: DefaultShortcutsSection,
     @Named(KEYGUARD_AMBIENT_INDICATION_AREA_SECTION)
@@ -64,6 +67,7 @@ constructor(
     aodBurnInSection: AodBurnInSection,
     clockSection: ClockSection,
     smartspaceSection: SmartspaceSection,
+    keyguardWeatherViewSection: KeyguardWeatherViewSection,
     keyguardSliceViewSection: KeyguardSliceViewSection,
     udfpsAccessibilityOverlaySection: DefaultUdfpsAccessibilityOverlaySection,
 ) : KeyguardBlueprint {
@@ -73,6 +77,7 @@ constructor(
         listOfNotNull(
             accessibilityActionsSection,
             defaultIndicationAreaSection,
+            defaultIndicationAreaTopSection,
             defaultShortcutsSection,
             defaultAmbientIndicationAreaSection.getOrNull(),
             defaultSettingsPopupMenuSection,
@@ -83,6 +88,7 @@ constructor(
             smartspaceSection,
             aodBurnInSection,
             clockSection,
+            keyguardWeatherViewSection,
             keyguardSliceViewSection,
             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 c38f7700fd1f6..bd9360b6064e7 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
@@ -32,6 +32,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultShortcutsSec
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSection
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule
 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,6 +67,7 @@ constructor(
     clockSection: ClockSection,
     smartspaceSection: SmartspaceSection,
     mediaSection: SplitShadeMediaSection,
+    keyguardWeatherViewSection: KeyguardWeatherViewSection,
     keyguardSliceViewSection: KeyguardSliceViewSection,
 ) : KeyguardBlueprint {
     override val id: String = ID
@@ -85,6 +87,7 @@ constructor(
             smartspaceSection,
             aodBurnInSection,
             clockSection,
+            keyguardWeatherViewSection,
             keyguardSliceViewSection,
             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/ClockSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt
index ce896ea139d6b..5fddc0267f2c8 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
@@ -256,6 +256,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(
@@ -271,6 +272,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/KeyguardSliceViewSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardSliceViewSection.kt
index fd56c213612f7..2c18d42c3ce4e 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
@@ -112,14 +112,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..b06daf9b11a80
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWeatherViewSection.kt
@@ -0,0 +1,102 @@
+/*
+ * 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.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.customization.clocks.R as clocksR
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController
+import javax.inject.Inject
+
+import com.android.systemui.weather.WeatherInfoView
+
+class KeyguardWeatherViewSection
+@Inject
+constructor(
+    private val context: Context,
+    val layoutInflater: LayoutInflater,
+    val smartspaceController: LockscreenSmartspaceController,
+) : KeyguardSection() {
+    private lateinit var weatherView: WeatherInfoView
+
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        if (!smartspaceController.isOmniWeatherEnabled || smartspaceController.isEnabled) return
+
+        weatherView =
+            layoutInflater.inflate(R.layout.keyguard_weather_area, null, false) as WeatherInfoView
+        constraintLayout.addView(weatherView)
+    }
+
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        if (!smartspaceController.isOmniWeatherEnabled || smartspaceController.isEnabled) return
+
+        weatherView.init()
+    }
+
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        if (!smartspaceController.isOmniWeatherEnabled || smartspaceController.isEnabled) return
+
+        constraintSet.apply {
+            connect(
+                R.id.keyguard_weather_area,
+                ConstraintSet.START,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.START,
+                context.resources.getDimensionPixelSize(clocksR.dimen.clock_padding_start) +
+                    context.resources.getDimensionPixelSize(clocksR.dimen.status_view_margin_horizontal),
+            )
+            connect(
+                R.id.keyguard_weather_area,
+                ConstraintSet.END,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.END
+            )
+            constrainHeight(R.id.keyguard_weather_area, ConstraintSet.WRAP_CONTENT)
+
+            connect(
+                R.id.keyguard_weather_area,
+                ConstraintSet.TOP,
+                R.id.keyguard_slice_view,
+                ConstraintSet.BOTTOM
+            )
+
+            createBarrier(
+                R.id.smart_space_barrier_bottom,
+                Barrier.BOTTOM,
+                0,
+                *intArrayOf(R.id.keyguard_weather_area)
+            )
+        }
+    }
+
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        if (!smartspaceController.isOmniWeatherEnabled || smartspaceController.isEnabled) return
+
+        constraintLayout.findViewById<WeatherInfoView?>(R.id.keyguard_weather_area)?.let { weatherArea ->
+            weatherArea.cleanup()
+            constraintLayout.removeView(weatherArea)
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToGlanceableHubTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToGlanceableHubTransitionViewModel.kt
index d643902cee2ff..4df0b40e175df 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToGlanceableHubTransitionViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToGlanceableHubTransitionViewModel.kt
@@ -17,6 +17,7 @@
 package com.android.systemui.keyguard.ui.viewmodel
 
 import android.util.MathUtils
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.keyguard.dagger.GlanceableHubBlurComponent
 import com.android.systemui.keyguard.domain.interactor.FromAodTransitionInteractor
@@ -27,7 +28,6 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
 import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
 import com.android.systemui.keyguard.ui.transitions.GlanceableHubTransition
 import com.android.systemui.scene.shared.model.Scenes
-import com.android.systemui.shared.Flags.ambientAod
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.flow.Flow
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToOccludedTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToOccludedTransitionViewModel.kt
index ba6bda8a2a043..96c487a1cd315 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToOccludedTransitionViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToOccludedTransitionViewModel.kt
@@ -17,6 +17,7 @@
 package com.android.systemui.keyguard.ui.viewmodel
 
 import android.util.MathUtils
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.keyguard.domain.interactor.FromAodTransitionInteractor
 import com.android.systemui.keyguard.shared.model.Edge
@@ -24,7 +25,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.AOD
 import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED
 import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
 import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
-import com.android.systemui.shared.Flags.ambientAod
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.flow.Flow
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DozingToOccludedTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DozingToOccludedTransitionViewModel.kt
index 2eb5bf9328e64..1e288a97f2b3b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DozingToOccludedTransitionViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DozingToOccludedTransitionViewModel.kt
@@ -17,6 +17,7 @@
 package com.android.systemui.keyguard.ui.viewmodel
 
 import android.util.MathUtils
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.keyguard.domain.interactor.FromAodTransitionInteractor
 import com.android.systemui.keyguard.shared.model.Edge
@@ -24,7 +25,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.DOZING
 import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED
 import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
 import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
-import com.android.systemui.shared.Flags.ambientAod
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.flow.Flow
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 8cd54c9ecd746..dc737f656ed82 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
@@ -36,18 +36,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 in the build. */
-    private val isWeatherEnabled: StateFlow<Boolean> = smartspaceInteractor.isWeatherEnabled
+    private val isWeatherEnabled: StateFlow<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
 
     /** Whether the date area should be visible. */
     val isDateVisible: StateFlow<Boolean> =
diff --git a/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt b/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt
index a79b8e744e5c7..443522b94108e 100644
--- a/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt
@@ -22,15 +22,29 @@ 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.CellularTile
+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.SmartPixelsTile
+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.VolumeTile
 import com.android.systemui.qs.tiles.VpnTile
+import com.android.systemui.qs.tiles.WeatherTile
 import com.android.systemui.qs.tiles.WifiTile
 import com.android.systemui.qs.tiles.base.shared.model.QSTileConfig
 import com.android.systemui.qs.tiles.base.shared.model.QSTileUIConfig
@@ -56,6 +70,12 @@ 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
@@ -68,18 +88,60 @@ interface LineageModule {
     @StringKey(CellularTile.TILE_SPEC)
     fun bindCellularTile(cellularTile: CellularTile): 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
@@ -92,6 +154,30 @@ 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 SmartPixelsTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(SmartPixelsTile.TILE_SPEC)
+    fun bindSmartPixelsTile(smartPixelsTile: SmartPixelsTile): 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
@@ -104,12 +190,24 @@ interface LineageModule {
     @StringKey(UsbTetherTile.TILE_SPEC)
     fun bindUsbTetherTile(usbTetherTile: UsbTetherTile): 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<*>
+
     /** Inject WifiTile into tileMap in QSModule */
     @Binds
     @IntoMap
@@ -160,6 +258,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)
@@ -190,6 +303,66 @@ interface LineageModule {
                 category = TileCategory.CONNECTIVITY,
             )
 
+        @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)
@@ -205,6 +378,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)
@@ -220,6 +423,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)
@@ -250,6 +468,66 @@ 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(SmartPixelsTile.TILE_SPEC)
+        fun provideSmartPixelsTileConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(SmartPixelsTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_smart_pixels,
+                        labelRes = R.string.quick_settings_smart_pixels
+                    ),
+                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)
@@ -280,6 +558,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)
@@ -295,6 +588,21 @@ interface LineageModule {
                 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(WIFI_TILE_SPEC)
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..7bb965023be3b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaSessionManager.kt
@@ -0,0 +1,105 @@
+/*
+ * 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 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 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) }
+                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 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..50867556f552c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt
@@ -0,0 +1,549 @@
+/*
+ * 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.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.SystemUIApplication
+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 ambientEnabled = true
+    private var artworkDrawable: Drawable? = null
+    private var isMediaPlaying = false
+    private var bouncerShowingOrKeyguardDismissing = false
+    private var keyguardShowing = false
+    private var isDozing = false
+
+    private var mediaFilter = 0
+    private var mediaFadeLevel = 40
+    private var mediaBlurLevel = 200
+
+    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 coalesceJob: Job? = null
+
+    private val sharedTypedValue = TypedValue()
+
+    private val isCollapsed: Boolean
+        get() = ScrimUtils.get().isPanelFullyCollapsed()
+
+    init {
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_ENABLED),
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.AMBIENT_MEDIA_ART_ENABLED),
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_FILTER),
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_FADE_LEVEL),
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_BLUR_LEVEL),
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL
+        )
+
+        updateSettings()
+    }
+
+    private fun updateSettings() {
+        featureEnabled = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_ENABLED,
+            0,
+            UserHandle.USER_CURRENT
+        ) == 1
+
+        ambientEnabled = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.AMBIENT_MEDIA_ART_ENABLED,
+            1,
+            UserHandle.USER_CURRENT
+        ) == 1
+
+        mediaFilter = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_FILTER,
+            0,
+            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,
+            200,
+            UserHandle.USER_CURRENT
+        ).coerceIn(0, 600)
+
+
+        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 setupMediaFilter() {
+        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)
+            }
+            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
+        if (!isMediaPlaying) return false
+        if (bouncerShowingOrKeyguardDismissing) return false
+        if (artworkDrawable == null) return false
+        if (!isCollapsed) return false
+        if (isDozing && ambientEnabled) return true
+        if (keyguardShowing && !isDozing) return true
+        return false
+    }
+
+    private fun cancelScrimAnim() {
+        mediaScrim.animate().setListener(null).cancel()
+    }
+
+    private fun showMediaArt() {
+        if (isAlbumArtVisible && scrimState == STATE_SCRIM_VISIBLE) return
+        if (dismissingKeyguard) return
+        cancelScrimAnim()
+        updateMediaArt()
+        setupMediaFilter()
+        mediaScrim.apply {
+            alpha = 0f
+            visibility = View.VISIBLE
+            scrimState = STATE_SCRIM_VISIBLE
+            animate()
+                .alpha(1f)
+                .setDuration(300)
+                .setListener(null)
+                .start()
+        }
+        isAlbumArtVisible = true
+    }
+
+    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 = resizedBitmap
+
+        val bitmapDrawable = BitmapDrawable(context.resources, processedBitmap).apply {
+            alpha = 255
+        }
+
+        val fadeColor = ColorUtils.blendARGB(
+            Color.TRANSPARENT,
+            Color.BLACK,
+            mediaFadeLevel / 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 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) {
+        if (dismissingKeyguard) return
+        dismissingKeyguard = true
+        mediaArtJob?.cancel()
+        cancelScrimAnim()
+        if (!animate) {
+            clearResources()
+            return;
+        }
+        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
+            onMediaStateChanged()
+            if (scrimState == STATE_SCRIM_VISIBLE) {
+                updateMediaArt()
+            }
+        }
+    }
+
+    override fun onPlaybackStateChanged(state: Int) {
+        isMediaPlaying = state == PlaybackState.STATE_PLAYING
+        coroutineScope.launch {
+            if (!isMediaPlaying) artworkDrawable = null
+            onMediaStateChanged()
+        }
+    }
+
+    override fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        bouncerShowingOrKeyguardDismissing = showing
+        if (showing) {
+            cleanupResources(true)
+        }
+    }
+
+    override fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = goingAway
+        if (goingAway) {
+            cleanupResources(true)
+        }
+    }
+
+    override fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = fadingAway
+        if (fadingAway) {
+            cleanupResources(true)
+        }
+    }
+
+    override fun onDozingChanged(dozing: Boolean) {
+        isDozing = dozing
+        coroutineScope.launch {
+            onMediaStateChanged()
+        }
+    }
+
+    override fun onExpandedFractionChanged(expandedFraction: Float) {
+        coroutineScope.launch {
+            onMediaStateChanged()
+        }
+    }
+
+    override fun onBarStateChanged(state: Int) {
+        coroutineScope.launch {
+            onMediaStateChanged()
+        }
+    }
+
+    override fun onQsVisibilityChanged(visible: Boolean) {
+        coroutineScope.launch {
+            onMediaStateChanged()
+        }
+    }
+
+    override fun onKeyguardShowingChanged(showing: Boolean) {
+        keyguardShowing = showing
+        if (keyguardShowing) {
+            dismissingKeyguard = false
+        } else {
+            cleanupResources(false)
+        }
+        coroutineScope.launch {
+            onMediaStateChanged()
+        }
+    }
+
+    override fun onScreenTurnedOff() {
+        cleanupResources(false)
+    }
+
+    override fun onStartedWakingUp() {
+        coroutineScope.launch {
+            onMediaStateChanged()
+        }
+    }
+
+    private suspend fun onMediaStateChanged() {
+        val show = shouldShowMediaArt()
+        if (show && scrimState == STATE_SCRIM_HIDDEN) {
+            showMediaArt()
+        } else if (!show && scrimState == STATE_SCRIM_VISIBLE) {
+            cleanupResources(true)
+        }
+    }
+
+    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
+        }
+        mediaArtJob?.cancel()
+        mediaScrim.setImageDrawable(null)
+        mediaScrim.setRenderEffect(null)
+        mediaScrim.colorFilter = null
+        artworkDrawable = null
+        isAlbumArtVisible = false
+        coalesceJob?.cancel()
+        coroutineScope.cancel()
+    }
+
+    companion object {
+        private const val TAG = "MediaViewController"
+        @JvmStatic
+        fun get(context: Context): MediaViewController {
+            val app = context.applicationContext as SystemUIApplication
+            return app.sysUIComponent.mediaViewController()
+        }
+    }
+}
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/ui/controller/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
index f8d2f2b7da233..bbc5d373a37a7 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
@@ -427,7 +427,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
             )
         }
     }
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 c879722f5d37e..7fc78486a1fd9 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
@@ -48,6 +48,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;
@@ -106,6 +107,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.monet.Style;
 import com.android.systemui.plugins.ActivityStarter;
@@ -131,6 +133,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;
@@ -236,6 +239,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;
@@ -291,7 +295,8 @@ public MediaControlPanel(
             CommunalSceneInteractor communalSceneInteractor,
             NotificationLockscreenUserManager lockscreenUserManager,
             BroadcastDialogController broadcastDialogController,
-            GlobalSettings globalSettings
+            GlobalSettings globalSettings,
+            SecureSettings secureSettings
     ) {
         mContext = context;
         mBackgroundExecutor = backgroundExecutor;
@@ -319,7 +324,7 @@ public MediaControlPanel(
         });
 
         mGlobalSettings = globalSettings;
-        updateAnimatorDurationScale();
+        mSecureSettings = secureSettings;
     }
 
     /**
@@ -412,7 +417,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);
         }
     }
 
@@ -437,6 +444,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;
@@ -515,6 +523,7 @@ public void bindPlayer(@NonNull MediaData data, String key) {
 
         if (mToken != null) {
             mController = new MediaController(mContext, mToken);
+            mController.registerCallback(mCb);
         } else {
             mController = null;
         }
@@ -932,6 +941,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) {
@@ -950,6 +963,8 @@ private void bindArtworkAndColors(MediaData data, String key, boolean updateBack
                             darkTheme, Style.CONTENT);
                 } catch (PackageManager.NameNotFoundException e) {
                     Log.w(TAG, "Cannot find icon for package " + data.getPackageName(), e);
+                    mutableColorScheme = new ColorScheme(ColorScheme.GOOGLE_BLUE,
+                            darkTheme, Style.CONTENT);
                 }
             }
 
@@ -962,6 +977,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);
@@ -1031,7 +1049,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) {
@@ -1548,5 +1570,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 b5da463cb9c98..c054e44837d18 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
@@ -687,6 +687,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 94f154683ec9f..4be5ba5dd1f2f 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
@@ -25,6 +25,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
+import android.os.UserHandle
 import android.provider.Settings
 import android.view.View
 import android.view.animation.Interpolator
@@ -68,6 +69,7 @@ import com.android.systemui.util.animation.TransitionLayoutController
 import com.android.systemui.util.animation.TransitionViewState
 import com.android.systemui.util.concurrency.DelayableExecutor
 import com.android.systemui.util.settings.GlobalSettings
+import com.android.systemui.util.settings.SecureSettings
 import java.lang.Float.max
 import java.lang.Float.min
 import java.util.Random
@@ -87,6 +89,7 @@ constructor(
     private val seekBarViewModel: SeekBarViewModel,
     @Main private val mainExecutor: DelayableExecutor,
     private val globalSettings: GlobalSettings,
+    private val secureSettings: SecureSettings,
 ) {
 
     companion object {
@@ -727,7 +730,9 @@ constructor(
         if (!SceneContainerFlag.isEnabled) return
         if (this::seekBarObserver.isInitialized) {
             seekBarObserver.animationEnabled =
-                globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) > 0f
+                globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) > 0f &&
+                secureSettings.getIntForUser(Settings.Secure.MEDIA_SQUIGGLE_ANIMATION,
+                    1, UserHandle.USER_CURRENT) != 0
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java
index d33ad8f800211..f7112ffd39201 100644
--- a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java
@@ -320,7 +320,7 @@ protected void onDestroy() {
     }
 
     private void setUpDialog(AlertDialog dialog) {
-        SystemUIDialog.registerDismissListener(dialog);
+        SystemUIDialog.registerDismissListener(dialog, this::onDialogDismissed);
         SystemUIDialog.applyFlags(dialog, /* showWhenLocked= */ false);
         SystemUIDialog.setDialogSize(dialog);
 
@@ -333,6 +333,12 @@ private void setUpDialog(AlertDialog dialog) {
         w.addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
     }
 
+    private void onDialogDismissed() {
+        if (!isFinishing()) {
+            finish();
+        }
+    }
+
     private boolean showScreenCaptureDisabledDialogIfNeeded() {
         final UserHandle hostUserHandle = getHostUserHandle();
         if (mScreenCaptureDevicePolicyResolver.get()
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/ScreenPinningNotify.java b/packages/SystemUI/src/com/android/systemui/navigationbar/ScreenPinningNotify.java
index 1e40dd9945d28..06994346210fd 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/ScreenPinningNotify.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/ScreenPinningNotify.java
@@ -17,8 +17,10 @@
 package com.android.systemui.navigationbar;
 
 import android.content.Context;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Slog;
+import android.view.WindowManagerGlobal;
 import android.widget.Toast;
 
 import com.android.systemui.SysUIToast;
@@ -60,7 +62,9 @@ public void showEscapeToast(boolean isGestureNavEnabled, boolean isRecentsButton
         if (mLastToast != null) {
             mLastToast.cancel();
         }
-        mLastToast = makeAllUserToastAndShow(isGestureNavEnabled
+        mLastToast = makeAllUserToastAndShow(!hasSoftNavigationBar()
+                ? R.string.screen_pinning_toast_no_navbar
+                : isGestureNavEnabled
                 ? R.string.screen_pinning_toast_gesture_nav
                 : isRecentsButtonVisible
                         ? R.string.screen_pinning_toast
@@ -73,4 +77,14 @@ private Toast makeAllUserToastAndShow(int resId) {
         toast.show();
         return toast;
     }
+
+    private boolean hasSoftNavigationBar() {
+        try {
+            return WindowManagerGlobal.getWindowManagerService()
+                    .hasNavigationBar(mContext.getDisplayId());
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Failed to check soft navigation bar", e);
+            return false;
+        }
+    }
 }
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..c8d7b8ff5bf82 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 = false
+
+    private var edgeHapticEnabled = false
+
     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 = if (backArrowVisibility) true else false
 
                 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/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index 562571654b912..29ef5f8677f50 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -42,7 +42,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;
@@ -57,7 +56,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;
@@ -82,6 +83,7 @@
 
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.internal.policy.GestureNavigationSettingsObserver;
+import com.android.internal.util.crdroid.Utils;
 import com.android.systemui.LauncherProxyService;
 import com.android.systemui.contextualeducation.GestureType;
 import com.android.systemui.dagger.qualifiers.Background;
@@ -105,6 +107,7 @@
 import com.android.systemui.statusbar.phone.LightBarController;
 import com.android.systemui.topui.TopUiController;
 import com.android.systemui.topui.TopUiControllerRefactor;
+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;
@@ -141,12 +144,19 @@
 /**
  * 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 int MAX_NUM_LOGGED_PREDICTIONS = 10;
     private static final int MAX_NUM_LOGGED_GESTURES = 10;
 
@@ -247,6 +257,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
@@ -303,6 +315,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 +346,10 @@ public void onPropertiesChanged(DeviceConfig.Properties properties) {
     private final NotificationShadeWindowController mNotificationShadeWindowController;
     private final TopUiController mTopUiController;
 
+    private boolean mIsBackGestureArrowEnabled;
+    private boolean mIsEdgeHapticEnabled;
+    private boolean mNavbarVisible;
+
     private final NavigationEdgeBackPlugin.BackCallback mBackCallback =
             new NavigationEdgeBackPlugin.BackCallback() {
                 @Override
@@ -365,6 +384,7 @@ public void triggerBack(boolean isLongPress) {
                 public void cancelBack() {
                     if (mBackAnimation != null) {
                         mBackAnimation.setTriggerBack(false);
+                        mBackAnimation.setTriggerLongSwipe(false);
                     }
                     logGesture(SysUiStatsLog.BACK_GESTURE__TYPE__INCOMPLETE);
                 }
@@ -496,7 +516,8 @@ public interface Factory {
             JavaAdapter javaAdapter,
             DisplayManager displayManager,
             DisplayBackGestureHandlerImpl.Factory displayBackGestureHandlerFactory,
-            DesktopState desktopState) {
+            DesktopState desktopState,
+            TunerService tunerService) {
         mContext = context;
         mMainDisplayId = context.getDisplayId();
         mUiThreadContext = uiThreadContext;
@@ -522,6 +543,7 @@ public interface Factory {
         mDisplayManager = displayManager;
         mDisplayBackGestureHandlerFactory = displayBackGestureHandlerFactory;
         mDesktopState = desktopState;
+        mTunerService = tunerService;
 
         ComponentName recentsComponentName = ComponentName.unflattenFromString(
                 context.getString(com.android.internal.R.string.config_recentsComponentName));
@@ -591,6 +613,8 @@ public void updateCurrentUserResources() {
         final boolean previousForcedVisible = mIsButtonForcedVisible;
         mIsButtonForcedVisible =
                 mGestureNavigationSettingsObserver.areNavigationButtonForcedVisible();
+        mIsBackGestureArrowEnabled = mGestureNavigationSettingsObserver.getBackArrowGesture();
+        mIsEdgeHapticEnabled = mGestureNavigationSettingsObserver.getEdgeHapticEnabled();
         // Update this before calling mButtonForcedVisibleCallback since NavigationBar will relayout
         // and query isHandlingGestures() as a part of the callback
         mIsBackGestureAllowed = !mIsButtonForcedVisible;
@@ -598,6 +622,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 +640,15 @@ 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();
 
         // Reduce the default touch slop to ensure that we can intercept the gesture
         // before the app starts to react to it.
@@ -678,6 +700,9 @@ 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);
     }
 
     /**
@@ -691,6 +716,7 @@ public void onNavBarDetached() {
         mTrackpadsConnected.clear();
         updateIsEnabled();
         mUserTracker.removeCallback(mUserChangedCallback);
+        mTunerService.removeTunable(this);
     }
 
     /**
@@ -802,7 +828,7 @@ private void updateIsEnabledInner() {
 
             mIsGestureHandlingEnabled = mInGestureNavMode || (mUsingThreeButtonNav
                     && !mTrackpadsConnected.isEmpty());
-            boolean isEnabled = mIsAttached && mIsGestureHandlingEnabled;
+            boolean isEnabled = mIsAttached && mIsGestureHandlingEnabled && mNavbarVisible;
             if (isEnabled == mIsEnabled) {
                 return;
             }
@@ -885,6 +911,7 @@ private void updateIsEnabledInner() {
                     // Add a nav bar panel window
                     resetEdgeBackPlugin();
                     updateLongSwipeWidth();
+                    updateEdgeHeightValue();
                 }
 
                 // Begin listening to changes in blocked activities list
@@ -928,12 +955,48 @@ public boolean isButtonForcedVisible() {
         return mIsButtonForcedVisible;
     }
 
+    @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();
+        }
+    }
+
     private void updateLongSwipeWidth() {
         if (mIsEnabled && mEdgeBackPlugin != null) {
             mEdgeBackPlugin.setLongSwipeEnabled(mIsLongSwipeEnabled);
         }
     }
 
+    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;
+        }
+    }
+
     /**
      * Update the PiP bounds, used for exclusion calculation.
      */
@@ -1068,6 +1131,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
@@ -1262,6 +1330,8 @@ private void onMotionEvent(MotionEvent ev) {
                     mLastDownEventDisplayId = ev.getDisplayId();
                 } else {
                     mEdgeBackPlugin.setIsLeftPanel(mIsOnLeftEdge);
+                    mEdgeBackPlugin.setBackArrowVisibility(mIsBackGestureArrowEnabled);
+                    mEdgeBackPlugin.setEdgeHapticEnabled(mIsEdgeHapticEnabled);
                     mEdgeBackPlugin.onMotionEvent(ev);
                 }
                 dispatchToBackAnimation(ev);
@@ -1449,6 +1519,7 @@ private void updateDisplaySize() {
         }
         updateBackAnimationThresholds();
         updateLongSwipeWidth();
+        updateEdgeHeightValue();
     }
 
     private void updateBackAnimationThresholds() {
@@ -1467,7 +1538,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 d8cd5ed97d849..7e3335585c147 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
@@ -690,6 +697,25 @@ public boolean isSamplingEnabled() {
         mView.setEdgeBackGestureHandler(mEdgeBackGestureHandler);
         mView.setDisplayTracker(mDisplayTracker);
         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() {
@@ -864,6 +890,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
@@ -897,6 +930,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
@@ -2039,7 +2073,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/DeadZone.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/DeadZone.java
index a6be314158ca3..3afd14e2b23e0 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/DeadZone.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/DeadZone.java
@@ -46,7 +46,7 @@ public class DeadZone {
     public static final int HORIZONTAL = 0;  // Consume taps along the top edge.
     public static final int VERTICAL = 1;  // Consume taps along the left edge.
 
-    private static final boolean CHATTY = true; // print to logcat when we eat a click
+    private static final boolean CHATTY = false; // print to logcat when we eat a click
 
     private static final FloatProperty<DeadZone> FLASH_PROPERTY =
             new FloatProperty<DeadZone>("DeadZoneFlash") {
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 7a41078e3e294..351d432193219 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
@@ -451,7 +451,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/power/EnhancedEstimatesImpl.java b/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java
index 90da8912ad752..28a10b57220db 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.crdroid.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/privacy/AppOpsPrivacyItemMonitor.kt b/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
index 9c446d60c267b..e13d7a03e4edf 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
@@ -102,6 +102,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
@@ -239,6 +243,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/PrivacyConfig.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt
index 4b8c7a158ea14..cd88b52c98e5e 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt
@@ -16,99 +16,87 @@
 
 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.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
 import javax.inject.Inject
 
 @SysUISingleton
-class PrivacyConfig
-@Inject
-constructor(
+class PrivacyConfig @Inject constructor(
     @Main private val uiExecutor: DelayableExecutor,
-    private val deviceConfigProxy: DeviceConfigProxy,
-    dumpManager: DumpManager,
+    private val secureSettings: SecureSettings,
+    @Main handler: Handler,
+    dumpManager: DumpManager
 ) : Dumpable {
 
     @VisibleForTesting
     internal 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
     }
 
     private val callbacks = mutableListOf<WeakReference<Callback>>()
 
     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) {
@@ -120,7 +108,9 @@ constructor(
     }
 
     private fun addCallback(callback: WeakReference<Callback>) {
-        uiExecutor.execute { callbacks.add(callback) }
+        uiExecutor.execute {
+            callbacks.add(callback)
+        }
     }
 
     private fun removeCallback(callback: WeakReference<Callback>) {
@@ -139,7 +129,9 @@ constructor(
             ipw.println("mediaProjectionAvailable: $mediaProjectionAvailable")
             ipw.println("Callbacks:")
             ipw.withIncreasedIndent {
-                callbacks.forEach { callback -> callback.get()?.let { ipw.println(it) } }
+                callbacks.forEach { callback ->
+                    callback.get()?.let { ipw.println(it) }
+                }
             }
         }
         ipw.flush()
@@ -153,4 +145,4 @@ constructor(
 
         fun onFlagMediaProjectionChanged(flag: Boolean) {}
     }
-}
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
index f9a7205c56f52..536a6d7f3f1d7 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
@@ -16,6 +16,8 @@
 
 package com.android.systemui.privacy
 
+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
@@ -26,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
@@ -41,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 {
 
@@ -61,11 +65,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
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..5ff0b89d05bd2
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/MatrixStyleRenderer.kt
@@ -0,0 +1,228 @@
+/*
+ * 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 val brightGreen = Color.argb(255, 0, 255, 65)
+    private val mediumGreen = Color.argb(200, 0, 220, 55)
+    private val darkGreen = Color.argb(120, 0, 160, 40)
+
+    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 {
+        color = brightGreen
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+    }
+
+    private val mediumTextPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = mediumGreen
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+    }
+
+    private val darkTextPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = darkGreen
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+    }
+
+    private val textGlowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.argb(150, 0, 255, 65)
+        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) {
+        // ignore always green
+    }
+
+    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
+
+        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)
+            glowPaint.color = Color.argb(glowAlpha, 0, 200, 50)
+            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, 0, 255, 65)
+                    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()
+            }
+        }
+    }
+}
\ No newline at end of file
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/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..db4dff5156632
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseEngine.kt
@@ -0,0 +1,82 @@
+/*
+ * 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 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 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()
+            }
+            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..354f5562dcb47
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseRenderer.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP 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.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
+            "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..81d9bb0628197
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseSettingsRepository.kt
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP 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.pulse
+
+import android.content.Context
+import android.database.ContentObserver
+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_AMBIENT_ENABLED = Settings.Secure.AMBIENT_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_RENDERER = Settings.Secure.PULSE_RENDERER
+
+        private const val DEFAULT_ENABLED = false
+        private const val DEFAULT_AMBIENT_ENABLED = true
+        private const val DEFAULT_BAR_COUNT = 32
+        private const val DEFAULT_ROUNDED_BARS = false
+        private const val DEFAULT_COLOR = "lavalamp"
+        private const val DEFAULT_RENDERER = "solid"
+    }
+
+    private val handler = Handler(Looper.getMainLooper())
+    private var settingsObserver: SettingsObserver? = null
+    private var onSettingsChangedListener: (() -> Unit)? = null
+
+    private var cachedEnabled: Boolean? = null
+    private var cachedAmbientEnabled: Boolean? = null
+    private var cachedBarCount: Int? = null
+    private var cachedRoundedBars: Boolean? = null
+    private var cachedColorMode: String? = null
+    private var cachedRenderer: String? = null
+
+    fun startObserving() {
+        if (settingsObserver != null) return
+
+        settingsObserver = SettingsObserver(handler) { invalidateCache() }
+
+        listOf(
+            Settings.Secure.getUriFor(PULSE_ENABLED),
+            Settings.Secure.getUriFor(PULSE_AMBIENT_ENABLED),
+            Settings.Secure.getUriFor(PULSE_BAR_COUNT),
+            Settings.Secure.getUriFor(PULSE_ROUNDED_BARS),
+            Settings.Secure.getUriFor(PULSE_COLOR),
+            Settings.Secure.getUriFor(PULSE_RENDERER)
+        ).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 isPulseAmbientEnabled(): Boolean {
+        if (cachedAmbientEnabled == null) {
+            cachedAmbientEnabled = getSecureSetting(PULSE_AMBIENT_ENABLED, DEFAULT_AMBIENT_ENABLED)
+        }
+        return cachedAmbientEnabled!!
+    }
+
+    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 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 invalidateCache() {
+        cachedEnabled = null
+        cachedAmbientEnabled = null
+        cachedBarCount = null
+        cachedRoundedBars = null
+        cachedColorMode = null
+        cachedRenderer = 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..b7f1359d2511a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseView.kt
@@ -0,0 +1,87 @@
+/*
+ * 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.graphics.Canvas
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+
+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
+
+    init {
+        layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+    }
+
+    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
+        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
+    }
+}
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..5d70b5295d0fc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseViewController.kt
@@ -0,0 +1,207 @@
+/*
+ * 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.session.PlaybackState
+import com.android.systemui.SystemUIApplication
+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.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 val settingsRepository: PulseSettingsRepository =
+        PulseSettingsRepository(context)
+
+    private val view: PulseView =
+        PulseView(context)
+
+    private val audioProcessor: PulseAudioDataProcessor =
+        PulseAudioDataProcessor(context).apply {
+            setDataListener(this@PulseViewController)
+        }
+
+    val pulseEnabled: Boolean
+        get() = settingsRepository.isPulseEnabled()
+
+    val ambientEnabled: Boolean
+        get() = settingsRepository.isPulseAmbientEnabled()
+
+    private val isCollapsed: Boolean
+        get() = ScrimUtils.get().isPanelFullyCollapsed()
+
+    var pulseRunning: Boolean = false
+        set(value) {
+            if (value == field) return
+            field = value
+            updatePulse(value)
+        }
+
+    init {
+        view.initialize(settingsRepository)
+        settingsRepository.setOnSettingsChangedListener { onSettingsChanged() }
+        settingsRepository.startObserving()
+        onSettingsChanged()
+    }
+
+    fun getPulseView(): PulseView = view
+
+    private fun updateState() {
+        if (!pulseEnabled) {
+            pulseRunning = false
+            return
+        }
+        pulseRunning = isMediaPlaying 
+                && !bouncerShowingOrKeyguardDismissing
+                && isCollapsed
+                && ((keyguardShowing && !isDozing)
+                || (isDozing && ambientEnabled))
+    }
+
+    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
+            pulseRunning = false
+            mainScope.launch {
+                view.setVisibility(false)
+                audioProcessor.stopCapture()
+            }
+        }
+        updateState()
+    }
+
+    private fun updatePulse(show: Boolean) {
+        mainScope.launch {
+            view.setVisibility(show)
+            if (show) audioProcessor.startCapture()
+            else audioProcessor.stopCapture()
+        }
+    }
+
+    override fun onDataUpdate(data: PulseData) {
+        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
+        updateState()
+    }
+
+    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
+        updateState()
+    }
+
+    override fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = goingAway
+        updateState()
+    }
+
+    override fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        bouncerShowingOrKeyguardDismissing = showing
+        updateState()
+    }
+
+    override fun onScreenTurnedOff() {
+        pulseRunning = false
+    }
+
+    override fun onStartedWakingUp() {
+        updateState()
+    }
+
+    override fun onUserChanged() {
+        settingsRepository.invalidateCache()
+        updateState()
+    }
+
+    fun destroy() {
+        pulseRunning = false
+        settingsRepository.stopObserving()
+        if (listenersRegistered) {
+            ScrimUtils.get().removeListener(this)
+            MediaSessionManager.get().removeListener(this)
+            listenersRegistered = false
+        }
+        audioProcessor.cleanup()
+        mainScope.cancel()
+    }
+
+    companion object {
+        private const val TAG = "PulseViewController"
+
+        @JvmStatic
+        fun get(context: Context): PulseViewController {
+            val app = context.applicationContext as SystemUIApplication
+            return app.sysUIComponent.pulseViewController()
+        }
+    }
+}
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..c00522934acb3 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.crdroid.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/HeaderPrivacyIconsController.kt b/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt
index f0b089aa35dea..bd6b63fb0a200 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt
@@ -77,9 +77,6 @@ class HeaderPrivacyIconsController @Inject 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
 
@@ -141,7 +138,6 @@ class HeaderPrivacyIconsController @Inject constructor(
         }
 
         private fun update() {
-            updatePrivacyIconSlots()
             setChipVisibility(privacyChip.privacyList.isNotEmpty())
         }
     }
@@ -164,12 +160,9 @@ class HeaderPrivacyIconsController @Inject 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() {
@@ -205,6 +198,7 @@ class HeaderPrivacyIconsController @Inject constructor(
     }
 
     fun onParentInvisible() {
+        setChipVisibility(false)
         chipVisibilityListener = null
         privacyChip.setOnClickListener(null)
     }
@@ -221,6 +215,7 @@ class HeaderPrivacyIconsController @Inject constructor(
         listening = false
         privacyItemController.removeCallback(picCallback)
         privacyChipLogged = false
+        setChipVisibility(false)
     }
 
     private fun setChipVisibility(visible: Boolean) {
@@ -239,25 +234,4 @@ class HeaderPrivacyIconsController @Inject 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)
-        }
-    }
-}
\ No newline at end of file
+}
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/QSImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSImpl.java
index 1ca3927ace333..430b40db3286d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSImpl.java
@@ -403,6 +403,17 @@ public void onConfigurationChanged(Configuration newConfig) {
             }
         }
         updateQsState();
+        resetOverScrollAmountIfNeeded();
+    }
+
+    public final void resetOverScrollAmountIfNeeded() {
+        View qs = getView();
+        if (qs == null || qs.getTranslationY() == 0.0f 
+                || mBypassController.getBouncerShowing() 
+                || mQsVisible || mStatusBarState == SHADE_LOCKED) {
+            return;
+        }
+        setOverScrollAmount(0);
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt
index 311d4baa5590d..0471c236d7e37 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt
@@ -293,20 +293,19 @@ constructor(
 
     var shouldUpdateSquishinessOnMedia by mutableStateOf(false)
 
-    val qsMediaTranslationY by derivedStateOf {
-        if (
+    val qsMediaTranslationY: Float
+        get() = if (
             qsExpansion > 0f &&
-                !isKeyguardState &&
-                !qqsMediaVisible &&
-                !qsMediaInRow &&
-                !isInSplitShade
+            !isKeyguardState &&
+            !qqsMediaVisible &&
+            !qsMediaInRow &&
+            !isInSplitShade
         ) {
             val interpolation = Interpolators.ACCELERATE.getInterpolation(1f - qsExpansion)
             -qsMediaHost.hostView.height * 1.3f * interpolation
         } else {
             0f
         }
-    }
 
     val animateTilesExpansion: Boolean
         get() = inFirstPage && !mediaSuddenlyAppearingInLandscape
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..51407c14da472 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\$crDroidSettingsLayoutActivity")
+        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 5881aa44bb5f8..97396a402bcc7 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,8 @@
 package com.android.systemui.qs.footer.ui.viewmodel
 
 import android.content.Context
+import android.os.UserHandle
+import android.provider.Settings
 import android.util.Log
 import android.view.ContextThemeWrapper
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -45,6 +47,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.util.icuMessageFormat
 import javax.inject.Inject
 import javax.inject.Named
@@ -129,6 +132,7 @@ class FooterActionsViewModel(
         private val activityStarter: ActivityStarter,
         private val textFeedbackInteractor: TextFeedbackInteractor,
         @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 {
@@ -156,6 +160,7 @@ class FooterActionsViewModel(
                 globalActionsDialogLite,
                 activityStarter,
                 showPowerButton,
+                keyguardStateController,
             )
         }
 
@@ -181,6 +186,7 @@ class FooterActionsViewModel(
                 globalActionsDialogLite,
                 activityStarter,
                 showPowerButton,
+                keyguardStateController,
             )
         }
     }
@@ -194,6 +200,7 @@ fun createFooterActionsViewModel(
     globalActionsDialogLite: GlobalActionsDialogLite,
     activityStarter: ActivityStarter,
     showPowerButton: Boolean,
+    keyguardStateController: KeyguardStateController
 ): FooterActionsViewModel {
     suspend fun observeDeviceMonitoringDialogRequests(quickSettingsContext: Context) {
         footerActionsInteractor.deviceMonitoringDialogRequests.collect {
@@ -243,7 +250,21 @@ fun createFooterActionsViewModel(
         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
         }
@@ -285,7 +306,7 @@ fun createFooterActionsViewModel(
     val userSwitcher =
         userSwitcherViewModel(qsThemedContext, footerActionsInteractor, ::onUserSwitcherClicked)
 
-    val settings = SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked)
+    val settings = SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked, ::onSettingsButtonLongClicked)
 
     val power =
         if (showPowerButton) {
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..4602a43d08b10 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,62 @@
 
 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.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() }
+
+    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/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 c3f401fce71bd..67eb85cc29ac2 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
@@ -80,7 +80,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/infinitegrid/CommonTile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt
index 8f4c10e1f1313..e5ce9a7ea68af 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
@@ -417,6 +417,7 @@ object CommonTileDefaults {
     val TileEndPadding = 12.dp
     val TileDualTargetEndPadding = 8.dp
     val TileArrangementPadding = 6.dp
+    val ActiveTileCornerRadius = 24.dp
     val InactiveCornerRadius = 50.dp
     val TileLabelBlurWidth = 32.dp
     const val TILE_MARQUEE_ITERATIONS = 1
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 635cef3da4b83..ce5ef10639517 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
@@ -159,6 +159,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
@@ -170,6 +171,7 @@ 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.selection.InteractiveTileContainer
 import com.android.systemui.qs.panels.ui.compose.selection.MutableSelectionState
 import com.android.systemui.qs.panels.ui.compose.selection.ResizingState
@@ -857,6 +859,7 @@ private fun LazyGridItemScope.TileGridCell(
             }
         },
         contentDescription = decorationClickLabel,
+        iconOnly = cell.isIcon
     ) {
         val placeableColor = MaterialTheme.colorScheme.primary.copy(alpha = .4f)
         val backgroundColor by
@@ -920,7 +923,7 @@ private fun LazyGridItemScope.TileGridCell(
                 }
                 .selectableTile(cell.tile.tileSpec, selectionState)
                 .thenIf(isReadyToDrag) { draggableModifier }
-                .tileBackground { backgroundColor }
+                .tileBackground ( { backgroundColor }, iconOnly = cell.isIcon )
         ) {
             EditTile(
                 tile = cell.tile,
@@ -1008,7 +1011,7 @@ private fun AvailableTileGridCell(
                         selectionState.unSelect()
                     }
                 }
-            Box(draggableModifier.fillMaxSize().tileBackground { colors.background }) {
+            Box(draggableModifier.fillMaxSize().tileBackground( { colors.background }, iconOnly = true)) {
                 // Icon
                 SmallTileContent(
                     iconProvider = { cell.icon },
@@ -1167,9 +1170,40 @@ 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 shapeMode = rememberTileShapeMode()
+    return if (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 = androidx.compose.ui.geometry.Offset(size.width / 2f, size.height / 2f)
+            )
+        }
+    } else {
+        clip(editTileShape(shapeMode))
+            .drawBehind { drawRect(color()) }
+    }
 }
 
 private object EditModeTileDefaults {
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 458d1f8956b10..9d5259bde8d39 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,39 +20,51 @@ 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.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
@@ -60,9 +72,12 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.onClick
+import androidx.compose.ui.semantics.onLongClick
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
@@ -89,6 +104,7 @@ 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.longPressLabel
@@ -167,24 +183,38 @@ fun ContentScope.Tile(
 
         val colors = TileDefaults.getColorForState(uiState, iconOnly)
         val hapticsViewModel: TileHapticsViewModel? =
-            rememberViewModel(traceName = "TileHapticsViewModel") {
-                tileHapticsViewModelFactoryProvider.getHapticsViewModelFactory()?.create(tile)
+            if (rememberTileHaptic()) {
+                rememberViewModel(traceName = "TileHapticsViewModel") {
+                    tileHapticsViewModelFactoryProvider.getHapticsViewModelFactory()?.create(tile)
+                }
+            } else {
+               null
             }
 
-        // TODO(b/361789146): Draw the shapes instead of clipping
-        val tileShape by TileDefaults.animateTileShapeAsState(uiState.state)
+        val shapeMode = rememberTileShapeMode()
+        val wantCircle = shapeMode == 4 && iconOnly
+        val tileShape =
+            if (wantCircle) CircleShape
+            else TileDefaults.animateTileShapeAsState(uiState.state, shapeMode).value
         val animatedColor by animateColorAsState(colors.background, label = "QSTileBackgroundColor")
         val isDualTarget = uiState.handlesSecondaryClick
 
+        val outerShape = if (wantCircle) RoundedCornerShape(0.dp) else tileShape
+        val outerColor: () -> Color = if (wantCircle) { { Color.Transparent } } else { { animatedColor } }
+        val focusBorderColor = MaterialTheme.colorScheme.secondary
+
         TileExpandable(
-            color = { animatedColor },
-            shape = tileShape,
+            color = outerColor,
+            shape = outerShape,
             squishiness = squishiness,
             hapticsViewModel = hapticsViewModel,
             modifier =
                 modifier
-                    .borderOnFocus(color = MaterialTheme.colorScheme.secondary, tileShape.topEnd)
+                    .thenIf(!wantCircle) { 
+                        modifier.borderOnFocus(color = focusBorderColor, outerShape.topEnd) 
+                    }
                     .fillMaxWidth()
+                    .height(CommonTileDefaults.TileHeight)
                     .bounceable(
                         bounceable = currentBounceableInfo.bounceable,
                         previousBounceable = currentBounceableInfo.previousTile,
@@ -209,9 +239,8 @@ fun ContentScope.Tile(
                         }
                     }
                     .takeIf { !useLongClickToSettings || uiState.handlesLongClick }
-
-            TileContainer(
-                onClick = onClick@{
+            val click: (() -> Unit)? =
+                onClick@{
                         if (!isClickable) return@onClick
 
                         val hasDetails =
@@ -246,58 +275,108 @@ fun ContentScope.Tile(
                             // And show footer text feedback for icons
                             requestToggleTextFeedback(tile.spec)
                         }
-                    },
-                onLongClick = longClick,
-                accessibilityUiState = uiState.accessibilityUiState,
-                iconOnly = iconOnly,
-                isDualTarget = isDualTarget,
-                modifier =
-                    if (verticalFadeContentReveal) {
-                        Modifier.verticalFadeContentReveal(
-                            contentScope = this,
-                            motionBuilderContext = rememberMotionBuilderContext(),
-                            container = QuickSettingsShade.Elements.Panel,
-                        )
-                    } else {
+                }
+
+            if (wantCircle) {
+                val interaction = remember { MutableInteractionSource() }
+
+                Box(Modifier.fillMaxSize()) {
+                    Box(
                         Modifier
-                    },
-            ) {
-                val iconProvider: Context.() -> Icon = { getTileIcon(icon = icon) }
-                if (iconOnly) {
-                    SmallTileContent(
-                        iconProvider = iconProvider,
-                        color = colors.icon,
-                        modifier =
-                            Modifier.align(Alignment.Center).bounceScale {
-                                bounceableInfo.bounceable.iconBounceScale
-                            },
-                    )
-                } else {
-                    val iconShape by TileDefaults.animateIconShapeAsState(uiState.state)
-                    val secondaryClick: (() -> Unit)? =
-                        {
-                                hapticsViewModel?.setTileInteractionState(
-                                    TileHapticsViewModel.TileInteractionState.CLICKED
-                                )
-                                tile.toggleClick()
+                            .size(CommonTileDefaults.TileHeight)
+                            .align(Alignment.Center)
+                            .clip(CircleShape)
+                            .background(animatedColor)
+                            .semantics(mergeDescendants = true) {
+                                role = Role.Button
+                                onClick(label = uiState.label?.toString()) {
+                                    click?.invoke()
+                                    true
+                                }
+                                if (longClick != null) {
+                                    onLongClick(label = uiState.label?.toString()) {
+                                        longClick?.invoke()
+                                        true
+                                    }
+                                }
                             }
-                            .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 = { bounceableInfo.bounceable.textBounceScale },
-                        modifier =
-                            Modifier.largeTilePadding(isDualTarget = uiState.handlesLongClick),
-                    )
+                            .indication(interaction, LocalIndication.current)
+                            .combinedClickable(
+                                interactionSource = interaction,
+                                indication = null,
+                                onClick = { click?.invoke() },
+                                onLongClick = { longClick?.invoke() },
+                                onClickLabel = uiState.accessibilityUiState.clickLabel,
+                                onLongClickLabel = longPressLabel(),
+                                hapticFeedbackEnabled = rememberTileHaptic() && !Flags.msdlFeedback(),
+                            )
+                    ) {
+                        val iconProvider: Context.() -> Icon = { getTileIcon(icon = icon) }
+                        SmallTileContent(
+                            iconProvider = iconProvider,
+                            color = colors.icon,
+                            modifier =
+                                Modifier.align(Alignment.Center).bounceScale {
+                                    bounceableInfo.bounceable.iconBounceScale
+                                },
+                        )
+                    }
+                }
+            } else {
+                TileContainer(
+                    onClick = click,
+                    onLongClick = longClick,
+                    accessibilityUiState = uiState.accessibilityUiState,
+                    iconOnly = iconOnly,
+                    isDualTarget = isDualTarget,
+                    modifier =
+                        if (verticalFadeContentReveal) {
+                            Modifier.verticalFadeContentReveal(
+                                contentScope = this,
+                                motionBuilderContext = rememberMotionBuilderContext(),
+                                container = QuickSettingsShade.Elements.Panel,
+                            )
+                        } else {
+                            Modifier
+                        },
+                ) {
+                    val iconProvider: Context.() -> Icon = { getTileIcon(icon = icon) }
+                    if (iconOnly) {
+                        SmallTileContent(
+                            iconProvider = iconProvider,
+                            color = colors.icon,
+                            modifier =
+                                Modifier.align(Alignment.Center).bounceScale {
+                                    bounceableInfo.bounceable.iconBounceScale
+                                },
+                        )
+                    } else {
+                        val iconShape by TileDefaults.animateIconShapeAsState(uiState.state, shapeMode)
+                        val secondaryClick: (() -> Unit)? =
+                            {
+                                    hapticsViewModel?.setTileInteractionState(
+                                        TileHapticsViewModel.TileInteractionState.CLICKED
+                                    )
+                                    tile.toggleClick()
+                                }
+                                .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 = { bounceableInfo.bounceable.textBounceScale },
+                            modifier =
+                                Modifier.largeTilePadding(isDualTarget = uiState.handlesLongClick),
+                        )
+                    }
                 }
             }
         }
@@ -355,11 +434,13 @@ 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)
+            .clip(TileDefaults.animateTileShapeAsState(state = uiState.state, shapeMode = shapeMode).value)
             .background(colors.background)
             .height(TileHeight)
             .largeTilePadding()
@@ -403,7 +484,7 @@ fun Modifier.tileCombinedClickable(
             onLongClick = onLongClick,
             onClickLabel = accessibilityUiState.clickLabel,
             onLongClickLabel = longPressLabel,
-            hapticFeedbackEnabled = !Flags.msdlFeedback(),
+            hapticFeedbackEnabled = rememberTileHaptic() && !Flags.msdlFeedback(),
         )
         .semantics {
             val accessibilityRole =
@@ -431,9 +512,88 @@ data class TileColors(
     val icon: Color,
 )
 
+@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 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
+}
+
 private object TileDefaults {
     val ActiveIconCornerRadius = 16.dp
-    val ActiveTileCornerRadius = 24.dp
 
     /** An active tile uses the active color as background */
     @Composable
@@ -520,20 +680,22 @@ private object TileDefaults {
     }
 
     @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,
         )
     }
 
@@ -542,14 +704,16 @@ 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
+                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,
             )
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 a1dd79113af34..5f5658742ebf3 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
@@ -70,7 +70,9 @@ 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.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
@@ -86,6 +88,7 @@ import com.android.systemui.qs.panels.ui.compose.selection.TileState.Placeable
 import com.android.systemui.qs.panels.ui.compose.selection.TileState.Removable
 import com.android.systemui.qs.panels.ui.compose.selection.TileState.Selected
 import kotlin.math.cos
+import kotlin.math.min
 import kotlin.math.roundToInt
 import kotlin.math.sin
 
@@ -109,6 +112,7 @@ fun InteractiveTileContainer(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
     contentDescription: String? = null,
+    iconOnly: Boolean,
     content: @Composable BoxScope.() -> Unit = {},
 ) {
     val transition: Transition<TileState> = updateTransition(tileState)
@@ -128,6 +132,7 @@ fun InteractiveTileContainer(
         modifier.resizable(tileState == Selected, resizingState).selectionBorder(
             MaterialTheme.colorScheme.primary,
             SelectedBorderWidth,
+            iconOnly
         ) {
             selectionBorderAlpha
         }
@@ -173,24 +178,55 @@ fun InteractiveTileContainer(
     }
 }
 
+@Composable
 private fun Modifier.selectionBorder(
     selectionColor: Color,
     selectionBorderWidth: Dp,
-    selectionAlpha: () -> Float = { 0f },
+    iconOnly: Boolean,
+    selectionAlpha: () -> Float = { 0f }
 ): Modifier {
+    val shapeMode = rememberTileShapeMode()
+    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 (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/PaginatedGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt
index b3a38fff7f87d..9cbe4007dbe5f 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
@@ -16,11 +16,13 @@
 
 package com.android.systemui.qs.panels.ui.viewmodel
 
+import androidx.compose.runtime.getValue
 import com.android.systemui.classifier.Classifier.QS_SWIPE_SIDE
 import com.android.systemui.classifier.domain.interactor.FalsingInteractor
 import com.android.systemui.development.ui.viewmodel.BuildNumberViewModel
 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
@@ -36,12 +38,19 @@ constructor(
     val buildNumberViewModelFactory: BuildNumberViewModel.Factory,
     val editModeButtonViewModelFactory: EditModeButtonViewModel.Factory,
     private val falsingInteractor: FalsingInteractor,
+    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
+
     fun registerSideSwipeGesture() {
         falsingInteractor.isFalseTouch(QS_SWIPE_SIDE)
     }
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 72eb90875c1bb..d914185f6df49 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
@@ -72,7 +72,7 @@ constructor(
         PowerActionViewModel(context = qsThemedContext, onClick = ::onPowerButtonClicked)
 
     val settingsButtonViewModel =
-        SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked)
+        SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked, ::onSettingsButtonLongClicked)
 
     val userSwitcherViewModel: FooterActionsButtonViewModel? by
         hydrator.hydratedStateOf(
@@ -142,6 +142,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/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index fb46fe3b66460..d54d5d802a5a4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -29,6 +29,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.service.quicksettings.Tile;
@@ -124,8 +125,10 @@ public BluetoothTile(
 
     @Override
     public BooleanState newTileState() {
+        boolean showDialog = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.QS_BT_SHOW_DIALOG, 1, UserHandle.USER_CURRENT) != 0;
         BooleanState s = new BooleanState();
-        s.handlesSecondaryClick = true;
+        s.handlesSecondaryClick = showDialog;
         return s;
     }
 
@@ -160,7 +163,9 @@ private void handleClickWithSatelliteCheck(Runnable clickCallback) {
     }
 
     private void handleClickEvent(@Nullable Expandable expandable) {
-        if (mFeatureFlags.isEnabled(Flags.BLUETOOTH_QS_TILE_DIALOG)) {
+        boolean showDialog = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.QS_BT_SHOW_DIALOG, 1, UserHandle.USER_CURRENT) != 0;
+        if (showDialog && mFeatureFlags.isEnabled(Flags.BLUETOOTH_QS_TILE_DIALOG)) {
             mDetailsContentViewModel.get().showDialog(expandable);
         } else {
             // Secondary clicks are header clicks, just toggle.
@@ -259,7 +264,9 @@ protected void handleUpdateState(BooleanState state, Object arg) {
         }
 
         state.expandedAccessibilityClassName = Button.class.getName();
-        state.forceExpandIcon = mFeatureFlags.isEnabled(Flags.BLUETOOTH_QS_TILE_DIALOG);
+        boolean showDialog = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.QS_BT_SHOW_DIALOG, 1, UserHandle.USER_CURRENT) != 0;
+        state.forceExpandIcon = showDialog && mFeatureFlags.isEnabled(Flags.BLUETOOTH_QS_TILE_DIALOG);
     }
 
     private void toggleBluetooth() {
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..a7ec61cd7b67c
--- /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.CRDROID_SETTINGS;
+    }
+
+    @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 70a568c1332fa..ec625090e3ac9 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
@@ -147,7 +147,6 @@ public CastTile(
     @Override
     public BooleanState newTileState() {
         BooleanState state = new BooleanState();
-        state.handlesLongClick = false;
         return state;
     }
 
@@ -168,12 +167,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..c9d8130b665a3
--- /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.CRDROID_SETTINGS;
+    }
+
+    @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..844527830dc73
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSwitchTile.java
@@ -0,0 +1,297 @@
+/*
+ * 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.
+ */
+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.CRDROID_SETTINGS;
+    }
+
+    /**
+     * 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..714fab5f51352
--- /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.CRDROID_SETTINGS;
+    }
+
+    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..a074f19e76459
--- /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.CRDROID_SETTINGS;
+    }
+
+    @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/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
index 2b127d60b2be4..565e31424d098 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;
     }
 
@@ -100,6 +118,11 @@ public boolean isAvailable() {
 
     @Override
     protected void handleClick(@Nullable Expandable expandable) {
+        handleSecondaryClick(expandable);
+    }
+
+    @Override
+    protected void handleSecondaryClick(@Nullable Expandable expandable) {
         if (ActivityManager.isUserAMonkey()) {
             return;
         }
@@ -115,7 +138,36 @@ public CharSequence getTileLabel() {
 
     @Override
     protected void handleLongClick(@Nullable Expandable expandable) {
-        handleClick(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
@@ -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 e48e943dd3f4d..4b74c293af14b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt
@@ -36,6 +36,7 @@ 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.statusbar.connectivity.AccessPointController
 import com.android.systemui.statusbar.pipeline.shared.ui.binder.InternetTileBinder
@@ -59,6 +60,7 @@ constructor(
     private val internetDialogManager: InternetDialogManager,
     private val accessPointController: AccessPointController,
     private val internetDetailsViewModelFactory: InternetDetailsViewModel.Factory,
+    private val wifiStateWorker: WifiStateWorker,
 ) :
     QSTileImpl<QSTile.BooleanState>(
         host,
@@ -84,7 +86,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 +103,10 @@ constructor(
         }
     }
 
+    override fun handleSecondaryClick(expandable: Expandable?) {
+        wifiStateWorker.setWifiEnabled(!wifiStateWorker.isWifiEnabled())
+    }
+
     override fun getDetailsViewModel(): TileDetailsViewModel {
         return internetDetailsViewModelFactory.create()
     }
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..2dcc8b5596dec
--- /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.CRDROID_SETTINGS;
+    }
+
+    @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/OnTheGoTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/OnTheGoTile.java
new file mode 100644
index 0000000000000..a3b95c882122a
--- /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.crdroid.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.CRDROID_SETTINGS;
+    }
+}
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..0cfad372e0cdd
--- /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 mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
+    }
+
+    @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.CRDROID_SETTINGS;
+    }
+
+    @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.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/RefreshRateTile.kt
new file mode 100644
index 0000000000000..7db8ce3e7a3a8
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RefreshRateTile.kt
@@ -0,0 +1,255 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *               2021 AOSP-Krypton 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.Intent
+import android.database.ContentObserver
+import android.hardware.display.DisplayManager
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.provider.DeviceConfig
+import android.provider.Settings.System.MIN_REFRESH_RATE
+import android.provider.Settings.System.PEAK_REFRESH_RATE
+import android.service.quicksettings.Tile
+import android.util.Log
+import android.view.Display
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent
+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.qs.QSTile.Icon
+import com.android.systemui.plugins.qs.QSTile.State
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.plugins.FalsingManager
+import com.android.systemui.qs.logging.QSLogger
+import com.android.systemui.qs.tileimpl.QSTileImpl
+import com.android.systemui.qs.QSHost
+import com.android.systemui.qs.QsEventLogger
+import com.android.systemui.res.R
+import com.android.systemui.util.settings.SystemSettings
+
+import javax.inject.Inject
+
+class RefreshRateTile @Inject constructor(
+    host: QSHost,
+    uiEventLogger: QsEventLogger,
+    @Background backgroundLooper: Looper,
+    @Main private val mainHandler: Handler,
+    falsingManager: FalsingManager,
+    metricsLogger: MetricsLogger,
+    statusBarStateController: StatusBarStateController,
+    activityStarter: ActivityStarter,
+    qsLogger: QSLogger,
+    private val systemSettings: SystemSettings,
+): QSTileImpl<State>(
+    host,
+    uiEventLogger,
+    backgroundLooper,
+    mainHandler,
+    falsingManager,
+    metricsLogger,
+    statusBarStateController,
+    activityStarter,
+    qsLogger,
+) {
+
+    private val settingsObserver: SettingsObserver
+    private val tileLabel: String
+    private val autoModeLabel: String
+    private val defaultPeakRefreshRate: Float
+
+    private var ignoreSettingsChange = false
+    private var refreshRateMode = Mode.MIN
+    private var peakRefreshRate = DEFAULT_REFRESH_RATE
+
+    init {
+        with (mContext.resources) {
+            tileLabel = getString(R.string.refresh_rate_tile_label)
+            autoModeLabel = getString(R.string.auto_mode_label)
+            defaultPeakRefreshRate = getDefaultPeakRefreshRate(getInteger(
+                com.android.internal.R.integer.config_defaultPeakRefreshRate).toFloat())
+        }
+
+        val display: Display? = mContext.getSystemService(
+                DisplayManager::class.java)!!.getDisplay(Display.DEFAULT_DISPLAY)
+        display?.let {
+            it.getSupportedModes().forEach({ mode ->
+                mode.refreshRate.let { rr ->
+                    if (rr > peakRefreshRate) peakRefreshRate = rr
+                }
+            })
+        } ?: run { Log.w(Companion.TAG, "No valid default display") }
+        logD("peakRefreshRate = $peakRefreshRate, defaultPeakRefreshRate = $defaultPeakRefreshRate")
+        settingsObserver = SettingsObserver()
+    }
+
+    override fun newTileState() =
+        State().also {
+            it.icon = icon
+            it.state = Tile.STATE_ACTIVE
+        }
+
+    override fun getLongClickIntent() = displaySettingsIntent
+
+    override fun isAvailable(): Boolean {
+        val displayManager = mContext.getSystemService(DisplayManager::class.java)
+        val display: Display? = displayManager?.getDisplay(Display.DEFAULT_DISPLAY)
+        display?.let {
+            val supportedRefreshRates = it.supportedModes.map { mode -> mode.refreshRate }.distinct()
+            return supportedRefreshRates.size > 1
+        }
+        return false
+    }
+
+    override fun getTileLabel(): CharSequence = tileLabel
+
+    override protected fun handleInitialize() {
+        logD("handleInitialize")
+        updateMode()
+        settingsObserver.observe()
+    }
+
+    override protected fun handleClick(expandable: Expandable?) {
+        logD("handleClick")
+        refreshRateMode = getNextMode(refreshRateMode)
+        logD("refreshRateMode = $refreshRateMode")
+        updateRefreshRateForMode(refreshRateMode)
+        refreshState()
+    }
+
+    override protected fun handleUpdateState(state: State, arg: Any?) {
+        if (state.label == null) {
+            state.label = tileLabel
+            state.contentDescription = tileLabel
+        }
+        logD("handleUpdateState, state = $state")
+        state.secondaryLabel = getTitleForMode(refreshRateMode)
+        logD("secondaryLabel = ${state.secondaryLabel}")
+    }
+
+    override fun getMetricsCategory(): Int = MetricsEvent.CRDROID_SETTINGS
+
+    override fun destroy() {
+        settingsObserver.unobserve()
+        super.destroy()
+    }
+
+    private fun updateMode() {
+        val minRate = systemSettings.getFloat(MIN_REFRESH_RATE, DEFAULT_REFRESH_RATE)
+        val maxRate = systemSettings.getFloat(PEAK_REFRESH_RATE, defaultPeakRefreshRate)
+        logD("minRate = $minRate, maxRate = $maxRate")
+
+        if (minRate == maxRate) {
+            if (minRate == DEFAULT_REFRESH_RATE) refreshRateMode = Mode.MIN
+            else refreshRateMode = Mode.MAX
+        } else {
+            refreshRateMode = Mode.AUTO
+        }
+        logD("refreshRateMode = $refreshRateMode")
+    }
+
+    private fun getDefaultPeakRefreshRate(def: Float): Float {
+        return DeviceConfig.getFloat(DeviceConfig.NAMESPACE_DISPLAY_MANAGER,
+            DisplayManager.DeviceConfig.KEY_PEAK_REFRESH_RATE_DEFAULT, def)
+    }
+
+    private fun getNextMode(mode: Mode) =
+        when (mode) {
+            Mode.AUTO -> Mode.MIN
+            Mode.MIN -> Mode.MAX
+            Mode.MAX -> Mode.AUTO
+        }
+
+    private fun updateRefreshRateForMode(mode: Mode) {
+        logD("updateRefreshRateForMode, mode = $mode")
+        var minRate: Float; var maxRate: Float
+        when (mode) {
+            Mode.AUTO -> {
+                minRate = DEFAULT_REFRESH_RATE
+                maxRate = peakRefreshRate
+            }
+            Mode.MAX -> {
+                minRate = peakRefreshRate
+                maxRate = peakRefreshRate
+            }
+            Mode.MIN -> {
+                minRate = DEFAULT_REFRESH_RATE
+                maxRate = DEFAULT_REFRESH_RATE
+            }
+        }
+        ignoreSettingsChange = true
+        systemSettings.putFloat(MIN_REFRESH_RATE, minRate)
+        systemSettings.putFloat(PEAK_REFRESH_RATE, maxRate)
+        ignoreSettingsChange = false
+    }
+
+    private fun getTitleForMode(mode: Mode) =
+        when (mode) {
+            Mode.AUTO -> autoModeLabel
+            Mode.MAX -> peakRefreshRate.toInt().toString() + "Hz"
+            Mode.MIN -> DEFAULT_REFRESH_RATE.toInt().toString() + "Hz"
+        }
+
+    private enum class Mode {
+        MIN,
+        MAX,
+        AUTO,
+    }
+
+    private inner class SettingsObserver: ContentObserver(mainHandler) {
+        private var isObserving = false
+
+        override fun onChange(selfChange: Boolean, uri: Uri?) {
+            if (!ignoreSettingsChange) updateMode()
+        }
+
+        fun observe() {
+            if (isObserving) return
+            isObserving = true
+            systemSettings.registerContentObserverSync(MIN_REFRESH_RATE, this)
+            systemSettings.registerContentObserverSync(PEAK_REFRESH_RATE, this)
+        }
+
+        fun unobserve() {
+            if (!isObserving) return
+            isObserving = false
+            systemSettings.unregisterContentObserverSync(this)
+        }
+    }
+
+    companion object {
+        const val TILE_SPEC = "refresh_rate"
+        private const val TAG = "RefreshRateTile"
+        private const val DEBUG = false
+
+        private const val DEFAULT_REFRESH_RATE = 60f
+
+        private val icon: Icon = ResourceIcon.get(R.drawable.ic_refresh_rate)
+        private val displaySettingsIntent = Intent().setComponent(ComponentName("com.android.settings",
+            "com.android.settings.Settings\$DisplaySettingsActivity"))
+
+        private fun logD(msg: String) {
+            if (DEBUG) Log.d(TAG, msg)
+        }
+    }
+}
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..2cbd2b1ec2043
--- /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.CRDROID_SETTINGS;
+    }
+
+    @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/SmartPixelsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/SmartPixelsTile.java
new file mode 100644
index 0000000000000..556e4b41716cb
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/SmartPixelsTile.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2018 CarbonROM
+ * Copyright (C) 2018 Adin Kwok (adinkwok)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.PowerManager;
+import android.os.UserHandle;
+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.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.BatteryController;
+
+import javax.inject.Inject;
+
+public class SmartPixelsTile extends QSTileImpl<BooleanState> implements
+        BatteryController.BatteryStateChangeCallback {
+
+    public static final String TILE_SPEC = "smartpixels";
+
+
+    private static final Intent SMART_PIXELS_SETTINGS = new Intent("android.settings.SMART_PIXELS_SETTINGS");
+
+    private final BatteryController mBatteryController;
+
+    private boolean mSmartPixelsEnable;
+    private boolean mSmartPixelsOnPowerSave;
+    private boolean mLowPowerMode;
+    private boolean mListening;
+
+    @Nullable
+    private Icon mIcon = null;
+
+    @Inject
+    public SmartPixelsTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            BatteryController batteryController) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        mBatteryController = batteryController;
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        if (listening) {
+            mBatteryController.addCallback(this);
+        } else {
+            mBatteryController.removeCallback(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSmartPixels);
+    }
+
+    @Override
+    public void handleClick(@Nullable Expandable expandable) {
+        mSmartPixelsEnable = (Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.SMART_PIXELS_ENABLE,
+                0, UserHandle.USER_CURRENT) == 1);
+        mSmartPixelsOnPowerSave = (Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                0, UserHandle.USER_CURRENT) == 1);
+        if (mLowPowerMode && mSmartPixelsOnPowerSave) {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                    0, UserHandle.USER_CURRENT);
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ENABLE,
+                    0, UserHandle.USER_CURRENT);
+        } else if (!mSmartPixelsEnable) {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ENABLE,
+                    1, UserHandle.USER_CURRENT);
+        } else {
+            Settings.System.putIntForUser(mContext.getContentResolver(),
+                    Settings.System.SMART_PIXELS_ENABLE,
+                    0, UserHandle.USER_CURRENT);
+        }
+        refreshState();
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return SMART_PIXELS_SETTINGS;
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        mSmartPixelsEnable = (Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.SMART_PIXELS_ENABLE,
+                0, UserHandle.USER_CURRENT) == 1);
+        mSmartPixelsOnPowerSave = (Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                0, UserHandle.USER_CURRENT) == 1);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_smart_pixels);
+        }
+        state.icon  = mIcon;
+        if (mLowPowerMode && mSmartPixelsOnPowerSave) {
+            state.label = mContext.getString(R.string.quick_settings_smart_pixels_on_power_save);
+            state.value = true;
+        } else if (mSmartPixelsEnable) {
+            state.label = mContext.getString(R.string.quick_settings_smart_pixels);
+            state.value = true;
+        } else {
+            state.label = mContext.getString(R.string.quick_settings_smart_pixels);
+            state.value = false;
+        }
+        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_smart_pixels);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CRDROID_SETTINGS;
+    }
+
+    @Override
+    public void onBatteryLevelChanged(int level, boolean plugged, boolean charging) {
+        // yurt
+    }
+
+    @Override
+    public void onPowerSaveChanged(boolean active) {
+        mLowPowerMode = active;
+        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..160fa1ef2603a
--- /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.CRDROID_SETTINGS;
+    }
+}
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..25ae3718e039e
--- /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.CRDROID_SETTINGS;
+    }
+
+    @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..6bcc8bf544a3a
--- /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.crdroid.OmniJawsClient;
+import com.android.internal.util.crdroid.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.CRDROID_SETTINGS;
+    }
+
+    @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/dialog/FlashlightDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/FlashlightDialogDelegate.kt
new file mode 100644
index 0000000000000..30e919babcbac
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/FlashlightDialogDelegate.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2025 Neoteric OS
+             (C) 2024-2025 The Clover 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.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.widget.Button
+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)
+                slider.isEnabled = 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 = flashlightController.isEnabled()
+        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/InternetDetailsContentController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java
index 24555f6563dc7..d07e32a1b760d 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
@@ -37,13 +37,16 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.net.ConnectivityManager;
+import android.net.INetworkPolicyListener;
 import android.net.Network;
 import android.net.NetworkCapabilities;
+import android.net.NetworkPolicyManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.sysprop.TelephonyProperties;
 import android.telephony.AccessNetworkConstants;
 import android.telephony.NetworkRegistrationInfo;
 import android.telephony.ServiceState;
@@ -68,6 +71,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;
@@ -91,6 +95,7 @@
 import com.android.systemui.res.R;
 import com.android.systemui.shade.ShadeDisplayAware;
 import com.android.systemui.statusbar.connectivity.AccessPointController;
+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.toast.SystemUIToast;
@@ -209,6 +214,9 @@ public class InternetDetailsContentController implements AccessPointController.A
     private boolean mHasActiveSubIdOnDds;
     private boolean mIsMobileDataEnabled = false;
 
+    private final HotspotController mHotspotController;
+    private final NetworkPolicyManager mPolicyManager;
+
     @VisibleForTesting
     Map<Integer, ServiceState> mSubIdServiceState = new HashMap<>();
     @VisibleForTesting
@@ -269,6 +277,26 @@ public void onSimStateChanged(int subId, int slotId, int simState) {
                 }
             };
 
+    private final HotspotController.Callback mHotspotCallback =
+            new HotspotController.Callback() {
+                @Override
+                public void onHotspotChanged(boolean enabled, int numDevices) {
+                    mCallback.onHotspotChanged();
+                }
+
+                @Override
+                public void onHotspotAvailabilityChanged(boolean available) {
+                    mCallback.onHotspotChanged();
+                }
+            };
+
+    private final INetworkPolicyListener mPolicyListener = new NetworkPolicyManager.Listener() {
+        @Override
+        public void onRestrictBackgroundChanged(final boolean isDataSaving) {
+            mCallback.onHotspotChanged();
+        }
+    };
+
     protected List<SubscriptionInfo> getSubscriptionInfo() {
         return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();
     }
@@ -286,6 +314,7 @@ public InternetDetailsContentController(@ShadeDisplayAware Context context,
             @Background Handler workerHandler, CarrierConfigTracker carrierConfigTracker,
             LocationController locationController,
             DialogTransitionAnimator dialogTransitionAnimator, WifiStateWorker wifiStateWorker,
+            HotspotController hotspotController,
             FeatureFlags featureFlags) {
         if (DEBUG) {
             Log.d(TAG, "Init InternetDetailsContentController");
@@ -320,6 +349,8 @@ public InternetDetailsContentController(@ShadeDisplayAware Context context,
         mDialogTransitionAnimator = dialogTransitionAnimator;
         mConnectedWifiInternetMonitor = new ConnectedWifiInternetMonitor();
         mWifiStateWorker = wifiStateWorker;
+        mHotspotController = hotspotController;
+        mPolicyManager = NetworkPolicyManager.from(context);
         mFeatureFlags = featureFlags;
     }
 
@@ -332,6 +363,8 @@ void onStart(@NonNull InternetDialogCallback callback, boolean canConfigWifi) {
         mAccessPointController.addAccessPointCallback(this);
         mBroadcastDispatcher.registerReceiver(mConnectionStateReceiver, mConnectionStateFilter,
                 mExecutor);
+        mHotspotController.addCallback(mHotspotCallback);
+        mPolicyManager.registerListener(mPolicyListener);
         // Listen the subscription changes
         mOnSubscriptionsChangedListener = new InternetOnSubscriptionChangedListener();
         refreshHasActiveSubIdOnDds();
@@ -346,7 +379,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();
 
@@ -382,6 +419,8 @@ void onStop() {
         mConnectivityManager.unregisterNetworkCallback(mConnectivityManagerNetworkCallback);
         mConnectedWifiInternetMonitor.unregisterCallback();
         mCallback = null;
+        mHotspotController.removeCallback(mHotspotCallback);
+        mPolicyManager.unregisterListener(mPolicyListener);
 
         if (mSatelliteManager != null) {
             try {
@@ -417,7 +456,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
@@ -870,6 +918,12 @@ void launchWifiScanningSetting(View view) {
         startActivity(intent, view);
     }
 
+    void launchHotspotSetting(View view) {
+        final Intent intent = new Intent(Settings.ACTION_WIFI_TETHER_SETTING);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent, view);
+    }
+
     /**
      * Enable or disable Wi-Fi.
      *
@@ -1001,7 +1055,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);
@@ -1075,6 +1129,44 @@ void setAutoDataSwitchMobileDataPolicy(int subId, boolean enable) {
         tm.setMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH, enable);
     }
 
+    boolean isFivegSupported() {
+        if (!mContext.getResources().getBoolean(R.bool.config_supportsVONR))
+            return false;
+
+        List<Integer> list = TelephonyProperties.default_network();
+        for (int type : list) {
+            if (type > 22)
+                return true;
+        }
+        return false;
+    }
+
+    boolean isFivegEnabled() {
+        if (mTelephonyManager == null
+            || (mTelephonyManager.getAllowedNetworkTypesForReason(
+                    TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER)
+                & TelephonyManager.NETWORK_TYPE_BITMASK_NR) == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    void setFivegEnabled(boolean enabled) {
+        if (mTelephonyManager == null)
+            return;
+
+        long newType = mTelephonyManager.getAllowedNetworkTypesForReason(
+            TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER);
+        if (enabled)
+            newType |= TelephonyManager.NETWORK_TYPE_BITMASK_NR;
+        else
+            newType &= ~TelephonyManager.NETWORK_TYPE_BITMASK_NR;
+
+        mTelephonyManager.setAllowedNetworkTypesForReason(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
+                newType);
+    }
+
     boolean isDataStateInService(int subId) {
         final ServiceState serviceState = mSubIdServiceState.getOrDefault(subId,
                 new ServiceState());
@@ -1099,7 +1191,7 @@ boolean isVoiceStateInService(int subId) {
     }
 
     public boolean isDeviceLocked() {
-        return !mKeyguardStateController.isUnlocked();
+        return false;
     }
 
     int getCurrentSatelliteState() {
@@ -1127,6 +1219,30 @@ boolean activeNetworkIsCellular() {
         return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
     }
 
+    boolean isHotspotAvailable() {
+        return mHotspotController.isHotspotSupported();
+    }
+
+    boolean isHotspotEnabled() {
+        return mHotspotController.isHotspotEnabled();
+    }
+
+    boolean isHotspotTransient() {
+        return mHotspotController.isHotspotTransient();
+    }
+
+    int getHotspotNumDevices() {
+        return mHotspotController.getNumConnectedDevices();
+    }
+
+    void setHotspotEnabled(boolean enabled) {
+        mHandler.post(() -> mHotspotController.setHotspotEnabled(enabled));
+    }
+
+    boolean isDataSaverEnabled() {
+        return mPolicyManager.getRestrictBackground();
+    }
+
     boolean connect(WifiEntry ap) {
         if (ap == null) {
             if (DEBUG) {
@@ -1498,6 +1614,8 @@ void onAccessPointsChanged(@Nullable List<WifiEntry> wifiEntries,
         void onWifiScan(boolean isScan);
 
         void onSatelliteModemStateChanged(int state);
+
+        void onHotspotChanged();
     }
 
     void makeOverlayToast(int stringId) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt
index d504901e18659..cca2e7833332e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt
@@ -990,6 +990,10 @@ constructor(
                 updateContent(shouldUpdateMobileNetwork = true)
             }
 
+            override fun onHotspotChanged() {
+                updateContent(shouldUpdateMobileNetwork = true)
+            }
+
             override fun dismissDialog() {
                 // With the dialog, this would be implemented to close the internet dialog. As this
                 // details view is embedded within the QS panel, collapsing is handled by System UI.
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 4bcd74c971dc6..067f9105ff4fa 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
@@ -20,12 +20,15 @@
 import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.MAX_WIFI_ENTRY_COUNT;
 import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.SATELLITE_NOT_STARTED;
 import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.SATELLITE_STARTED;
+import static com.android.systemui.util.PluralMessageFormaterKt.icuMessageFormat;
 
 import android.app.AlertDialog;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Network;
 import android.net.NetworkCapabilities;
+import android.net.wifi.SoftApConfiguration;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.telephony.ServiceState;
@@ -40,6 +43,7 @@
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.Window;
 import android.view.WindowManager;
@@ -49,6 +53,7 @@
 import android.widget.ProgressBar;
 import android.widget.Switch;
 import android.widget.TextView;
+import com.android.settingslib.Utils;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
@@ -123,6 +128,7 @@ public class InternetDialogDelegateLegacy implements
     private final InternetDialogManager mInternetDialogManager;
     @Nullable
     private AlertDialog mAlertDialog;
+    private Context mContext;
     private final UiEventLogger mUiEventLogger;
     private final InternetDetailsContentController mInternetDetailsContentController;
     private TextView mInternetDialogTitle;
@@ -134,6 +140,7 @@ public class InternetDialogDelegateLegacy implements
     private LinearLayout mSecondaryMobileNetworkLayout;
     private LinearLayout mTurnWifiOnLayout;
     private LinearLayout mEthernetLayout;
+    private LinearLayout mHotspotLayout;
     private TextView mWifiToggleTitleText;
     private LinearLayout mWifiScanNotifyLayout;
     private TextView mWifiScanNotifyText;
@@ -149,13 +156,25 @@ public class InternetDialogDelegateLegacy implements
     private TextView mAirplaneModeSummaryText;
     private Switch mMobileDataToggle;
     private View mMobileToggleDivider;
+    private View mMobileConnectedSpace;
+    private LinearLayout mFivegLayout;
+    private ImageView mFivegIcon;
+    private TextView mFivegTitleText;
+    private Switch mFivegToggle;
+    private View mFivegToggleDivider;
+    private ImageView mHotspotIcon;
+    private TextView mHotspotTitleText;
+    private TextView mHotspotSummaryText;
+    private Switch mHotspotToggle;
     private Switch mWiFiToggle;
+    private View mWifiConnectedSpace;
     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;
@@ -186,6 +205,9 @@ public class InternetDialogDelegateLegacy implements
     @VisibleForTesting
     MutableLiveData<InternetContent> mDataInternetContent = new MutableLiveData<>();
 
+    // 5g toggle
+    private final boolean mShouldShowFivegToggle;
+
     @AssistedFactory
     public interface Factory {
         InternetDialogDelegateLegacy create(
@@ -226,6 +248,7 @@ public InternetDialogDelegateLegacy(
         }
 
         // Save the context that is wrapped with our theme.
+        mContext = context;
         mHandler = handler;
         mBackgroundExecutor = executor;
         mInternetDialogManager = internetDialogManager;
@@ -239,6 +262,7 @@ public InternetDialogDelegateLegacy(
         mUiEventLogger = uiEventLogger;
         mDialogTransitionAnimator = dialogTransitionAnimator;
         mAdapter = new InternetAdapter(mInternetDetailsContentController, coroutineScope);
+        mShouldShowFivegToggle = mInternetDetailsContentController.isFivegSupported();
     }
 
     @Override
@@ -292,6 +316,7 @@ public void onCreate(SystemUIDialog dialog, Bundle savedInstanceState) {
         mProgressBar = mDialogView.requireViewById(R.id.wifi_searching_progress);
         mEthernetLayout = mDialogView.requireViewById(R.id.ethernet_layout);
         mMobileNetworkLayout = mDialogView.requireViewById(R.id.mobile_network_layout);
+        mHotspotLayout = mDialogView.requireViewById(R.id.hotspot_layout);
         mTurnWifiOnLayout = mDialogView.requireViewById(R.id.turn_on_wifi_layout);
         mWifiToggleTitleText = mDialogView.requireViewById(R.id.wifi_toggle_title);
         mWifiScanNotifyLayout = mDialogView.requireViewById(R.id.wifi_scan_notify_layout);
@@ -312,12 +337,25 @@ public void onCreate(SystemUIDialog dialog, Bundle savedInstanceState) {
         mAirplaneModeSummaryText = mDialogView.requireViewById(R.id.airplane_mode_summary);
         mMobileToggleDivider = mDialogView.requireViewById(R.id.mobile_toggle_divider);
         mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_toggle);
+        mMobileConnectedSpace = mDialogView.requireViewById(R.id.mobile_connected_space);
+        mFivegLayout = mDialogView.requireViewById(R.id.fiveg_layout);
+        mFivegIcon = mDialogView.requireViewById(R.id.fiveg_icon);
+        mFivegTitleText = mDialogView.requireViewById(R.id.fiveg_title);
+        mFivegToggleDivider = mDialogView.requireViewById(R.id.fiveg_toggle_divider);
+        mFivegToggle = mDialogView.requireViewById(R.id.fiveg_toggle);
+        mHotspotIcon = mDialogView.requireViewById(R.id.hotspot_icon);
+        mHotspotTitleText = mDialogView.requireViewById(R.id.hotspot_title);
+        mHotspotSummaryText = mDialogView.requireViewById(R.id.hotspot_summary);
+        mHotspotToggle = mDialogView.requireViewById(R.id.hotspot_toggle);
         mWiFiToggle = mDialogView.requireViewById(R.id.wifi_toggle);
+        mWifiConnectedSpace = mDialogView.requireViewById(R.id.wifi_connected_space);
         mBackgroundOn = context.getDrawable(R.drawable.settingslib_switch_bar_bg_on);
         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);
+        setHotspotLayout();
         mTurnWifiOnLayout.setBackground(null);
         mAirplaneModeButton.setVisibility(
                 mInternetDetailsContentController.isAirplaneModeEnabled() ? View.VISIBLE
@@ -360,13 +398,16 @@ public void onStop(SystemUIDialog dialog) {
         mLifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
         mMobileNetworkLayout.setOnClickListener(null);
         mMobileNetworkLayout.setOnLongClickListener(null);
+        mFivegToggle.setOnCheckedChangeListener(null);
+        mHotspotLayout.setOnClickListener(null);
+        mHotspotToggle.setOnClickListener(null);
         mMobileDataToggle.setOnClickListener(null);
         mConnectedWifListLayout.setOnClickListener(null);
         if (mSecondaryMobileNetworkLayout != null) {
             mSecondaryMobileNetworkLayout.setOnClickListener(null);
         }
         mSeeAllLayout.setOnClickListener(null);
-        mWiFiToggle.setOnCheckedChangeListener(null);
+        mWiFiToggle.setOnClickListener(null);
         mDoneButton.setOnClickListener(null);
         mShareWifiButton.setOnClickListener(null);
         mAirplaneModeButton.setOnClickListener(null);
@@ -447,7 +488,7 @@ private InternetContent getInternetContent(boolean shouldUpdateMobileNetwork) {
         internetContent.mCurrentSatelliteState =
                 mInternetDetailsContentController.getCurrentSatelliteState();
         internetContent.mDefaultSubSignalStrengthIcon =
-                mInternetDetailsContentController.getSignalStrengthDrawable(mDefaultDataSubId);
+                mInternetDetailsContentController.getSignalStrengthDrawable(mDefaultDataSubId).mutate();
 
         return internetContent;
     }
@@ -490,6 +531,13 @@ private void setOnClickListener(SystemUIDialog dialog) {
                         dialog.getContext(), mDefaultDataSubId, isChecked, false);
             }
         });
+        mFivegToggle.setOnClickListener(v -> {
+            mInternetDetailsContentController.setFivegEnabled(mFivegToggle.isChecked());
+        });
+        mHotspotLayout.setOnClickListener(mInternetDetailsContentController::launchHotspotSetting);
+        mHotspotToggle.setOnClickListener(v -> {
+            mInternetDetailsContentController.setHotspotEnabled(mHotspotToggle.isChecked());
+        });
         mConnectedWifListLayout.setOnClickListener(this::onClickConnectedWifi);
         mSeeAllLayout.setOnClickListener(this::onClickSeeMoreButton);
         mWiFiToggle.setOnClickListener(v -> {
@@ -597,6 +645,8 @@ private void setMobileDataLayout(SystemUIDialog dialog, InternetContent internet
 
                 mSignalIcon.setImageDrawable(internetContent.mDefaultSubSignalStrengthIcon);
 
+                mMobileConnectedSpace.setVisibility(
+                        isNetworkConnected ? View.VISIBLE : View.GONE);
                 mMobileDataToggle.setVisibility(
                         mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);
                 mMobileToggleDivider.setVisibility(
@@ -605,6 +655,18 @@ private void setMobileDataLayout(SystemUIDialog dialog, InternetContent internet
                         ? R.color.connected_network_primary_color
                         : R.color.disconnected_network_primary_color;
                 mMobileToggleDivider.setBackgroundColor(context.getColor(primaryColor));
+
+                mFivegLayout.setVisibility(mShouldShowFivegToggle ? View.VISIBLE : View.GONE);
+                boolean enabled = mInternetDetailsContentController.isFivegEnabled();
+                if (mFivegToggle.isChecked() != enabled) {
+                    mFivegToggle.setChecked(enabled);
+                }
+                mFivegTitleText.setText(dialog.getContext().getText(R.string.enable_fiveg));
+                mFivegToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);
+                mFivegToggleDivider.setVisibility(
+                        mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);
+                mFivegToggleDivider.setBackgroundColor(dialog.getContext().getColor(primaryColor));
+
                 // Display the info for the non-DDS if it's actively being used
                 int autoSwitchNonDdsSubId = internetContent.mActiveAutoSwitchNonDdsSubId;
 
@@ -626,7 +688,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);
@@ -677,6 +739,12 @@ private void setMobileDataLayout(SystemUIDialog dialog, InternetContent internet
                             R.style.TextAppearance_InternetDialog_Active
                             : R.style.TextAppearance_InternetDialog);
                     mMobileSummaryText.setTextAppearance(secondaryRes);
+                    mFivegIcon.getDrawable().setTint(
+                            isNetworkConnected ? dialog.getContext().getColor(R.color.connected_network_primary_color)
+                            : Utils.getColorAttrDefaultColor(dialog.getContext(), android.R.attr.textColorTertiary));
+                     mFivegTitleText.setTextAppearance(isNetworkConnected ?
+                            R.style.TextAppearance_InternetDialog_Active
+                            : R.style.TextAppearance_InternetDialog);
                 }
 
                 if (mSecondaryMobileNetworkLayout != null) {
@@ -696,6 +764,29 @@ private void setMobileDataLayout(SystemUIDialog dialog, InternetContent internet
         }
     }
 
+    private void setHotspotLayout() {
+        if (!mInternetDetailsContentController.isHotspotAvailable()) {
+            mHotspotLayout.setVisibility(View.GONE);
+            return;
+        }
+        mHotspotLayout.setVisibility(View.VISIBLE);
+        mHotspotTitleText.setText(getHotspotTitle());
+        mHotspotSummaryText.setText(getHotspotSummary());
+
+        boolean enabled = mInternetDetailsContentController.isHotspotEnabled();
+        mHotspotIcon.setImageResource(enabled ? R.drawable.ic_internet_hotspot
+                : R.drawable.ic_internet_hotspot_disabled);
+        if (mHotspotToggle.isChecked() != enabled &&
+                !mInternetDetailsContentController.isHotspotTransient()) {
+            mHotspotToggle.setChecked(enabled);
+        }
+
+        boolean dataSaver = mInternetDetailsContentController.isDataSaverEnabled();
+        mHotspotTitleText.setEnabled(!dataSaver);
+        mHotspotSummaryText.setEnabled(!dataSaver);
+        mHotspotToggle.setEnabled(!dataSaver);
+    }
+
     @MainThread
     private void updateWifiToggle(InternetContent internetContent) {
         if (mWiFiToggle.isChecked() != internetContent.mIsWifiEnabled) {
@@ -706,9 +797,15 @@ private void updateWifiToggle(InternetContent internetContent) {
                     ? R.style.TextAppearance_InternetDialog_Active
                     : R.style.TextAppearance_InternetDialog);
         }
-        mTurnWifiOnLayout.setBackground(
-                (internetContent.mIsDeviceLocked && mConnectedWifiEntry != null) ? mBackgroundOn
-                        : null);
+
+        boolean showBackground = internetContent.mIsDeviceLocked && mConnectedWifiEntry != null;
+        ViewGroup.LayoutParams lp = mTurnWifiOnLayout.getLayoutParams();
+        lp.height = mContext.getResources().getDimensionPixelSize(
+                showBackground ? R.dimen.internet_dialog_wifi_network_height
+                : R.dimen.internet_dialog_wifi_toggle_height);
+        mTurnWifiOnLayout.setLayoutParams(lp);
+        mTurnWifiOnLayout.setBackground(showBackground ? mBackgroundOn : null);
+        mWifiConnectedSpace.setVisibility(showBackground ? View.VISIBLE : View.GONE);
 
         if (!mCanChangeWifiState && mWiFiToggle.isEnabled()) {
             mWiFiToggle.setEnabled(false);
@@ -839,6 +936,35 @@ String getMobileNetworkSummary(int subId) {
         return mInternetDetailsContentController.getMobileNetworkSummary(subId);
     }
 
+    private CharSequence getHotspotTitle() {
+        final WifiManager wifiManager = mInternetDetailsContentController.getWifiManager();
+        if (wifiManager != null) {
+            final SoftApConfiguration softApConfig = wifiManager.getSoftApConfiguration();
+            if (softApConfig != null) {
+                return softApConfig.getSsid();
+            }
+        }
+        return mContext.getString(R.string.quick_settings_hotspot_label);
+    }
+
+    String getHotspotSummary() {
+        if (mInternetDetailsContentController.isDataSaverEnabled()) {
+            return mContext.getString(
+                    R.string.quick_settings_hotspot_secondary_label_data_saver_enabled);
+        } else if (mInternetDetailsContentController.isHotspotTransient()) {
+            return mContext.getString(R.string.quick_settings_hotspot_secondary_label_transient);
+        } else if (mInternetDetailsContentController.isHotspotEnabled()) {
+            int numDevices = mInternetDetailsContentController.getHotspotNumDevices();
+            if (numDevices > 0) {
+                return mContext.getResources().getQuantityString(
+                        R.plurals.quick_settings_internet_hotspot_summary_num_devices,
+                        numDevices, numDevices);
+            }
+            return mContext.getString(R.string.switch_bar_on);
+        }
+        return mContext.getString(R.string.switch_bar_off);
+    }
+
     private void setProgressBarVisible(boolean visible) {
         if (mIsProgressBarVisible == visible) {
             return;
@@ -1014,6 +1140,11 @@ public void onSatelliteModemStateChanged(int state) {
         updateDialog(true /* shouldUpdateMobileNetwork */);
     }
 
+    @Override
+    public void onHotspotChanged() {
+        setHotspotLayout();
+    }
+
     @Override
     public void onWindowFocusChanged(SystemUIDialog dialog, boolean hasFocus) {
         if (mAlertDialog != null && !mAlertDialog.isShowing()) {
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..ab2bb5baa2b46 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/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
index a1281ec23f92b..d83ccfc16f206 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
@@ -302,16 +302,20 @@ && hasSoftNavigationBar(mContext.getDisplayId()) && !isLargeScreen(mContext)) {
                 mLayout.findViewById(R.id.screen_pinning_recents_group).setVisibility(VISIBLE);
                 mLayout.findViewById(R.id.screen_pinning_home_bg_light).setVisibility(INVISIBLE);
                 mLayout.findViewById(R.id.screen_pinning_home_bg).setVisibility(INVISIBLE);
-                descriptionStringResId = touchExplorationEnabled
-                        ? R.string.screen_pinning_description_accessible
-                        : R.string.screen_pinning_description;
+                descriptionStringResId = !hasSoftNavigationBar(displayId)
+                        ? R.string.screen_pinning_description_no_navbar
+                        : touchExplorationEnabled
+                                ? R.string.screen_pinning_description_accessible
+                                : R.string.screen_pinning_description;
             } else {
                 mLayout.findViewById(R.id.screen_pinning_recents_group).setVisibility(INVISIBLE);
                 mLayout.findViewById(R.id.screen_pinning_home_bg_light).setVisibility(VISIBLE);
                 mLayout.findViewById(R.id.screen_pinning_home_bg).setVisibility(VISIBLE);
-                descriptionStringResId = touchExplorationEnabled
-                        ? R.string.screen_pinning_description_recents_invisible_accessible
-                        : R.string.screen_pinning_description_recents_invisible;
+                descriptionStringResId = !hasSoftNavigationBar(displayId)
+                        ? R.string.screen_pinning_description_no_navbar
+                        : touchExplorationEnabled
+                                ? R.string.screen_pinning_description_recents_invisible_accessible
+                                : R.string.screen_pinning_description_recents_invisible;
             }
 
             NavigationBarView navigationBarView =
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 892b766f1f973..9faffd5111676 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;
@@ -57,6 +59,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;
@@ -72,6 +75,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";
@@ -94,10 +99,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;
@@ -131,6 +139,7 @@ public RecordingService(ScreenRecordUxController controller, @LongRunning Execut
         mUserContextTracker = userContextTracker;
         mKeyguardDismissUtil = keyguardDismissUtil;
         mScreenRecordingStartTimeStore = screenRecordingStartTimeStore;
+        mBinder = new RecordingServiceBinder();
     }
 
     /**
@@ -282,25 +291,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
@@ -380,7 +419,7 @@ private void createErrorNotification(
                 .setContentTitle(notificationContentTitle)
                 .setGroup(groupKey)
                 .addExtras(extras);
-        startForeground(mNotificationId, builder.build());
+        startForeground(ERROR_NOTIF_ID, builder.build());
     }
 
     @VisibleForTesting
@@ -416,7 +455,7 @@ protected void createRecordingNotification() {
                 .setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE)
                 .addAction(stopAction)
                 .addExtras(extras);
-        startForeground(mNotificationId, builder.build());
+        startForeground(PROGRESS_NOTIF_ID, builder.build());
     }
 
     @VisibleForTesting
@@ -450,11 +489,21 @@ 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 = 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());
 
@@ -464,10 +513,11 @@ 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)
+                .addAction(deleteAction)
                 .setAutoCancel(true)
                 .setGroup(GROUP_KEY_SAVED)
                 .addExtras(extras);
@@ -498,6 +548,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());
@@ -506,12 +558,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();
@@ -551,13 +628,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(),
@@ -568,7 +646,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);
             }
         });
     }
@@ -584,6 +663,11 @@ private void setTapsVisible(boolean turnOn) {
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_TOUCHES, value);
     }
 
+    private PendingIntent getStopPendingIntent() {
+        return PendingIntent.getService(this, REQUEST_CODE, getStopIntent(this),
+                                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+    }
+
     protected String getTag() {
         return TAG;
     }
@@ -643,9 +727,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
@@ -670,4 +768,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/ScreenRecordPermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt
index 6b5dc9d1cbf13..0c667d449e0d6 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
@@ -81,7 +82,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..e29ef458c800c
--- /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.crdroid.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 7360002d6eea9..a5de76fa6630b 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 9c78dfdb1f30f..9674b37d77100 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt
@@ -27,10 +27,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
@@ -105,7 +108,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 = ""
@@ -122,12 +124,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 {
@@ -189,7 +197,6 @@ internal constructor(
             return
         }
 
-        screenBitmap = currentBitmap
         val oldPackageName = packageName
         packageName = screenshot.packageNameString
 
@@ -315,8 +322,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()
@@ -326,7 +336,9 @@ internal constructor(
 
     /** Release the constructed window context. */
     private fun releaseContext() {
-        broadcastDispatcher.unregisterReceiver(copyBroadcastReceiver)
+        try {
+            broadcastDispatcher.unregisterReceiver(copyBroadcastReceiver)
+        } catch (t: Throwable) { }
         context.release()
     }
 
@@ -351,8 +363,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)
                 }
             }
 
@@ -471,13 +482,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 ->
@@ -504,9 +547,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")
                 }
@@ -517,6 +563,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() }
@@ -554,9 +602,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)
                 }
             },
@@ -585,13 +631,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 {
@@ -609,7 +648,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
 
         /** Does the aspect ratio of the bitmap with insets removed match the bounds. */
         private fun aspectRatiosMatch(
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
index ce1acd67ce03c..478823eb716e5 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
@@ -56,6 +56,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 73151d5298c9a..31e313cef3cfd 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSoundProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSoundProvider.kt
@@ -45,7 +45,7 @@ constructor(
     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/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/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
index 24ddd3cb76062..878135002272a 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) {
@@ -396,6 +398,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 d15705311fa06..daf2bb45e6aea 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -63,14 +63,18 @@
 import android.graphics.Region;
 import android.graphics.RenderEffect;
 import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.TransitionDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.os.Trace;
+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 +84,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;
@@ -106,6 +112,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;
@@ -201,13 +208,17 @@
 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.wallpapers.ui.viewmodel.WallpaperFocalAreaViewModel;
 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 +275,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 +317,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 +362,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;
@@ -353,6 +375,11 @@ public final class NotificationPanelViewController implements
     private float mCurrentBackProgress = 0.0f;
     private boolean mExpanding;
     private boolean mSplitShadeEnabled;
+
+    private ValueAnimator lastFlingToHeightAnimator;
+    private boolean lastFlingToHeightExpand;
+    private float lastFlingToHeightVel;
+
     private KeyguardStatusBarViewController mKeyguardStatusBarViewController;
     private NotificationsQuickSettingsContainer mNotificationContainerParent;
     private final NotificationsQSContainerController mNotificationsQSContainerController;
@@ -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 final WallpaperFocalAreaViewModel mWallpaperFocalAreaViewModel;
@@ -668,6 +708,7 @@ public NotificationPanelViewController(NotificationPanelView view,
             BlurConfig blurConfig,
             Lazy<ShadeDisplaysRepository> shadeDisplaysRepository,
             WindowRootViewBlurInteractor windowRootViewBlurInteractor,
+            TunerService tunerService,
             Context context) {
         mBlurConfig = blurConfig;
         mWindowRootViewBlurInteractor = windowRootViewBlurInteractor;
@@ -762,6 +803,7 @@ public void onViewDetachedFromWindow(View v) {}
                 mSplitShadeStateController.shouldUseSplitNotificationShade(mResources);
         mView.setWillNotDraw(!DEBUG_DRAWABLE);
         mShadeHeaderController = shadeHeaderController;
+        mTunerService = tunerService;
         mAnimateBack = predictiveBackAnimateShade();
         mFalsingCollector = falsingCollector;
         mPowerManager = powerManager;
@@ -800,15 +842,6 @@ public boolean onDoubleTap(MotionEvent e) {
                 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;
@@ -871,6 +904,10 @@ 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);
+        mStatusBarKeyguardViewManager.setNotificationPanelViewController(this);
         dumpManager.registerDumpable(this);
     }
 
@@ -1457,6 +1494,9 @@ void flingToHeight(float vel, boolean expand, float target,
             overshootAmount += mOverExpansion / mPanelFlingOvershootAmount;
         }
         ValueAnimator animator = createHeightAnimator(target, overshootAmount);
+        if (shouldIgnoreStartFlingAnimavor(animator, mHeightAnimator, vel, expand)) {
+            return;
+        }
         if (expand) {
             maybeVibrateOnOpening(true /* openingWithTouch */);
             if (expandBecauseOfFalsing && vel < 0) {
@@ -1469,19 +1509,14 @@ void flingToHeight(float vel, boolean expand, float target,
                 animator.setDuration(SHADE_OPEN_SPRING_OUT_DURATION);
             }
         } else {
-            mHasVibratedOnOpen = false;
-            if (shouldUseDismissingAnimation()) {
-                if (vel == 0) {
-                    animator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED);
-                    long duration = (long) (200 + mExpandedHeight / this.mView.getHeight() * 100);
-                    animator.setDuration(duration);
-                } else {
-                    mFlingAnimationUtilsDismissing.apply(animator, mExpandedHeight, target, vel,
-                            this.mView.getHeight());
-                }
+            this.mHasVibratedOnOpen = false;
+            if (!shouldUseDismissingAnimation()) {
+                mFlingAnimationUtilsClosing.apply(animator, mExpandedHeight, target, vel, this.mView.getHeight());
+            } else if (vel == 0.0f) {
+                animator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED);
+                animator.setDuration((long) (((mExpandedHeight / this.mView.getHeight()) * 100.0f) + 200.0f));
             } else {
-                mFlingAnimationUtilsClosing.apply(
-                        animator, mExpandedHeight, target, vel, this.mView.getHeight());
+                mFlingAnimationUtilsDismissing.apply(animator, mExpandedHeight, target, vel, this.mView.getHeight());
             }
 
             // Make it shorter if we run a canned animation
@@ -1508,6 +1543,9 @@ public void onAnimationStart(Animator animation) {
                 if (!mStatusBarStateController.isDozing()) {
                     mQsController.beginJankMonitoring(isFullyCollapsed());
                 }
+                if (expand && mHeadsUpManager.hasPinnedHeadsUp()) {
+                    notifyExpandingStarted();
+                }
             }
 
             @Override
@@ -1529,10 +1567,45 @@ public void onAnimationEnd(Animator animation) {
         if (!mScrimController.isScreenOn()) {
             animator.setDuration(1);
         }
+        if (mHeightAnimator != null && mHeightAnimator.isRunning()) {
+            stopHeightAnimator();
+        }
         setAnimator(animator);
         animator.start();
     }
 
+    private final boolean shouldIgnoreStartFlingAnimavor(ValueAnimator newAnimator, ValueAnimator oldAnimator, float vel, boolean expand) {
+        if (newAnimator == null) {
+            return false;
+        }
+        if (oldAnimator != null 
+            && oldAnimator.equals(lastFlingToHeightAnimator) 
+            && isSameDirection(vel) 
+            && expand == lastFlingToHeightExpand 
+            && oldAnimator.isRunning()) {
+            return true;
+        }
+        lastFlingToHeightAnimator = newAnimator;
+        lastFlingToHeightVel = vel;
+        lastFlingToHeightExpand = expand;
+        return false;
+    }
+
+    private final boolean isSameDirection(float vel) {
+        return (vel <= 0.0f && lastFlingToHeightVel <= 0.0f) || (vel >= 0.0f && lastFlingToHeightVel >= 0.0f);
+    }
+
+    public void stopHeightAnimator() {
+        if (mHeightAnimator == null || !mHeightAnimator.isRunning()) {
+            return;
+        }
+        mHeightAnimator.cancel();
+    }
+
+    public void resetHeightForBouncerShowing() {
+        setExpandedHeight(0.0f);
+    }
+
     @VisibleForTesting
     void onFlingEnd(boolean cancelled) {
         mIsFlinging = false;
@@ -1947,6 +2020,9 @@ private void onHeightUpdated(float expandedHeight) {
         updateHeader();
         updatePanelExpanded();
         updateGestureExclusionRect();
+        if (mHeaderImageEnabled) {
+            mView.post(() -> updateHeaderImage());
+        }
         if (DEBUG_DRAWABLE) {
             mView.invalidate();
         }
@@ -2448,9 +2524,15 @@ public void setTouchAndAnimationDisabled(boolean disabled) {
 
     @Override
     public void setDozing(boolean dozing, boolean animate) {
+        boolean shouldAnimate;
         if (dozing == mDozing) return;
         mView.setDozing(dozing);
         mDozing = dozing;
+        if (!isKeyguardShowing() || mDozing) {
+            shouldAnimate = animate;
+        } else {
+            shouldAnimate = false;
+        }
         // TODO (b/) make listeners for this
         mNotificationStackScrollLayoutController.setDozing(mDozing, animate);
         mKeyguardInteractor.setAnimateDozingTransitions(animate);
@@ -2458,7 +2540,7 @@ public void setDozing(boolean dozing, boolean animate) {
         mQsController.setDozing(mDozing);
 
         if (mBarState == KEYGUARD || mBarState == StatusBarState.SHADE_LOCKED) {
-            updateDozingVisibilities(animate);
+            updateDozingVisibilities(shouldAnimate);
         }
 
         final float dozeAmount = dozing ? 1 : 0;
@@ -3059,7 +3141,8 @@ private boolean isFalseTouch(float x, float y,
         return !isDirectionUpwards(x, y);
     }
 
-    private void fling(float vel, boolean expand, boolean expandBecauseOfFalsing) {
+    @Override
+    public void fling(float vel, boolean expand, boolean expandBecauseOfFalsing) {
         fling(vel, expand, 1.0f /* collapseSpeedUpFactor */, expandBecauseOfFalsing);
     }
 
@@ -3154,6 +3237,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;
             }
@@ -3563,6 +3647,10 @@ public void onConfigChanged(Configuration newConfig) {
             if (ShadeWindowGoesAround.isEnabled()) {
                 updateResources();
             }
+            if (mHeaderImageEnabled) {
+                mOrientation = newConfig.orientation;
+                mView.post(() -> updateHeaderImage());
+            }
         }
 
         @Override
@@ -3594,6 +3682,7 @@ private void onStateChanged(
 
             // TODO: maybe add a listener for barstate
             mBarState = statusBarState;
+            ScrimUtils.get().setBarState(mBarState);
             mQsController.setBarState(statusBarState);
 
             boolean fromShadeToKeyguard = statusBarState == KEYGUARD
@@ -3702,7 +3791,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)
@@ -3713,10 +3803,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
@@ -3727,13 +3823,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 {
@@ -3741,10 +3901,15 @@ private final class ShadeLayoutChangeListener implements View.OnLayoutChangeList
         public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft,
                 int oldTop, int oldRight, int oldBottom) {
             DejankUtils.startDetectingBlockingIpcs("NVP#onLayout");
-            updateExpandedHeightToMaxHeight();
+            boolean changed = (left == oldLeft && top == oldTop && right == oldRight && bottom == oldBottom) ? false : true;
+            if (!mKeyguardStateController.isShowing() || !mKeyguardStateController.isKeyguardGoingAway() || changed) {
+                updateExpandedHeightToMaxHeight();
+            }
             mHasLayoutedSinceDown = true;
             if (mUpdateFlingOnLayout) {
-                abortAnimations();
+                if (isTracking() || !mIsSpringBackAnimation || left != oldLeft || top != oldTop || right != oldRight || bottom != oldBottom) {
+                    abortAnimations();
+                }
                 fling(mUpdateFlingVelocity);
                 mUpdateFlingOnLayout = false;
             }
@@ -3755,6 +3920,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
@@ -4054,7 +4222,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);
             }
 
@@ -4073,9 +4244,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");
@@ -4362,4 +4534,65 @@ 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)));
+            }
+        } else {
+            mQsHeaderLayout.setVisibility(View.GONE);
+        }
+    }
+
+    private void setNotificationPanelHeaderBackground(Drawable dw, boolean force) {
+        if (mQsHeaderImageView.getDrawable() != null && !force) {
+            Drawable[] layers = new Drawable[]{mQsHeaderImageView.getDrawable(), 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/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
index 521c21015e449..e07188a2e6e9a 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
@@ -771,4 +771,10 @@ public void setStatusBarViewController(PhoneStatusBarViewController statusBarVie
     void setDragDownHelper(DragDownHelper dragDownHelper) {
         mDragDownHelper = dragDownHelper;
     }
+
+    public void fling(float vel, boolean expand, boolean expandBecauseOfFalsing) {
+        if (mShadeViewController != null) {
+            mShadeViewController.fling(vel, expand, expandBecauseOfFalsing);
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt b/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt
index fd890512d1a0f..25ab50d276c69 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt
@@ -19,11 +19,16 @@ 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.statusbar.StatusBarState
+import com.android.systemui.statusbar.phone.CentralSurfaces
 import lineageos.providers.LineageSettings
 import javax.inject.Inject
 
@@ -33,23 +38,35 @@ class QQSGestureListener @Inject constructor(
         private val falsingManager: FalsingManager,
         private val powerManager: PowerManager,
         private val statusBarStateController: StatusBarStateController,
+        private val selectedUserInteractor: SelectedUserInteractor,
+        private val centralSurfaces: CentralSurfaces,
 ) : 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(
@@ -66,6 +83,13 @@ class QQSGestureListener @Inject constructor(
         ) {
             powerManager.goToSleep(e.getEventTime())
             return true
+        } else if (!statusBarStateController.isDozing &&
+            lockscreenDT2SEnabled &&
+            statusBarStateController.getState() == StatusBarState.KEYGUARD &&
+            !centralSurfaces.isBouncerShowing()            
+        ) {
+            powerManager.goToSleep(e.getEventTime())
+            return true
         }
         return false
     }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java
index 16d81bf4c85b0..b9cdaab17da08 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java
@@ -36,12 +36,9 @@
 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.util.IndentingPrintWriter;
 import android.util.Log;
 import android.util.MathUtils;
@@ -95,6 +92,7 @@
 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;
@@ -105,8 +103,9 @@
 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;
 
@@ -130,6 +129,9 @@ 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 QS mQs;
     private final Lazy<NotificationPanelViewController> mPanelViewControllerLazy;
 
@@ -172,6 +174,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;
@@ -290,7 +293,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. */
@@ -360,7 +362,7 @@ public QuickSettingsControllerImpl(
             Lazy<CommunalTransitionViewModel> communalTransitionViewModelLazy,
             Lazy<LargeScreenHeaderHelper> largeScreenHeaderHelperLazy,
             WindowManagerProvider windowManagerProvider,
-            SelectedUserInteractor selectedUserInteractor
+            TunerService tunerService
     ) {
         SceneContainerFlag.assertInLegacyMode();
         mPanelViewControllerLazy = panelViewControllerLazy;
@@ -408,19 +410,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;
@@ -545,7 +538,8 @@ private boolean isRemoteInputActiveWithKeyboardUp() {
 
     boolean isExpansionEnabled() {
         return mExpansionEnabledPolicy && mExpansionEnabledAmbient
-            && !isRemoteInputActiveWithKeyboardUp();
+            && !isRemoteInputActiveWithKeyboardUp()
+            && !NTForbiddenSwipeDownQSController.get(mPanelView.getContext()).getForbiddenSwipeDownQS();
     }
 
     /** */
@@ -633,6 +627,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;
 
@@ -1352,6 +1349,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(
@@ -1685,7 +1683,9 @@ boolean handleTouch(MotionEvent event, boolean isFullyCollapsed,
             return false;
         }
         boolean isInStatusBar = event.getY(event.getActionIndex()) < mStatusBarMinHeight;
-        if (ShadeExpandsOnStatusBarLongPress.isEnabled() && isInStatusBar) {
+        boolean isSwipeDisabled = NTForbiddenSwipeDownQSController.get(mPanelView.getContext()).getForbiddenSwipeDownQS();
+        if (ShadeExpandsOnStatusBarLongPress.isEnabled() && isInStatusBar 
+                && !isSwipeDisabled) {
             mStatusBarLongPressGestureDetector.get().handleTouch(event);
         }
         final int action = event.getActionMasked();
@@ -1718,6 +1718,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) {
@@ -1978,6 +1981,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) {
@@ -2250,7 +2258,8 @@ FragmentHostManager.FragmentListener getQsFragmentListener() {
     }
 
     /** */
-    public final class QsFragmentListener implements FragmentHostManager.FragmentListener {
+    public final class QsFragmentListener implements FragmentHostManager.FragmentListener,
+            TunerService.Tunable {
 
         /** */
         @Override
@@ -2302,20 +2311,14 @@ 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);
             updateExpansion();
         }
 
         /** */
         @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.
@@ -2329,6 +2332,13 @@ 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);
+            }
+        }
     }
 
     private final class LockscreenShadeTransitionCallback
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 8ec911cdf41e4..a20ae20a7783b 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
@@ -711,7 +710,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/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt
index 879008325141f..aeda281a1598c 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt
@@ -70,6 +70,8 @@ interface ShadeViewController {
     /** Sends an external (e.g. Status Bar) intercept touch event to the Shade touch handler. */
     fun handleExternalInterceptTouch(event: MotionEvent): Boolean
 
+    fun fling(vel: Float, expand: Boolean, expandBecauseOfFalsing: Boolean)
+
     /**
      * Triggered when an input focus transfer gesture has started.
      *
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt
index 18f52791b1778..91bfe63504560 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt
@@ -99,6 +99,8 @@ open class ShadeViewControllerEmptyImpl @Inject constructor() :
         return false
     }
 
+    override fun fling(vel: Float, expand: Boolean, expandBecauseOfFalsing: Boolean) {}
+
     override fun startInputFocusTransfer() {}
 
     override fun cancelInputFocusTransfer() {}
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/ui/ShadeColors.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/ShadeColors.kt
index 8f06c55b6e94b..9ac1bc8cf1747 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,8 @@ 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.3f)
     }
 
     @JvmStatic
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixels/Grids.java b/packages/SystemUI/src/com/android/systemui/smartpixels/Grids.java
new file mode 100644
index 0000000000000..e29381c384859
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixels/Grids.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2015, Sergii Pylypenko
+ *           (c) 2018, Joe Maples
+ *           (c) 2018, CarbonROM
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of screen-dimmer-pixel-filter nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package com.android.systemui.smartpixels;
+
+public class Grids {
+
+    public static final int GridSize = 64;
+    public static final int GridSideSize = 8;
+
+    public static String[] PatternNames = new String[] {
+            "12%",
+            "25%",
+            "38%",
+            "50%",
+            "62%",
+            "75%",
+            "88%",
+    };
+
+    public static byte[][] Patterns = new byte[][] {
+            {
+                    1, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 1, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 1, 0,
+                    0, 1, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 1, 0, 0,
+                    0, 0, 1, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 1,
+                    0, 0, 0, 0, 1, 0, 0, 0,
+            },
+            {
+                    1, 0, 0, 0, 1, 0, 0, 0,
+                    0, 0, 1, 0, 0, 0, 1, 0,
+                    0, 1, 0, 0, 0, 1, 0, 0,
+                    0, 0, 0, 1, 0, 0, 0, 1,
+                    1, 0, 0, 0, 1, 0, 0, 0,
+                    0, 0, 1, 0, 0, 0, 1, 0,
+                    0, 1, 0, 0, 0, 1, 0, 0,
+                    0, 0, 0, 1, 0, 0, 0, 1,
+            },
+            {
+                    1, 0, 0, 0, 1, 0, 0, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+                    0, 0, 1, 0, 0, 0, 1, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+                    1, 0, 0, 0, 1, 0, 0, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+                    0, 0, 1, 0, 0, 0, 1, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+            },
+            {
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    0, 1, 0, 1, 0, 1, 0, 1,
+            },
+            {
+                    0, 1, 1, 1, 0, 1, 1, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    1, 1, 0, 1, 1, 1, 0, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    0, 1, 1, 1, 0, 1, 1, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+                    1, 1, 0, 1, 1, 1, 0, 1,
+                    1, 0, 1, 0, 1, 0, 1, 0,
+            },
+            {
+                    0, 1, 1, 1, 0, 1, 1, 1,
+                    1, 1, 0, 1, 1, 1, 0, 1,
+                    1, 0, 1, 1, 1, 0, 1, 1,
+                    1, 1, 1, 0, 1, 1, 1, 0,
+                    0, 1, 1, 1, 0, 1, 1, 1,
+                    1, 1, 0, 1, 1, 1, 0, 1,
+                    1, 0, 1, 1, 1, 0, 1, 1,
+                    1, 1, 1, 0, 1, 1, 1, 0,
+            },
+            {
+                    0, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 0, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 0, 1,
+                    1, 0, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 0, 1, 1,
+                    1, 1, 0, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 0,
+                    1, 1, 1, 1, 0, 1, 1, 1,
+            },
+    };
+
+    // Indexes to shift screen pattern in both vertical and horizontal directions
+    public static byte[] GridShift = new byte[] {
+             0,  1,  8,  9,  2,  3, 10, 11,
+             4,  5, 12, 13,  6,  7, 14, 15,
+            16, 17, 24, 25, 18, 19, 26, 27,
+            20, 21, 28, 29, 22, 23, 30, 31,
+            32, 33, 40, 41, 34, 35, 42, 43,
+            36, 37, 44, 45, 38, 39, 46, 47,
+            48, 49, 56, 57, 50, 51, 58, 59,
+            52, 53, 60, 61, 54, 55, 62, 63,
+    };
+
+    public static int[] ShiftTimeouts = new int[] { // In milliseconds
+            15 * 1000,
+            30 * 1000,
+            60 * 1000,
+            2 * 60 * 1000,
+            5 * 60 * 1000,
+            10 * 60 * 1000,
+            20 * 60 * 1000,
+            30 * 60 * 1000,
+            60 * 60 * 1000,
+    };
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixels/SmartPixelsReceiver.java b/packages/SystemUI/src/com/android/systemui/smartpixels/SmartPixelsReceiver.java
new file mode 100644
index 0000000000000..d00c3c788d4c0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixels/SmartPixelsReceiver.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2018 CarbonROM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.smartpixels;
+
+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.os.Handler;
+import android.os.PowerManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.systemui.CoreStartable;
+import com.android.systemui.dagger.SysUISingleton;
+
+import javax.inject.Inject;
+
+@SysUISingleton
+public class SmartPixelsReceiver extends BroadcastReceiver implements CoreStartable {
+   private static final String TAG = "SmartPixelsReceiver";
+
+   private Context mContext;
+   private Handler mHandler = new Handler();
+   private ContentResolver mResolver;
+   private PowerManager mPowerManager;
+   private SettingsObserver mSettingsObserver;
+   private Intent mSmartPixelsService;
+   private IntentFilter mFilter;
+
+   private boolean mEnabled;
+   private boolean mOnPowerSave;
+   private boolean mPowerSave;
+   private boolean mServiceRunning = false;
+   private boolean mRegisteredReceiver = false;
+
+   @Inject
+   public SmartPixelsReceiver(Context context) {
+       mContext = context;
+   }
+
+    @Override
+    public void start() {
+        if (!mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSmartPixels))
+            return;
+
+       mSmartPixelsService = new Intent(mContext,
+               com.android.systemui.smartpixels.SmartPixelsService.class);
+
+       mFilter = new IntentFilter();
+       mFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
+       mFilter.addAction(Intent.ACTION_USER_FOREGROUND);
+
+       initiateSettingsObserver();
+   }
+
+   private void registerReceiver() {
+       mContext.registerReceiver(this, mFilter, Context.RECEIVER_NOT_EXPORTED);
+       mRegisteredReceiver = true;
+   }
+
+   private void unregisterReceiver() {
+       mContext.unregisterReceiver(this);
+       mRegisteredReceiver = false;
+   }
+
+   private void initiateSettingsObserver() {
+       mResolver = mContext.getContentResolver();
+       mSettingsObserver = new SettingsObserver(mHandler);
+       mSettingsObserver.observe();
+       mSettingsObserver.update();
+   }
+
+   private class SettingsObserver extends ContentObserver {
+       SettingsObserver(Handler handler) {
+           super(handler);
+           mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+       }
+
+       void observe() {
+           mResolver.registerContentObserver(Settings.System.getUriFor(
+                   Settings.System.SMART_PIXELS_ENABLE),
+                   false, this, UserHandle.USER_ALL);
+           mResolver.registerContentObserver(Settings.System.getUriFor(
+                   Settings.System.SMART_PIXELS_ON_POWER_SAVE),
+                   false, this, UserHandle.USER_ALL);
+           mResolver.registerContentObserver(Settings.System.getUriFor(
+                   Settings.System.SMART_PIXELS_PATTERN),
+                   false, this, UserHandle.USER_ALL);
+           mResolver.registerContentObserver(Settings.System.getUriFor(
+                   Settings.System.SMART_PIXELS_SHIFT_TIMEOUT),
+                   false, this, UserHandle.USER_ALL);
+       }
+
+       @Override
+       public void onChange(boolean selfChange) {
+           update();
+       }
+
+       public void update() {
+           mEnabled = (Settings.System.getIntForUser(
+                   mResolver, Settings.System.SMART_PIXELS_ENABLE,
+                   0, UserHandle.USER_CURRENT) == 1);
+           mOnPowerSave = (Settings.System.getIntForUser(
+                   mResolver, Settings.System.SMART_PIXELS_ON_POWER_SAVE,
+                   0, UserHandle.USER_CURRENT) == 1);
+           mPowerSave = mPowerManager.isPowerSaveMode();
+
+           if (mEnabled || mOnPowerSave) {
+               if (!mRegisteredReceiver)
+                   registerReceiver();
+           } else if (mRegisteredReceiver) {
+               unregisterReceiver();
+           }
+
+           if (!mEnabled && mOnPowerSave) {
+               if (mPowerSave && !mServiceRunning) {
+                   mContext.startService(mSmartPixelsService);
+                   mServiceRunning = true;
+                   Log.d(TAG, "Started Smart Pixels Service by Power Save enable");
+               } else if (!mPowerSave && mServiceRunning) {
+                   mContext.stopService(mSmartPixelsService);
+                   mServiceRunning = false;
+                   Log.d(TAG, "Stopped Smart Pixels Service by Power Save disable");
+               } else if (mPowerSave && mServiceRunning) {
+                   mContext.stopService(mSmartPixelsService);
+                   mContext.startService(mSmartPixelsService);
+                   Log.d(TAG, "Restarted Smart Pixels Service by Power Save enable");
+               }
+           } else if (mEnabled && !mServiceRunning) {
+               mContext.startService(mSmartPixelsService);
+               mServiceRunning = true;
+               Log.d(TAG, "Started Smart Pixels Service by enable");
+           } else if (!mEnabled && mServiceRunning) {
+               mContext.stopService(mSmartPixelsService);
+               mServiceRunning = false;
+               Log.d(TAG, "Stopped Smart Pixels Service by disable");
+           } else if (mEnabled && mServiceRunning) {
+               mContext.stopService(mSmartPixelsService);
+               mContext.startService(mSmartPixelsService);
+               Log.d(TAG, "Restarted Smart Pixels Service");
+           }
+       }
+   }
+
+   @Override
+   public void onReceive(final Context context, Intent intent) {
+       mSettingsObserver.update();
+   }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixels/SmartPixelsService.java b/packages/SystemUI/src/com/android/systemui/smartpixels/SmartPixelsService.java
new file mode 100644
index 0000000000000..759e889b31703
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixels/SmartPixelsService.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2015, Sergii Pylypenko
+ *           (c) 2018, Joe Maples
+ *           (c) 2018, Adin Kwok
+ *           (c) 2018, CarbonROM
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of screen-dimmer-pixel-filter nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package com.android.systemui.smartpixels;
+
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY;
+
+import android.Manifest;
+import android.app.Service;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PixelFormat;
+import android.graphics.Point;
+import android.graphics.Shader;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageView;
+
+import com.android.systemui.res.R;
+
+public class SmartPixelsService extends Service {
+    public static final String LOG = "SmartPixelsService";
+
+    private WindowManager windowManager;
+    private ImageView view = null;
+    private Bitmap bmp;
+
+    private boolean destroyed = false;
+    public static boolean running = false;
+
+    private int startCounter = 0;
+    private Context mContext;
+
+    // Pixel Filter Settings
+    private int mPattern = 3;
+    private int mShiftTimeout = 4;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        running = true;
+        mContext = this;
+        updateSettings();
+        Log.d(LOG, "Service started");
+        startFilter();
+    }
+
+    public void startFilter() {
+        if (view != null) {
+            return;
+        }
+
+        windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
+
+        view = new ImageView(this);
+        DisplayMetrics metrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        bmp = Bitmap.createBitmap(Grids.GridSideSize, Grids.GridSideSize, Bitmap.Config.ARGB_4444);
+
+        updatePattern();
+        BitmapDrawable draw = new BitmapDrawable(bmp);
+        draw.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
+        draw.setFilterBitmap(false);
+        draw.setAntiAlias(false);
+        draw.setTargetDensity(metrics.densityDpi);
+
+        view.setBackground(draw);
+
+        WindowManager.LayoutParams params = getLayoutParams();
+        params.privateFlags |= PRIVATE_FLAG_TRUSTED_OVERLAY;
+        try {
+            windowManager.addView(view, params);
+        } catch (Exception e) {
+            running = false;
+            view = null;
+            return;
+        }
+
+        startCounter++;
+        final int handlerStartCounter = startCounter;
+        final Handler handler = new Handler();
+        final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (view == null || destroyed || handlerStartCounter != startCounter) {
+                    return;
+                } else if (pm.isInteractive()) {
+                    updatePattern();
+                    view.invalidate();
+                }
+                if (!destroyed) {
+                    handler.postDelayed(this, Grids.ShiftTimeouts[mShiftTimeout]);
+                }
+            }
+        }, Grids.ShiftTimeouts[mShiftTimeout]);
+    }
+
+    public void stopFilter() {
+        if (view == null) {
+            return;
+        }
+
+        startCounter++;
+
+        windowManager.removeView(view);
+        view = null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        destroyed = true;
+        stopFilter();
+        Log.d(LOG, "Service stopped");
+        running = false;
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.d(LOG, "Screen orientation changed, updating window layout");
+        WindowManager.LayoutParams params = getLayoutParams();
+        windowManager.updateViewLayout(view, params);
+    }
+
+    private WindowManager.LayoutParams getLayoutParams()
+    {
+        Point displaySize = new Point();
+        windowManager.getDefaultDisplay().getRealSize(displaySize);
+        Point windowSize = new Point();
+        windowManager.getDefaultDisplay().getRealSize(windowSize);
+        Resources res = getResources();
+        int mStatusBarHeight = res.getDimensionPixelOffset(R.dimen.status_bar_height);
+        displaySize.x += displaySize.x - windowSize.x + (mStatusBarHeight * 2);
+        displaySize.y += displaySize.y - windowSize.y + (mStatusBarHeight * 2);
+
+        WindowManager.LayoutParams params = new WindowManager.LayoutParams(
+                displaySize.x,
+                displaySize.y,
+                0,
+                0,
+                WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
+                        WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE |
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+                        WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
+                        WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN |
+                        WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS |
+                        WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+                PixelFormat.TRANSPARENT
+        );
+
+        // Use the rounded corners overlay to hide it from screenshots. See 132c9f514.
+        params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY;
+
+        params.dimAmount = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE;
+        params.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE;
+        return params;
+    }
+
+    private int getShift() {
+        long shift = (System.currentTimeMillis() / Grids.ShiftTimeouts[mShiftTimeout]) % Grids.GridSize;
+        return Grids.GridShift[(int)shift];
+    }
+
+    private void updatePattern() {
+        int shift = getShift();
+        int shiftX = shift % Grids.GridSideSize;
+        int shiftY = shift / Grids.GridSideSize;
+        for (int i = 0; i < Grids.GridSize; i++) {
+            int x = (i + shiftX) % Grids.GridSideSize;
+            int y = ((i / Grids.GridSideSize) + shiftY) % Grids.GridSideSize;
+            int color = (Grids.Patterns[mPattern][i] == 0) ? Color.TRANSPARENT : Color.BLACK;
+            bmp.setPixel(x, y, color);
+        }
+    }
+
+    private void updateSettings() {
+        mPattern = Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.SMART_PIXELS_PATTERN,
+                5, UserHandle.USER_CURRENT);
+        mShiftTimeout = Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.SMART_PIXELS_SHIFT_TIMEOUT,
+                4, UserHandle.USER_CURRENT);
+    }
+}
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/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
index a49af47f4803b..4adb8868c0b78 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
@@ -33,7 +33,7 @@
  * Convenience class for capturing gestures for later analysis.
  */
 public class GestureRecorder {
-    public static final boolean DEBUG = true; // for now
+    public static final boolean DEBUG = false; // for now
     public static final String TAG = GestureRecorder.class.getSimpleName();
 
     public class Gesture {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 3a872a60a91ee..f68f924fcac61 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -64,12 +64,16 @@
 import android.hardware.biometrics.BiometricSourceType;
 import android.os.BatteryManager;
 import android.os.Handler;
+import android.os.IBatteryPropertiesRegistrar;
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.util.Pair;
@@ -115,6 +119,7 @@
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.res.R;
 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;
@@ -152,6 +157,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 =
@@ -168,6 +175,7 @@ public class KeyguardIndicationController {
     private final BouncerMessageInteractor mBouncerMessageInteractor;
 
     private ViewGroup mIndicationArea;
+    private FaceUnlockImageView mFaceIconView;
     private KeyguardIndicationTextView mTopIndicationView;
     private KeyguardIndicationTextView mLockScreenIndicationView;
     private final IBatteryStats mBatteryInfo;
@@ -221,15 +229,29 @@ 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 IBatteryPropertiesRegistrar mBatteryPropertiesRegistrar;
+    private boolean mAlternateFastchargeInfoUpdate;
+
     private KeyguardUpdateMonitorCallback mUpdateMonitorCallback;
 
     private boolean mDozing;
@@ -273,6 +295,15 @@ public void onScreenTurnedOn() {
                 mBiometricErrorMessageToShowOnScreenOn = null;
             }
         }
+
+        @Override
+        public void onScreenTurnedOff() {
+            if (mFaceDetectionRunning) {
+                mFaceDetectionRunning = false;
+                mBiometricErrorMessageToShowOnScreenOn = null;
+                hideFaceUnlockRecognizingMessage();
+            }
+        }
     };
     private boolean mFaceLockedOutThisAuthSession;
 
@@ -365,6 +396,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();
                 }
             }
         };
@@ -381,6 +417,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. */
@@ -397,6 +440,16 @@ public void init() {
         mKeyguardStateController.addCallback(mKeyguardStateCallback);
 
         mStatusBarStateListener.onDozingChanged(mStatusBarStateController.isDozing());
+
+        mCurrentDivider = mContext.getResources().getInteger(R.integer.config_currentInfoDivider);
+
+        mAlternateFastchargeInfoUpdate =
+                    mContext.getResources().getBoolean(R.bool.config_alternateFastchargeInfoUpdate);
+        if (mAlternateFastchargeInfoUpdate) {
+            mBatteryPropertiesRegistrar =
+                    IBatteryPropertiesRegistrar.Stub.asInterface(
+                    ServiceManager.getService("batteryproperties"));
+        }
     }
 
     @Nullable
@@ -414,6 +467,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);
@@ -654,7 +714,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);
@@ -1034,6 +1094,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.
@@ -1066,6 +1134,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.
      */
@@ -1134,7 +1221,7 @@ protected final void updateDeviceEntryIndication(boolean animate) {
 
                 mTopIndicationView.switchIndication(newIndication,
                         builder.build(),
-                        true, () -> mWakeLock.setAcquired(false));
+                        animate, () -> mWakeLock.setAcquired(false));
             }
             return;
         }
@@ -1177,6 +1264,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
@@ -1207,13 +1313,41 @@ protected String computePowerChargingStringIndication() {
                     : R.string.keyguard_plugged_in;
         }
 
+        String batteryInfo = "";
+        boolean showbatteryInfo = Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.LOCKSCREEN_BATTERY_INFO, 1, UserHandle.USER_CURRENT) == 1;
+         if (showbatteryInfo) {
+            if (mChargingCurrent >= mCurrentDivider * 1000) {
+                batteryInfo = String.format("%.1f" , (mChargingCurrent / mCurrentDivider / 1000)) + "A";
+            } else if (mChargingCurrent > 0) {
+                batteryInfo = String.format("%.0f" , (mChargingCurrent / mCurrentDivider)) + "mA";
+            }
+            if (mChargingWattage > 0) {
+                batteryInfo = (batteryInfo == "" ? "" : batteryInfo + " · ") +
+                        String.format("%.1f" , (mChargingWattage / mCurrentDivider / 1000)) + "W";
+            }
+            if (mChargingVoltage > 0) {
+                batteryInfo = (batteryInfo == "" ? "" : batteryInfo + " · ") +
+                        String.format("%.1f", (mChargingVoltage / 1000 / 1000)) + "V";
+            }
+            if (mTemperature > 0) {
+                batteryInfo = (batteryInfo == "" ? "" : batteryInfo + " · ") +
+                        String.format("%.1f", (mTemperature / 10)) + "°C";
+            }
+            if (batteryInfo != "") {
+                batteryInfo = "\n" + batteryInfo;
+            }
+        }
+
         if (hasChargingTime) {
             String chargingTimeFormatted = Formatter.formatShortElapsedTimeRoundingUpToMinutes(
                     mContext, mChargingTimeRemaining);
-            return mContext.getResources().getString(chargingId, chargingTimeFormatted,
+            String chargingText = mContext.getResources().getString(chargingId, chargingTimeFormatted,
                     percentage);
+            return chargingText + batteryInfo;
         } else {
-            return mContext.getResources().getString(chargingId, percentage);
+            String chargingText =  mContext.getResources().getString(chargingId, percentage);
+            return chargingText + batteryInfo;
         }
     }
 
@@ -1336,6 +1470,20 @@ private void setIndicationTextColor(ColorStateList color) {
         mInitialTextColorState = color;
     }
 
+    private final Runnable mUpdateInfo = new Runnable() {
+        public void run() {
+            long now = SystemClock.uptimeMillis();
+            long next = now + (1000 - now % 1000);
+            try {
+                mBatteryPropertiesRegistrar.scheduleUpdate();
+            } catch (RemoteException e) {
+            }
+            if (mHandler != null) {
+                mHandler.postAtTime(mUpdateInfo, next);
+            }
+        }
+    };
+
     protected class BaseKeyguardCallback extends KeyguardUpdateMonitorCallback {
         @Override
         public void onTimeChanged() {
@@ -1360,11 +1508,14 @@ 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;
+            mTemperature = status.temperature;
             mBatteryDefender = isBatteryDefender(status);
             mBatteryDead = status.isDead();
             // when the battery is overheated, device doesn't charge so only guard on pluggedIn:
@@ -1377,6 +1528,13 @@ public void onRefreshBatteryInfo(BatteryStatus status) {
                 mKeyguardLogger.log(TAG, ERROR, "Error calling IBatteryStats", e);
                 mChargingTimeRemaining = -1;
             }
+            if (mAlternateFastchargeInfoUpdate && (wasPluggedIn != mPowerPluggedIn)) {
+                if (mPowerPluggedIn) {
+                    mUpdateInfo.run();
+                } else {
+                    mHandler.removeCallbacks(mUpdateInfo);
+                }
+            }
 
             mKeyguardLogger.logRefreshBatteryInfo(isChargingOrFull, mPowerPluggedIn, mBatteryLevel,
                     mBatteryDefender);
@@ -1581,8 +1739,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);
+                }
             }
         }
 
@@ -1760,11 +1927,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 ad50a40f4d8ac..ece32d4d23330 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
@@ -40,6 +40,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
@@ -85,6 +86,7 @@ constructor(
     private val shadeLockscreenInteractorLazy: Lazy<ShadeLockscreenInteractor>,
     naturalScrollingSettingObserver: NaturalScrollingSettingObserver,
     private val lazyQSSceneAdapter: Lazy<QSSceneAdapter>,
+    private val forbiddenSwipeDownQSController: NTForbiddenSwipeDownQSController
 ) : Dumpable {
     private var pulseHeight: Float = 0f
 
@@ -171,6 +173,7 @@ constructor(
             naturalScrollingSettingObserver,
             shadeRepository,
             context,
+            forbiddenSwipeDownQSController,
         )
 
     private val splitShadeOverScroller: SplitShadeLockScreenOverScroller by lazy {
@@ -290,6 +293,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. */
@@ -759,6 +772,7 @@ class DragDownHelper(
     private val naturalScrollingSettingObserver: NaturalScrollingSettingObserver,
     private val shadeRepository: ShadeRepository,
     context: Context,
+    private val forbiddenSwipeDownQSController: NTForbiddenSwipeDownQSController
 ) : Gefingerpoken {
 
     private var dragDownAmountOnStart = 0.0f
@@ -825,12 +839,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
                 }
@@ -846,28 +862,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..d9848fa027b70
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NTForbiddenSwipeDownQSController.kt
@@ -0,0 +1,49 @@
+/*
+ * 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.SystemUIApplication
+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
+
+    private val keyguardShowing get() = ScrimUtils.get().isKeyguardShowing()
+    private val dozing get() = ScrimUtils.get().isDozing()
+
+    fun getForbiddenSwipeDownQS(): Boolean = (keyguardShowing || dozing) && !enableSwipeDownQS
+
+    companion object {
+        @JvmStatic
+        fun get(context: Context): NTForbiddenSwipeDownQSController {
+            val app = context.applicationContext as SystemUIApplication
+            return app.sysUIComponent.forbiddenSwipeDownQSController()
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NetworkTraffic.java b/packages/SystemUI/src/com/android/systemui/statusbar/NetworkTraffic.java
new file mode 100644
index 0000000000000..1fb388ffdd9af
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NetworkTraffic.java
@@ -0,0 +1,664 @@
+/**
+ * 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.statusbar;
+
+import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.net.TrafficStats;
+import android.os.Handler;
+import android.os.Message;
+import android.os.SystemClock;
+import android.provider.Settings;
+import android.text.Spanned;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.AbsoluteSizeSpan;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import com.android.systemui.Dependency;
+import com.android.systemui.res.R;
+import com.android.systemui.plugins.DarkIconDispatcher;
+import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;
+import com.android.systemui.statusbar.StatusIconDisplayable;
+
+import com.android.systemui.tuner.TunerService;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.stream.Stream;
+
+/** @hide */
+public class NetworkTraffic extends TextView implements TunerService.Tunable,
+        DarkReceiver, StatusIconDisplayable {
+
+    private static final String TAG = "NetworkTraffic";
+
+    // This must match the interface prefix in Connectivity's clatd.c.
+    private static final String CLAT_PREFIX = "v4-";
+
+    private static final int MODE_UPSTREAM_AND_DOWNSTREAM = 0;
+    private static final int MODE_UPSTREAM_ONLY = 1;
+    private static final int MODE_DOWNSTREAM_ONLY = 2;
+
+    private static final int MESSAGE_TYPE_PERIODIC_REFRESH = 0;
+    private static final int MESSAGE_TYPE_UPDATE_VIEW = 1;
+    private static final int MESSAGE_TYPE_ADD_NETWORK = 2;
+    private static final int MESSAGE_TYPE_REMOVE_NETWORK = 3;
+
+    private static final int Kilo = 1000;
+    private static final int Mega = Kilo * Kilo;
+    private static final int Giga = Mega * Kilo;
+
+    private static final String NETWORK_TRAFFIC_ENABLED =
+            "system:" + Settings.System.NETWORK_TRAFFIC_ENABLED;
+    private static final String NETWORK_TRAFFIC_MODE =
+            "system:" + Settings.System.NETWORK_TRAFFIC_MODE;
+    private static final String NETWORK_TRAFFIC_AUTOHIDE =
+            "system:" + Settings.System.NETWORK_TRAFFIC_AUTOHIDE;
+    private static final String NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD =
+            "system:" + Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD;
+    private static final String NETWORK_TRAFFIC_UNITS =
+            "system:" + Settings.System.NETWORK_TRAFFIC_UNITS;
+    private static final String NETWORK_TRAFFIC_REFRESH_INTERVAL =
+            "system:" + Settings.System.NETWORK_TRAFFIC_REFRESH_INTERVAL;
+    private static final String NETWORK_TRAFFIC_HIDEARROW =
+            "system:" + Settings.System.NETWORK_TRAFFIC_HIDEARROW;
+
+    private int mMode = MODE_UPSTREAM_AND_DOWNSTREAM;
+    private int mSubMode = MODE_UPSTREAM_AND_DOWNSTREAM;
+    private boolean mIsActive;
+    private boolean mTrafficActive;
+    private long mTxBytes;
+    private long mRxBytes;
+    private long mLastTxBytes;
+    private long mLastRxBytes;
+    private long mLastUpdateTime;
+    private boolean mAutoHide;
+    private long mAutoHideThreshold;
+    private int mUnits;
+    private int mTint = Color.WHITE;
+
+    private Drawable mDrawable;
+
+    private int mRefreshInterval = 2;
+
+    private boolean mAttached;
+    private boolean mHideArrows;
+
+    private boolean mVisible = true;
+
+    private ConnectivityManager mConnectivityManager;
+    private final Handler mTrafficHandler;
+
+    private final AbsoluteSizeSpan mSpeedAbsoluteSizeSpan = new AbsoluteSizeSpan(7, true);
+    private final AbsoluteSizeSpan mUnitAbsoluteSizeSpan = new AbsoluteSizeSpan(6, true);
+    private final DecimalFormat mDecimalFormat_0_2 = new DecimalFormat("0.##");
+    private final DecimalFormat mDecimalFormat_2_0 = new DecimalFormat("##0");
+    private final DecimalFormat mDecimalFormat_1_1 = new DecimalFormat("#0.#");
+
+    private boolean mEnabled = false;
+    private volatile boolean mHasValidatedInternet;
+
+    private final HashMap<Network, LinkProperties> mLinkPropertiesMap = new HashMap<>();
+    // Used to indicate that the set of sources contributing
+    // to current stats have changed.
+    private boolean mNetworksChanged = true;
+
+    private int mVisibleState = STATE_ICON;
+
+    private String mSlot;
+
+    private boolean mColorIsStatic;
+
+    private int mCurrentWidth = -1;
+
+    public NetworkTraffic(Context context) {
+        this(context, null);
+    }
+
+    public NetworkTraffic(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public NetworkTraffic(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mContext = context;
+        mConnectivityManager =
+                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mTrafficHandler = new Handler(mContext.getMainLooper()) {
+            @Override
+            public void handleMessage(Message msg) {
+                switch (msg.what) {
+                    case MESSAGE_TYPE_PERIODIC_REFRESH:
+                        recalculateStats();
+                        displayStatsAndReschedule();
+                        break;
+
+                    case MESSAGE_TYPE_UPDATE_VIEW:
+                        displayStatsAndReschedule();
+                        break;
+
+                    case MESSAGE_TYPE_ADD_NETWORK:
+                        final LinkPropertiesHolder lph = (LinkPropertiesHolder) msg.obj;
+                        mLinkPropertiesMap.put(lph.getNetwork(), lph.getLinkProperties());
+                        mNetworksChanged = true;
+                        updateViews();
+                        break;
+
+                    case MESSAGE_TYPE_REMOVE_NETWORK:
+                        mLinkPropertiesMap.remove((Network) msg.obj);
+                        mNetworksChanged = true;
+                        updateViews();
+                        break;
+                }
+            }
+
+            private void recalculateStats() {
+                final long now = SystemClock.elapsedRealtime();
+                long timeDelta = now - mLastUpdateTime; /* ms */
+
+                if (mLastUpdateTime == 0 || timeDelta <= 500) {
+                    mLastTxBytes = 0;
+                    mLastRxBytes = 0;
+                    mLastUpdateTime = now;
+                    return;
+                }
+
+                // Sum tx and rx bytes from all sources of interest
+                long txBytes = 0;
+                long rxBytes = 0;
+                // Add interface stats, including stats from Clat's IPv4 interface
+                // (for applicable IPv6 networks). Stats are 0 if it doesn't exist.
+                final String[] ifaces = mLinkPropertiesMap.values().stream()
+                        .map(LinkProperties::getInterfaceName)
+                        .filter(iface -> iface != null && !iface.isEmpty())
+                        .distinct()
+                        .flatMap(iface -> Stream.of(iface, CLAT_PREFIX + iface))
+                        .toArray(String[]::new);
+                for (String iface : ifaces) {
+                    final long ifaceTxBytes = TrafficStats.getTxBytes(iface);
+                    final long ifaceRxBytes = TrafficStats.getRxBytes(iface);
+                    txBytes += ifaceTxBytes;
+                    rxBytes += ifaceRxBytes;
+                }
+
+                final long txBytesDelta = txBytes - mLastTxBytes;
+                final long rxBytesDelta = rxBytes - mLastRxBytes;
+
+                if (!mNetworksChanged && timeDelta > 0 && txBytesDelta >= 0 && rxBytesDelta >= 0) {
+                    mTxBytes = (long) (txBytesDelta / (timeDelta / 1000f));
+                    mRxBytes = (long) (rxBytesDelta / (timeDelta / 1000f));
+                } else if (mNetworksChanged) {
+                    mTxBytes = 0;
+                    mRxBytes = 0;
+                    mNetworksChanged = false;
+                }
+                mLastTxBytes = txBytes;
+                mLastRxBytes = rxBytes;
+                mLastUpdateTime = now;
+            }
+
+            private void displayStatsAndReschedule() {
+                final boolean showUpstream =
+                        mMode == MODE_UPSTREAM_ONLY || mMode == MODE_UPSTREAM_AND_DOWNSTREAM;
+                final boolean showDownstream =
+                        mMode == MODE_DOWNSTREAM_ONLY || mMode == MODE_UPSTREAM_AND_DOWNSTREAM;
+                final boolean aboveThreshold = (showUpstream && mTxBytes > mAutoHideThreshold)
+                        || (showDownstream && mRxBytes > mAutoHideThreshold);
+                mIsActive = mAttached
+                        && mHasValidatedInternet
+                        && (!mAutoHide || aboveThreshold);
+
+                int submode = MODE_UPSTREAM_AND_DOWNSTREAM;
+                final boolean trafficactive = (mTxBytes > 0 || mRxBytes > 0);
+
+                clearHandlerCallbacks();
+
+                if (mEnabled && mIsActive) {
+                    CharSequence output = "";
+                    if (showUpstream && showDownstream) {
+                        if (mTxBytes > mRxBytes) {
+                            output = formatOutput(mTxBytes);
+                            submode = MODE_UPSTREAM_ONLY;
+                        } else if (mTxBytes < mRxBytes) {
+                            output = formatOutput(mRxBytes);
+                            submode = MODE_DOWNSTREAM_ONLY;
+                        } else {
+                            output = formatOutput(mRxBytes);
+                            submode = MODE_UPSTREAM_AND_DOWNSTREAM;
+                        }
+                    } else if (showDownstream) {
+                        output = formatOutput(mRxBytes);
+                    } else if (showUpstream) {
+                        output = formatOutput(mTxBytes);
+                    }
+
+                    // Update view if there's anything new to show
+                    if (!TextUtils.equals(output, getText())) {
+                        setText(output);
+                    }
+                }
+
+                updateVisibility();
+
+                if (mVisible && (mSubMode != submode ||
+                        mTrafficActive != trafficactive)) {
+                    mSubMode = submode;
+                    mTrafficActive = trafficactive;
+                    setTrafficDrawable();
+                }
+
+                // Schedule periodic refresh
+                if (mEnabled && mAttached) {
+                    mTrafficHandler.sendEmptyMessageDelayed(MESSAGE_TYPE_PERIODIC_REFRESH,
+                            mRefreshInterval * 1000);
+                }
+            }
+
+            private CharSequence formatOutput(long speed) {
+                String unit;
+                String formatSpeed;
+                SpannableString spanUnitString;
+                SpannableString spanSpeedString;
+                String gunit, munit, kunit;
+
+                if (mUnits == 0) {
+                    // speed is in bytes, convert to bits
+                    speed = speed * 8;
+                    gunit = mContext.getString(R.string.gigabitspersecond_short);
+                    munit = mContext.getString(R.string.megabitspersecond_short);
+                    kunit = mContext.getString(R.string.kilobitspersecond_short);
+                } else {
+                    gunit = mContext.getString(R.string.gigabytespersecond_short);
+                    munit = mContext.getString(R.string.megabytespersecond_short);
+                    kunit = mContext.getString(R.string.kilobytespersecond_short);
+                }
+
+                if (speed >= Giga) {
+                    unit = gunit;
+                    formatSpeed = mDecimalFormat_0_2.format(speed / (float)Giga);
+                } else if (speed >= 100 * Mega) {
+                    unit = munit;
+                    formatSpeed = mDecimalFormat_2_0.format(speed / (float)Mega);
+                } else if (speed >= 10 * Mega) {
+                    unit = munit;
+                    formatSpeed = mDecimalFormat_1_1.format(speed / (float)Mega);
+                } else if (speed >= Mega) {
+                    unit = munit;
+                    formatSpeed = mDecimalFormat_0_2.format(speed / (float)Mega);
+                } else if (speed >= 100 * Kilo) {
+                    unit = kunit;
+                    formatSpeed = mDecimalFormat_2_0.format(speed / (float)Kilo);
+                } else if (speed >= 10 * Kilo) {
+                    unit = kunit;
+                    formatSpeed = mDecimalFormat_1_1.format(speed / (float)Kilo);
+                } else {
+                    unit = kunit;
+                    formatSpeed = mDecimalFormat_0_2.format(speed / (float)Kilo);
+                }
+                spanSpeedString = new SpannableString(formatSpeed);
+                spanSpeedString.setSpan(mSpeedAbsoluteSizeSpan, 0, (formatSpeed).length(),
+                        Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+                spanUnitString = new SpannableString(unit);
+                spanUnitString.setSpan(mUnitAbsoluteSizeSpan, 0, (unit).length(),
+                        Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+                return TextUtils.concat(spanSpeedString, "\n", spanUnitString);
+            }
+        };
+    }
+
+    public static NetworkTraffic fromContext(Context context, String slot) {
+        NetworkTraffic v = new NetworkTraffic(context);
+        v.setSlot(slot);
+        return v;
+    }
+
+    public void setSlot(String slot) {
+        mSlot = slot;
+    }
+
+    @Override
+    public void setTextColor(int color) {
+        super.setTextColor(color);
+        mTint = color;
+        if (mDrawable != null) {
+            DrawableCompat.setTint(mDrawable, mTint);
+        }
+    }
+
+    @Override
+    public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint) {
+        if (mColorIsStatic)
+            return;
+
+        mTint = DarkIconDispatcher.getTint(areas, this, tint);
+        setTextColor(mTint);
+    }
+
+    @Override
+    public void setStaticDrawableColor(int color) {
+        mColorIsStatic = true;
+        mTint = color;
+        setTextColor(mTint);
+    }
+
+    @Override
+    public void setDecorColor(int color) {
+    }
+
+    @Override
+    public String getSlot() {
+        return mSlot;
+    }
+
+    @Override
+    public boolean isIconVisible() {
+        return mEnabled;
+    }
+
+    @Override
+    public int getVisibleState() {
+        return mVisibleState;
+    }
+
+    @Override
+    public void setVisibleState(int state, boolean animate) {
+        mVisibleState = state;
+        updateVisibility();
+    }
+
+    // Network tracking related variables
+    private NetworkRequest mRequest = new NetworkRequest.Builder()
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
+            .build();
+
+    private ConnectivityManager.NetworkCallback mNetworkCallback =
+            new ConnectivityManager.NetworkCallback() {
+                @Override
+                public void onLinkPropertiesChanged(Network network,
+                        LinkProperties linkProperties) {
+                    if (mTrafficHandler != null) {
+                        Message msg = Message.obtain(mTrafficHandler,
+                                MESSAGE_TYPE_ADD_NETWORK,
+                                new LinkPropertiesHolder(network, linkProperties));
+                        mTrafficHandler.sendMessage(msg);
+                    }
+                }
+
+                @Override
+                public void onAvailable(Network network) {
+                    LinkProperties lp = mConnectivityManager == null ? null : 
+                        mConnectivityManager.getLinkProperties(network);
+                    if (lp != null && mTrafficHandler != null) {
+                        Message msg = Message.obtain(mTrafficHandler,
+                                MESSAGE_TYPE_ADD_NETWORK,
+                                new LinkPropertiesHolder(network, lp));
+                        mTrafficHandler.sendMessage(msg);
+                    }
+                }
+
+                @Override
+                public void onLost(Network network) {
+                    if (mTrafficHandler != null) {
+                        Message msg = Message.obtain(mTrafficHandler,
+                            MESSAGE_TYPE_REMOVE_NETWORK, network);
+                        mTrafficHandler.sendMessage(msg);
+                    }
+                }
+            };
+
+    private boolean hasValidatedInternet(Network network) {
+        if (network == null) return false;
+        NetworkCapabilities caps = mConnectivityManager.getNetworkCapabilities(network);
+        return caps != null
+                && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+    }
+
+    private final ConnectivityManager.NetworkCallback mDefaultNetworkCallback =
+            new ConnectivityManager.NetworkCallback() {
+                @Override
+                public void onAvailable(Network network) {
+                    mHasValidatedInternet = hasValidatedInternet(network);
+                    updateViews();
+                }
+
+                @Override
+                public void onCapabilitiesChanged(Network network, NetworkCapabilities caps) {
+                    mHasValidatedInternet = caps != null
+                            && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                            && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+                    updateViews();
+                }
+
+                @Override
+                public void onLost(Network network) {
+                    mHasValidatedInternet = false;
+                    updateViews();
+                }
+            };
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (!mAttached) {
+            mAttached = true;
+            final TunerService tunerService = Dependency.get(TunerService.class);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_ENABLED);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_MODE);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_AUTOHIDE);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_UNITS);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_REFRESH_INTERVAL);
+            tunerService.addTunable(this, NETWORK_TRAFFIC_HIDEARROW);
+
+            mHasValidatedInternet = hasValidatedInternet(mConnectivityManager.getActiveNetwork());
+            mConnectivityManager.registerNetworkCallback(mRequest, mNetworkCallback);
+            mConnectivityManager.registerDefaultNetworkCallback(mDefaultNetworkCallback);
+
+            Dependency.get(DarkIconDispatcher.class).addDarkReceiver(this);
+
+            updateViews();
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mAttached) {
+            clearHandlerCallbacks();
+            mConnectivityManager.unregisterNetworkCallback(mDefaultNetworkCallback);
+            mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
+            Dependency.get(DarkIconDispatcher.class).removeDarkReceiver(this);
+            Dependency.get(TunerService.class).removeTunable(this);
+            mDrawable = null;
+            setCompoundDrawables(null, null, null, null);
+            mAttached = false;
+        }
+    }
+
+    @Override
+    public void onRtlPropertiesChanged(int layoutDirection) {
+        super.onRtlPropertiesChanged(layoutDirection);
+        if (mAttached && mDrawable != null) {
+            setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mDrawable, null);
+        }
+    }
+
+    private void updateVisibility() {
+        boolean visible = mEnabled && mIsActive
+                && !TextUtils.isEmpty(getText())
+                && mVisibleState == STATE_ICON;
+
+        if (visible != mVisible) {
+            mVisible = visible;
+            setFixedWidth();
+            setVisibility(mVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private void setFixedWidth() {
+        int requiredWidth = 0;
+        if (mVisible && !mHideArrows) {
+            requiredWidth = (int) (30 * getResources().getDisplayMetrics().density);
+        } else if (mVisible) {
+            requiredWidth = (int) (18 * getResources().getDisplayMetrics().density);
+        }
+        if (requiredWidth == mCurrentWidth) return;
+        ViewGroup.LayoutParams lp = getLayoutParams();
+        if (lp != null) {
+            mCurrentWidth = requiredWidth;
+            lp.width = requiredWidth;
+            setLayoutParams(lp);
+        }
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case NETWORK_TRAFFIC_ENABLED:
+                mEnabled =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                if (mEnabled) {
+                    setLines(2);
+                    setMaxLines(2);
+                    String txtFont = getResources().getString(com.android.internal.R.string.config_bodyFontFamily);
+                    setTypeface(Typeface.create(txtFont, Typeface.BOLD));
+                    setLineSpacing(0f, 0.95f);
+                    setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
+                    setTextDirection(View.TEXT_DIRECTION_LOCALE);
+                    setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
+                    setGravity(Gravity.END|Gravity.CENTER_VERTICAL);
+                    setElegantTextHeight(false);
+                    setIncludeFontPadding(false);
+                }
+                updateViews();
+                break;
+            case NETWORK_TRAFFIC_MODE:
+                mMode =
+                        TunerService.parseInteger(newValue, 0);
+                updateViews();
+                setTrafficDrawable();
+                break;
+            case NETWORK_TRAFFIC_AUTOHIDE:
+                mAutoHide =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                updateViews();
+                break;
+            case NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD:
+                int autohidethreshold =
+                        TunerService.parseInteger(newValue, 0);
+                mAutoHideThreshold = autohidethreshold * Kilo; /* Convert kB to Bytes */
+                updateViews();
+                break;
+            case NETWORK_TRAFFIC_UNITS:
+                mUnits =
+                        TunerService.parseInteger(newValue, 1);
+                updateViews();
+                break;
+            case NETWORK_TRAFFIC_REFRESH_INTERVAL:
+                mRefreshInterval =
+                        TunerService.parseInteger(newValue, 2);
+                updateViews();
+                break;
+            case NETWORK_TRAFFIC_HIDEARROW:
+                mHideArrows =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                setTrafficDrawable();
+                setFixedWidth();
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void updateViews() {
+        if (mEnabled) {
+            mTrafficHandler.removeMessages(MESSAGE_TYPE_UPDATE_VIEW);
+            mTrafficHandler.sendEmptyMessageDelayed(MESSAGE_TYPE_UPDATE_VIEW, 1000);
+        }
+    }
+
+    private void clearHandlerCallbacks() {
+        mTrafficHandler.removeCallbacksAndMessages(null);
+    }
+
+    private void setTrafficDrawable() {
+        final int drawableResId;
+        if (mHideArrows) {
+            drawableResId = 0;
+        } else if (!mTrafficActive) {
+            drawableResId = R.drawable.stat_sys_network_traffic;
+        } else if (mMode == MODE_UPSTREAM_ONLY || mSubMode == MODE_UPSTREAM_ONLY) {
+            drawableResId = R.drawable.stat_sys_network_traffic_up;
+        } else if (mMode == MODE_DOWNSTREAM_ONLY || mSubMode == MODE_DOWNSTREAM_ONLY) {
+            drawableResId = R.drawable.stat_sys_network_traffic_down;
+        } else if (mMode == MODE_UPSTREAM_AND_DOWNSTREAM) {
+            drawableResId = R.drawable.stat_sys_network_traffic_updown;
+        } else {
+            drawableResId = 0;
+        }
+        final Drawable drawable = mHideArrows ? null
+            : ResourcesCompat.getDrawable(getResources(), drawableResId, getContext().getTheme());
+        if (drawable != null) {
+            DrawableCompat.setTint(drawable, mTint);
+        }
+        if (mDrawable != drawable) {
+            mDrawable = drawable;
+            setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mDrawable, null);
+        }
+    }
+
+    private static class LinkPropertiesHolder {
+        private final Network mNetwork;
+        private final LinkProperties mLinkProperties;
+
+        public LinkPropertiesHolder(Network network, LinkProperties linkProperties) {
+            mNetwork = network;
+            mLinkProperties = linkProperties;
+        }
+
+        public Network getNetwork() {
+            return mNetwork;
+        }
+
+        public LinkProperties getLinkProperties() {
+            return mLinkProperties;
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
index 4c6fa4839e5c4..354b47bbf5a5d 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);
             });
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
index 6b389c7eda959..84fcabf97aa7b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
@@ -743,7 +743,8 @@ public boolean userAllowsNotificationsInPublic(int userHandle) {
 
         boolean notificationRequestsRedaction =
                 ent.isNotificationVisibilityPrivate();
-        boolean userForcesRedaction = packageHasVisibilityOverride(ent.getSbn().getKey());
+        boolean userForcesRedaction = packageHasVisibilityOverride(ent.getSbn().getKey()) ||
+                ent.getSbn().getIsContentSecure();
 
         if (userForcesRedaction) {
             return REDACTION_TYPE_PUBLIC;
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/RemoteInputNotificationRebuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java
index df8b514d6dbc5..9e37ca2133370 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java
@@ -175,8 +175,7 @@ StatusBarNotification rebuildWithRemoteInputInserted(NotificationEntry entry,
                 newNotification,
                 sbn.getUser(),
                 sbn.getOverrideGroupKey(),
-                sbn.getPostTime());
+                sbn.getPostTime(),
+                sbn.getIsContentSecure());
     }
-
-
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 44e8c4d60fd83..57004eedbaa6d 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;
@@ -66,6 +68,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -94,6 +97,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 { }
@@ -144,6 +149,11 @@ public Float get(StatusBarIconView object) {
     @VisibleForTesting float mScaleToFitNewIconSize = 1;
     private StatusBarIcon mIcon;
     @ViewDebug.ExportedProperty private String mSlot;
+    private Drawable mNumberBackground;
+    private Paint mNumberPain;
+    private int mNumberX;
+    private int mNumberY;
+    private String mNumberText;
     private StatusBarNotification mNotification;
     private final boolean mBlocked;
     private Configuration mConfiguration;
@@ -179,6 +189,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);
@@ -190,6 +202,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());
@@ -387,31 +409,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;
@@ -499,6 +559,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) {
@@ -528,6 +603,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);
@@ -562,6 +645,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;
@@ -589,6 +677,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("
@@ -643,6 +763,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();
@@ -660,6 +784,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];
@@ -953,6 +1084,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 f7718bb833311..f8cc00f640a61 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java
@@ -60,6 +60,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;
 
@@ -295,6 +296,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/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java
index 6899ac7508440..087f9ac29d359 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,12 +78,20 @@ 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 boolean mDataDisabledIcon;
+
     private MobileIconGroup mDefaultIcons;
     private Config mConfig;
     @VisibleForTesting
     boolean mInflateSignalStrengths = false;
     @VisibleForTesting
     final MobileStatusTracker mMobileStatusTracker;
+    private final TunerService mTunerService;
 
     // Save the previous STATUS_HISTORY_SIZE states for logging.
     private final String[] mMobileStatusHistory = new String[STATUS_HISTORY_SIZE];
@@ -162,6 +174,26 @@ public void onChange(boolean selfChange) {
             }
         };
         mMobileStatusTracker = mobileStatusTrackerFactory.createTracker(mMobileCallback);
+
+        mTunerService = Dependency.get(TunerService.class);
+    }
+
+    @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;
+            default:
+                break;
+        }
     }
 
     void setConfiguration(Config config) {
@@ -206,6 +238,8 @@ public void registerListener() {
         mContext.getContentResolver().registerContentObserver(Global.getUriFor(
                 Global.MOBILE_DATA + mSubscriptionInfo.getSubscriptionId()),
                 true, mObserver);
+        mTunerService.addTunable(this, DATA_DISABLED_ICON);
+        mTunerService.addTunable(this, SHOW_FOURG_ICON);
     }
 
     /**
@@ -214,6 +248,7 @@ public void registerListener() {
     public void unregisterListener() {
         mMobileStatusTracker.setListening(false);
         mContext.getContentResolver().unregisterContentObserver(mObserver);
+        mTunerService.removeTunable(this);
     }
 
     private void updateInflateSignalStrength() {
@@ -415,7 +450,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);
             }
@@ -426,7 +461,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);
             }
@@ -496,7 +532,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/WifiIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java
index cfc0055954b9f..dbf85d744496c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java
@@ -31,27 +31,13 @@ public class WifiIcons {
      * Check the aconfig flag to decide on which icons to use. Can be removed once the flag is gone
      */
     private static int[] getIconsBasedOnFlag() {
-        if (newStatusBarIcons()) {
-            // TODO(b/396664075):
-            // The new wifi icons only define a range of [0, 3]. Since this array is indexed on
-            // level, we can simulate the range squash by mapping both level 3 to drawn-level 2, and
-            // level 4 to drawn-level 3
-            return new int[] {
-                R.drawable.ic_wifi_0,
-                R.drawable.ic_wifi_1,
-                R.drawable.ic_wifi_2,
-                R.drawable.ic_wifi_2,
-                R.drawable.ic_wifi_3
-            };
-        } else {
-            return new int[] {
-                com.android.internal.R.drawable.ic_wifi_signal_0,
-                com.android.internal.R.drawable.ic_wifi_signal_1,
-                com.android.internal.R.drawable.ic_wifi_signal_2,
-                com.android.internal.R.drawable.ic_wifi_signal_3,
-                com.android.internal.R.drawable.ic_wifi_signal_4
-            };
-        }
+        return new int[] {
+            com.android.internal.R.drawable.ic_wifi_signal_0,
+            com.android.internal.R.drawable.ic_wifi_signal_1,
+            com.android.internal.R.drawable.ic_wifi_signal_2,
+            com.android.internal.R.drawable.ic_wifi_signal_3,
+            com.android.internal.R.drawable.ic_wifi_signal_4
+        };
     }
 
     public static final int[] WIFI_NO_INTERNET_ICONS = getErrorIconsBasedOnFlag();
@@ -64,7 +50,7 @@ private static int[] getIconsBasedOnFlag() {
                 R.drawable.ic_wifi_1_error,
                 R.drawable.ic_wifi_2_error,
                 R.drawable.ic_wifi_2_error,
-                R.drawable.ic_wifi_3_error,
+                R.drawable.ic_wifi_3_error
             };
         } else {
             return new int[] {
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 5b04ec64910b9..bb2255a693648 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
@@ -41,6 +41,7 @@ import com.android.systemui.res.R
 import com.android.systemui.statusbar.core.NewStatusBarIcons
 import com.android.systemui.statusbar.core.RudimentaryBattery
 import com.android.systemui.statusbar.events.BackgroundAnimatableView
+import com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepository
 import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryInteractor
 import com.android.systemui.statusbar.pipeline.battery.shared.ui.BatteryColors
 import com.android.systemui.statusbar.pipeline.battery.shared.ui.BatteryGlyph
@@ -106,7 +107,9 @@ private fun UnifiedBatteryChip(level: Int) {
     val height = with(LocalDensity.current) { BatteryViewModel.STATUS_BAR_BATTERY_HEIGHT.toDp() }
     BatteryLayout(
         attribution = BatteryGlyph.Bolt, // Always charging
+        iconStyleProvider = { BatteryRepository.ICON_STYLE_DEFAULT },
         levelProvider = { level },
+        showLevelProvider = { false },
         isFullProvider = { isFull },
         glyphsProvider = { level.glyphRepresentation() },
         colorsProvider = { BatteryColors.DarkTheme.Charging },
@@ -124,7 +127,9 @@ private fun BatteryAndPercentChip(level: Int) {
     Row(verticalAlignment = Alignment.CenterVertically) {
         BatteryLayout(
             attribution = BatteryGlyph.Bolt, // Always charging
+            iconStyleProvider = { BatteryRepository.ICON_STYLE_DEFAULT },
             levelProvider = { level },
+            showLevelProvider = { false },
             isFullProvider = { isFull },
             glyphsProvider = { emptyList() },
             colorsProvider = { BatteryColors.DarkTheme.Charging },
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 86c88cc7de60a..3b19653f82c59 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
@@ -32,7 +32,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,
@@ -300,18 +303,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) }
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 7aa73c2a2e59d..d242f2cbc0130 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
@@ -238,7 +238,6 @@ public NotificationEntry getEntry(@NonNull String key) {
 
     /** @see NotifPipeline#getAllNotifs() */
     Collection<NotificationEntry> getAllNotifs() {
-        Assert.isMainThread();
         return mReadOnlyNotificationSet;
     }
 
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 de36be896d79a..0c597df71a3f3 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..a68129a3e84fb 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
@@ -211,10 +211,11 @@ constructor(
                 screenshareNotificationHiding() &&
                     sensitiveNotificationProtectionController.shouldProtectNotification(entry)
 
-            val needsRedaction =
-                lockscreenUserManager.getRedactionType(entry) != REDACTION_TYPE_NONE
+            val isSecure = entry.sbn.isContentSecure
+            val needsRedaction = isSecure || lockscreenUserManager.getRedactionType(entry) != REDACTION_TYPE_NONE
             val isSensitive = userPublic && needsRedaction
-            entry.setSensitive(isSensitive || shouldProtectNotification, deviceSensitive)
+            entry.setSensitive(isSensitive || shouldProtectNotification, isSecure || deviceSensitive)
+            entry.row.setForceHideContents(isSecure)
             if (screenshareNotificationHiding()) {
                 entry.row?.setPublicExpanderVisible(!shouldProtectNotification)
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProvider.kt
index e3a9eed3d0272..c9957618a3f94 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProvider.kt
@@ -145,9 +145,11 @@ constructor(
             redactionType =
                 if (
                     screenshareNotificationHiding() &&
-                        sensitiveNotifProtectionController.shouldProtectNotification(entry)
+                    sensitiveNotifProtectionController.shouldProtectNotification(entry)
                 ) {
                     REDACTION_TYPE_PUBLIC
+                } else if (entry.sbn.isContentSecure) {
+                    REDACTION_TYPE_PUBLIC
                 } else {
                     lockscreenUserManager.getRedactionType(entry)
                 },
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 6a2181d96a50a..655f7ee0fe6aa 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
@@ -17,6 +17,7 @@
 package com.android.systemui.statusbar.notification.collection.inflation;
 
 import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_NONE;
+import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_PUBLIC;
 import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED;
 import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_EXPANDED;
 import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC;
@@ -139,7 +140,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);
@@ -254,7 +255,8 @@ private void inflateContentViews(
         params.requireContentViews(FLAG_CONTENT_VIEW_CONTRACTED);
         params.requireContentViews(FLAG_CONTENT_VIEW_EXPANDED);
         params.setUseMinimized(isMinimized);
-        int redactionType = inflaterParams.getRedactionType();
+        int redactionType = entry.getSbn().getIsContentSecure() ?
+            REDACTION_TYPE_PUBLIC : inflaterParams.getRedactionType();
 
         params.setRedactionType(redactionType);
         if (redactionType != REDACTION_TYPE_NONE) {
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 120244c923ca8..31c4fd4a98d17 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;
@@ -124,8 +126,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;
 
@@ -227,7 +231,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<>();
@@ -245,12 +252,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.registerContentObserverSync(
                 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();
@@ -1261,6 +1274,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
@@ -1449,7 +1463,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 f7286db064b8e..465d9af59d2ba 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
@@ -43,6 +47,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
@@ -70,6 +75,8 @@ constructor(
     @Application private val applicationCoroutineScope: CoroutineScope,
     @Background private val bgCoroutineContext: CoroutineContext,
     @Main private val mainCoroutineContext: CoroutineContext,
+    private val context: Context,
+    @Main handler: Handler,
 ) : ConversationIconManager {
 
     /**
@@ -90,6 +97,8 @@ constructor(
     private var launcherPeopleAvatarIconJobs: ConcurrentHashMap<String, Job> =
         ConcurrentHashMap<String, Job>()
 
+    private var attached = false
+
     fun addIconsUpdateListener(listener: OnIconUpdateRequiredListener) {
         StatusBarConnectedDisplays.unsafeAssertInNewMode()
         onIconUpdateRequiredListeners += listener
@@ -101,7 +110,26 @@ constructor(
     }
 
     fun attach() {
+        if (attached) return
+        attached = true
+
         notifCollection.addCollectionListener(entryListener)
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.STATUSBAR_COLORED_ICONS),
+            false, settingsObserver, UserHandle.USER_ALL
+        )
+         context.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 =
@@ -143,10 +171,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
         }
 
@@ -183,8 +215,12 @@ constructor(
             // Set the icon views' icons
             val (normalIconDescriptor, sensitiveIconDescriptor) = getIconDescriptors(entry)
 
+            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
+
             try {
-                setIcon(entry, normalIconDescriptor, sbIcon)
 
                 if (
                     android.app.Flags.hideStatusBarNotification() &&
@@ -197,10 +233,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) {
@@ -214,11 +251,15 @@ constructor(
         traceSection("IconManager.updateSbIcon") {
             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 (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)
         }
 
     /**
@@ -228,7 +269,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
@@ -254,30 +295,35 @@ constructor(
             val notificationContentDescription =
                 entry.sbn.notification?.let { iconBuilder.getIconContentDescription(it) }
 
+            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
+
             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)
             }
         }
 
-    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)
@@ -361,9 +407,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 ed770cec5b9ed..a7aafa00c4b24 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
@@ -41,6 +41,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
@@ -229,5 +230,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 d237bbf3552d7..70e474b4d1c8f 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
@@ -84,7 +85,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 f586051feb567..7b46e305d5a35 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 84009e0b301b4..7751f6d68ee07 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
@@ -326,10 +326,6 @@ public void onAnimationEnd(Animator animation) {
     protected void setBackgroundTintColor(int color) {
         if (color != mCurrentBackgroundTint) {
             mCurrentBackgroundTint = color;
-            if (notificationBackgroundTintOptimization() && color == mNormalColor) {
-                // We don't need to tint a normal notification
-                color = 0;
-            }
             mBackgroundNormal.setTint(color);
         }
     }
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 35c3bd3d6519f..cf6ba1af74531 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
@@ -146,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;
@@ -410,7 +411,7 @@ public void toggleExpansionState() {
     }
 
     private void toggleExpansionState(View v, boolean shouldLogExpandClickMetric) {
-        if (!shouldShowPublic() && (!mIsMinimized || isExpanded()) && isGroupRoot()) {
+        if (!shouldShowPublic() && (!mIsMinimized || isExpanded()) && isGroupRoot() && !NTForbiddenSwipeDownQSController.get(mContext).getForbiddenSwipeDownQS()) {
             mGroupExpansionChanging = true;
             if (NotificationBundleUi.isEnabled()) {
                 final boolean wasExpanded =  mGroupExpansionManager.isGroupExpanded(mEntryAdapter);
@@ -508,6 +509,9 @@ public Float get(ExpandableNotificationRow object) {
             mDismissButtonTargetVisibilityListeners = new ListenerSet<>();
     @RedactionType
     private int mRedactionType = REDACTION_TYPE_NONE;
+
+    private boolean mForceHideContents = false;
+
     public NotificationContentView[] getLayouts() {
         return Arrays.copyOf(mLayouts, mLayouts.length);
     }
@@ -2897,8 +2901,8 @@ public boolean isBundle() {
     }
 
     private void updateChildrenVisibility() {
-        boolean hideContentWhileLaunching = mExpandAnimationRunning && mGuts != null
-                && mGuts.isExposed();
+        boolean hideContentWhileLaunching = mForceHideContents || (mExpandAnimationRunning && mGuts != null
+                && mGuts.isExposed());
         mPrivateLayout.setVisibility(!mShowingPublic && !mIsSummaryWithChildren
                 && !hideContentWhileLaunching ? VISIBLE : INVISIBLE);
         if (mChildrenContainer != null) {
@@ -3090,6 +3094,7 @@ public boolean isSoundEffectsEnabled() {
     }
 
     public boolean isExpandable() {
+        if (mForceHideContents) return false;
         if (mIsSummaryWithChildren && !shouldShowPublic()) {
             return !mChildrenExpanded;
         }
@@ -3284,6 +3289,7 @@ public int getHeightWithoutLockscreenConstraints() {
 
     @Override
     public int getIntrinsicHeight() {
+        if (mForceHideContents) return getCollapsedHeight();
         if (isUserLocked()) {
             return getActualHeight();
         } else if (mGuts != null && mGuts.isExposed()) {
@@ -3614,7 +3620,7 @@ public void setHideSensitive(boolean hideSensitive, boolean animated, long delay
             } else {
                 mLogger.logSkipResetAllContentAlphas(mLoggingKey);
             }
-            mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE);
+            mPublicLayout.setVisibility((mShowingPublic || mForceHideContents) ? VISIBLE : INVISIBLE);
             updateChildrenVisibility();
         } else {
             animateShowingPublic(delay, duration, mShowingPublic);
@@ -3711,7 +3717,7 @@ public boolean canViewBeCleared() {
     }
 
     private boolean shouldShowPublic() {
-        return mSensitive && mHideSensitiveForIntrinsicHeight;
+        return mForceHideContents || (mSensitive && mHideSensitiveForIntrinsicHeight);
     }
 
     public void makeActionsVisibile() {
@@ -4506,6 +4512,13 @@ public void setAboveShelf(boolean aboveShelf) {
         }
     }
 
+    public void setForceHideContents(boolean forceHide) {
+        if (mForceHideContents == forceHide) return;
+        mForceHideContents = forceHide;
+        updateChildrenVisibility();
+        onNotificationUpdated();
+    }
+
     private static class NotificationViewState extends ExpandableViewState {
 
         @Override
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..03d31a87438e6 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
@@ -31,6 +31,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;
@@ -450,6 +451,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 08d3acbe8f42c..49619597593df 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
@@ -33,13 +33,17 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.app.ActivityManager;
 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;
@@ -49,6 +53,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;
@@ -79,6 +84,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;
@@ -276,6 +283,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
@@ -295,12 +324,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 8bc8586be7fe9..ddb2236840a11 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
@@ -35,22 +35,28 @@
 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;
 import android.metrics.LogMaker;
 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 +90,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;
@@ -392,6 +400,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() {
@@ -570,6 +621,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/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java
index e3afb14234050..510d77599fc97 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
@@ -905,7 +905,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/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
index 56c05b6d4ff8c..452e07b07e4e8 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
@@ -239,6 +239,7 @@ public void onViewDetachedFromWindow(View v) {
                     mColorUpdateLogger.logTriggerEvent("NSSLC.onViewDetachedFromWindow()");
                     mConfigurationController.removeCallback(mConfigurationListener);
                     mStatusBarStateController.removeCallback(mStateListener);
+                    mTunerService.removeTunable(mTunable);
                 }
             };
 
@@ -989,16 +990,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);
 
@@ -1030,6 +1022,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;
+        }
+    };
+
     private boolean isInVisibleLocation(NotificationEntry entry) {
         ExpandableNotificationRow row = entry.getRow();
         if (row == 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 a7f84da27ca91..79b653792a747 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
@@ -661,7 +661,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()
@@ -765,6 +765,7 @@ public void onBiometricAuthFailed(BiometricSourceType biometricSourceType) {
 
             if (mNumConsecutiveFpFailures >= UDFPS_ATTEMPTS_BEFORE_SHOW_BOUNCER) {
                 mLogger.logUdfpsAttemptThresholdMet(mNumConsecutiveFpFailures);
+                mKeyguardViewController.setIsFromBiometric(true);
                 startWakeAndUnlock(
                         MODE_SHOW_BOUNCER,
                         BiometricUnlockSource.Companion.fromBiometricSourceType(biometricSourceType)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
index 720a755f633c7..1190512139045 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
@@ -46,6 +46,7 @@
 import com.android.systemui.qs.QSPanelController;
 import com.android.systemui.shared.statusbar.phone.BarTransitions;
 import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
+import com.android.systemui.statusbar.policy.GameSpaceManager;
 import com.android.systemui.util.Compile;
 
 import java.io.PrintWriter;
@@ -356,4 +357,10 @@ void setIsLaunchingActivityOverLockscreen(
      */
     ActivityTransitionAnimator.Controller getAnimatorControllerFromNotification(
             ExpandableNotificationRow associatedView);
+
+    void brightnessControl(MotionEvent event);
+
+    void onBrightnessChanged(boolean upOrCancel);
+
+    GameSpaceManager getGameSpaceManager();
 }
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 f9e1692bab2a2..1c0e2820d1b72 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -29,12 +29,14 @@
 
 import static androidx.lifecycle.Lifecycle.State.RESUMED;
 
+import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX;
+import static com.android.settingslib.display.BrightnessUtils.convertGammaToLinearFloat;
+
 import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;
 import static com.android.systemui.Flags.keyboardShortcutHelperRewrite;
 import static com.android.systemui.Flags.statusBarSignalPolicyRefactor;
 import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;
 import static com.android.systemui.flags.Flags.SHORTCUT_LIST_SEARCH_LAYOUT;
-import static com.android.systemui.shared.Flags.ambientAod;
 import static com.android.systemui.statusbar.StatusBarState.SHADE;
 
 import android.annotation.Nullable;
@@ -54,11 +56,14 @@
 import android.content.res.Configuration;
 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;
@@ -71,15 +76,19 @@
 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;
 import android.view.Display;
+import android.view.HapticFeedbackConstants;
 import android.view.IRemoteAnimationRunner;
 import android.view.IWindowManager;
 import android.view.MotionEvent;
 import android.view.ThreadedRenderer;
 import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.WindowManagerGlobal;
@@ -92,6 +101,7 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.colorextraction.ColorExtractor;
+import com.android.internal.display.BrightnessSynchronizer;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.UiEvent;
 import com.android.internal.logging.UiEventLogger;
@@ -99,6 +109,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.statusbar.IStatusBarService;
 import com.android.internal.statusbar.RegisterStatusBarResult;
+import com.android.internal.util.crdroid.Utils;
 import com.android.keyguard.AuthKeyguardMessageArea;
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.KeyguardUpdateMonitorCallback;
@@ -129,16 +140,19 @@
 import com.android.systemui.dagger.qualifiers.UiBackground;
 import com.android.systemui.demomode.DemoMode;
 import com.android.systemui.demomode.DemoModeController;
+import com.android.systemui.edgelight.EdgeLightViewController;
 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;
@@ -154,6 +168,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;
@@ -217,11 +232,13 @@
 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;
 import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
 import com.android.systemui.statusbar.policy.ExtensionController;
+import com.android.systemui.statusbar.policy.GameSpaceManager;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
 import com.android.systemui.statusbar.window.StatusBarWindowControllerStore;
@@ -229,6 +246,7 @@
 import com.android.systemui.surfaceeffects.ripple.RippleShader.RippleShape;
 import com.android.systemui.topui.TopUiController;
 import com.android.systemui.topui.TopUiControllerRefactor;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.DumpUtilsKt;
 import com.android.systemui.util.WallpaperController;
 import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -272,13 +290,24 @@
  * {@link ActivityStarterImpl}
  */
 @SysUISingleton
-public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
+public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces,
+        TunerService.Tunable {
+
+    private static final String STATUS_BAR_BRIGHTNESS_CONTROL =
+            "system:" + Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL;
+    private static final String PULSE_ON_NEW_TRACKS =
+            Settings.Secure.PULSE_ON_NEW_TRACKS;
 
     private static final int MSG_LAUNCH_TRANSITION_TIMEOUT = 1003;
+    private static final int MSG_LONG_PRESS_BRIGHTNESS_CHANGE = 1004;
     // 1020-1040 reserved for BaseStatusBar
 
     private static final UiEventLogger sUiEventLogger = new UiEventLoggerImpl();
 
+    private static final float BRIGHTNESS_CONTROL_PADDING = 0.15f;
+    private static final int BRIGHTNESS_CONTROL_LONG_PRESS_TIMEOUT = 750; // ms
+    private static final int BRIGHTNESS_CONTROL_LINGER_THRESHOLD = 20;
+
     private final Context mContext;
     private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
     private final DeviceStateManager mDeviceStateManager;
@@ -434,6 +463,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;
@@ -458,10 +489,16 @@ public QSPanelController getQSPanelController() {
     private final MessageRouter mMessageRouter;
     private final WallpaperManager mWallpaperManager;
     private final UserTracker mUserTracker;
+    private final TunerService mTunerService;
     private final ActivityStarter mActivityStarter;
 
+    private GameSpaceManager mGameSpaceManager;
+
     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")
@@ -602,6 +639,21 @@ public int getId() {
 
     private final QuickAccessWalletController mWalletController;
 
+    private final BurnInProtectionController mBurnInProtectionController;
+
+    private DisplayManager mDisplayManager;
+
+    private float mMinimumBacklight;
+    private float mMaximumBacklight;
+    private int mInitialTouchX;
+    private int mInitialTouchY;
+    private int mLinger;
+    private int mQuickQsOffsetHeight;
+    private boolean mBrightnessChanged;
+    private boolean mBrightnessControl;
+    private boolean mJustPeeked;
+    private float mCurrentBrightness;
+
     /**
      * Public constructor for CentralSurfaces.
      *
@@ -712,13 +764,15 @@ 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,
+            BurnInProtectionController burnInProtectionController
     ) {
         mContext = context;
         mNotificationsController = notificationsController;
@@ -810,6 +864,7 @@ public CentralSurfacesImpl(
         mCameraLauncherLazy = cameraLauncherLazy;
         mAlternateBouncerInteractor = alternateBouncerInteractor;
         mUserTracker = userTracker;
+        mTunerService = tunerService;
         mActivityStarter = activityStarter;
         mBrightnessMirrorShowingRepository = brightnessMirrorShowingRepository;
         if (!SceneContainerFlag.isEnabled()) {
@@ -828,6 +883,7 @@ public CentralSurfacesImpl(
             statusBarWindowStateController.addListener(this::onStatusBarWindowStateChanged);
         }
         mScreenOffAnimationController = screenOffAnimationController;
+        mBurnInProtectionController = burnInProtectionController;
 
         ShadeExpansionListener shadeExpansionListener = this::onPanelExpansionChanged;
         ShadeExpansionChangeEvent currentState =
@@ -837,6 +893,8 @@ public CentralSurfacesImpl(
         mActivityIntentHelper = new ActivityIntentHelper(mContext);
         mActivityTransitionAnimator = activityTransitionAnimator;
 
+        mGameSpaceManager = new GameSpaceManager(mContext, mKeyguardStateController);
+
         // TODO(b/190746471): Find a better home for this.
         DateTimeView.setReceiverHandler(timeTickHandler);
 
@@ -851,6 +909,8 @@ public CentralSurfacesImpl(
                 data -> mCommandQueueCallbacks.animateExpandSettingsPanel(data.mSubpanel));
         mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,
                 id -> onLaunchTransitionTimeout());
+        mMessageRouter.subscribeTo(MSG_LONG_PRESS_BRIGHTNESS_CHANGE,
+                id -> onLongPressBrightnessChange());
 
         mDeviceStateManager = deviceStateManager;
         wiredChargingRippleController.registerCallbacks();
@@ -885,6 +945,7 @@ public void start() {
         mKeyguardIndicationController.init();
 
         mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);
+        mDisplayManager = mContext.getSystemService(DisplayManager.class);
 
         mDisplay = mContext.getDisplay();
         mDisplayId = mDisplay.getDisplayId();
@@ -917,6 +978,9 @@ public void start() {
 
         createAndAddWindows(result);
 
+        mTunerService.addTunable(this, STATUS_BAR_BRIGHTNESS_CONTROL);
+        mTunerService.addTunable(this, PULSE_ON_NEW_TRACKS);
+
         // Set up the initial notification state. This needs to happen before CommandQueue.disable()
         setUpPresenter();
 
@@ -984,7 +1048,7 @@ public void onUnlockedChanged() {
 
             @Override
             public void onKeyguardGoingAwayChanged() {
-                if (ambientAod()) {
+                if (Utils.ambientAod()) {
                     // This code path is not used if the KeyguardTransitionRepository is managing
                     // the lightreveal scrim.
                     return;
@@ -1107,6 +1171,15 @@ public void onHoldStatusBarOpenChange() {
                             }
                         }
                 )));
+        getNotifContainerParentView().addView(MediaViewController.get(mContext).getMediaArtScrim(), 0);
+        getNotifContainerParentView().addView(PulseViewController.get(mContext).getPulseView(), 1);
+        getNotifContainerParentView().addView(EdgeLightViewController.get(mContext).getEdgeLightView(), 2);
+    }
+
+    private ViewGroup getNotifContainerParentView() {
+        ViewGroup rootView = (ViewGroup) getNotificationShadeWindowView().findViewById(R.id.scrim_behind).getParent();
+        ViewGroup targetView = rootView.findViewById(R.id.notification_container_parent);
+        return targetView;
     }
 
     @VisibleForTesting
@@ -1195,6 +1268,11 @@ protected void makeStatusBarView(@Nullable RegisterStatusBarResult result) {
         getNotificationShadeWindowView().setOnTouchListener(getStatusBarWindowTouchListener());
         mWallpaperController.setRootView(getNotificationShadeWindowView());
 
+        mMinimumBacklight = mPowerManager.getBrightnessConstraint(
+                PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM);
+        mMaximumBacklight = mPowerManager.getBrightnessConstraint(
+                PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM);
+
         mDemoModeController.addCallback(mDemoModeCallback);
         // When the StatusBarConnectedDisplays flag is enabled, this logic will be done in
         // StatusBarOrchestrator.
@@ -1238,6 +1316,8 @@ protected void makeStatusBarView(@Nullable RegisterStatusBarResult result) {
                         mShadeSurface.updateExpansionAndVisibility();
                         setBouncerShowingForStatusBarComponents(mBouncerShowing);
                         checkBarModes();
+                        mPhoneStatusBarViewController.setBrightnessControlEnabled(mBrightnessControl);
+                        mBurnInProtectionController.setPhoneStatusBarView(mPhoneStatusBarViewController.getPhoneStatusBarView());
                     });
         }
         if (!StatusBarRootModernization.isEnabled() && !StatusBarConnectedDisplays.isEnabled()) {
@@ -1480,6 +1560,12 @@ protected void registerBroadcastReceiver() {
         filter.addAction(Intent.ACTION_SCREEN_OFF);
         filter.addAction(lineageos.content.Intent.ACTION_SCREEN_CAMERA_GESTURE);
         mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter, null, UserHandle.ALL);
+        mGameSpaceManager.observe();
+    }
+
+    @Override
+    public GameSpaceManager getGameSpaceManager() {
+        return mGameSpaceManager;
     }
 
     protected QS createDefaultQSFragment() {
@@ -1680,6 +1766,93 @@ private void maybeEscalateHeadsUp() {
         mHeadsUpManager.releaseAllImmediately();
     }
 
+    private void adjustBrightness(int x) {
+        mBrightnessChanged = true;
+        float raw = ((float) x) / getDisplayWidth();
+
+        // Add a padding to the brightness control on both sides to
+        // make it easier to reach min/max brightness
+        float padded = Math.min(1.0f - BRIGHTNESS_CONTROL_PADDING,
+                Math.max(BRIGHTNESS_CONTROL_PADDING, raw));
+        float value = (padded - BRIGHTNESS_CONTROL_PADDING) /
+                (1 - (2.0f * BRIGHTNESS_CONTROL_PADDING));
+        final float val = convertGammaToLinearFloat(
+                Math.round(value * GAMMA_SPACE_MAX),
+                mMinimumBacklight, mMaximumBacklight);
+        mCurrentBrightness = val;
+        mDisplayManager.setTemporaryBrightness(mDisplayId, val);
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                Settings.System.putIntForUser(mContext.getContentResolver(),
+                        Settings.System.SCREEN_BRIGHTNESS,
+                        BrightnessSynchronizer.brightnessFloatToInt(val),
+                        UserHandle.USER_CURRENT);
+            }
+        });
+    }
+
+    @Override
+    public void brightnessControl(MotionEvent event) {
+        final int action = event.getAction();
+        final int x = (int) event.getRawX();
+        final int y = (int) event.getRawY();
+        mQuickQsOffsetHeight = mContext.getResources().getDimensionPixelSize(
+                com.android.internal.R.dimen.quick_qs_offset_height);
+        if (action == MotionEvent.ACTION_DOWN) {
+            if (y < mQuickQsOffsetHeight) {
+                mLinger = 0;
+                mInitialTouchX = x;
+                mInitialTouchY = y;
+                mJustPeeked = true;
+                mMessageRouter.cancelMessages(MSG_LONG_PRESS_BRIGHTNESS_CHANGE);
+                mMessageRouter.sendMessageDelayed(MSG_LONG_PRESS_BRIGHTNESS_CHANGE,
+                        BRIGHTNESS_CONTROL_LONG_PRESS_TIMEOUT);
+            }
+        } else if (action == MotionEvent.ACTION_MOVE) {
+            if (y < mQuickQsOffsetHeight && mJustPeeked) {
+                if (mLinger > BRIGHTNESS_CONTROL_LINGER_THRESHOLD) {
+                    adjustBrightness(x);
+                } else {
+                    final int xDiff = Math.abs(x - mInitialTouchX);
+                    final int yDiff = Math.abs(y - mInitialTouchY);
+                    final int touchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop();
+                    if (xDiff > yDiff) {
+                        mLinger++;
+                    }
+                    if (xDiff > touchSlop || yDiff > touchSlop) {
+                        mMessageRouter.cancelMessages(MSG_LONG_PRESS_BRIGHTNESS_CHANGE);
+                    }
+                }
+            } else {
+                if (y > mQuickQsOffsetHeight) {
+                    mJustPeeked = false;
+                }
+                mMessageRouter.cancelMessages(MSG_LONG_PRESS_BRIGHTNESS_CHANGE);
+            }
+        } else if (action == MotionEvent.ACTION_UP
+                || action == MotionEvent.ACTION_CANCEL) {
+            mMessageRouter.cancelMessages(MSG_LONG_PRESS_BRIGHTNESS_CHANGE);
+        }
+    }
+
+    @Override
+    public void onBrightnessChanged(boolean upOrCancel) {
+        if (mBrightnessChanged && upOrCancel) {
+            mBrightnessChanged = false;
+            if (mJustPeeked && mShadeController.isExpandedVisible()) {
+                getNotificationShadeWindowViewController().fling(10, false, false);
+            }
+            mDisplayManager.setBrightness(mDisplayId, mCurrentBrightness);
+        }
+    }
+
+    void onLongPressBrightnessChange() {
+        mShadeController.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+        adjustBrightness(mInitialTouchX);
+        mLinger = BRIGHTNESS_CONTROL_LINGER_THRESHOLD + 1;
+    }
+
     private void onExpandedInvisible() {
         setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
         if (!mNotificationActivityStarterLazy.get().isCollapsingToShowActivityOverLockscreen()) {
@@ -2025,8 +2198,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() {
@@ -2475,7 +2651,7 @@ private void updateRevealEffect(boolean wakingUp) {
             return;
         }
 
-        if (ambientAod()) {
+        if (Utils.ambientAod()) {
             return;
         }
 
@@ -2558,6 +2734,8 @@ public void onFinishedGoingToSleep() {
 
             updateNotificationPanelTouchState();
             getNotificationShadeWindowViewController().cancelCurrentTouch();
+
+            mBurnInProtectionController.stopShiftTimer();
             if (mLaunchCameraOnFinishedGoingToSleep) {
                 mLaunchCameraOnFinishedGoingToSleep = false;
 
@@ -2585,6 +2763,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
@@ -2633,6 +2813,7 @@ public void onStartedWakingUp() {
                 }
             });
             DejankUtils.stopDetectingBlockingIpcs(tag);
+            mHandler.removeCallbacks(mSystemUiGcOpt);
         }
 
         /**
@@ -2697,6 +2878,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;
+            }
         }
     };
 
@@ -2885,6 +3081,27 @@ public boolean shouldIgnoreTouch() {
                 || mScreenOffAnimationController.shouldIgnoreKeyguardTouches();
     }
 
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case STATUS_BAR_BRIGHTNESS_CONTROL:
+                mBrightnessControl =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                if (mPhoneStatusBarViewController != null)
+                    mPhoneStatusBarViewController.setBrightnessControlEnabled(mBrightnessControl);
+                break;
+            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;
@@ -3140,7 +3357,7 @@ public void onStateChanged(int newState) {
 
                 @Override
                 public void onDozeAmountChanged(float linear, float eased) {
-                    if (!ambientAod()
+                    if (!Utils.ambientAod()
                             && !(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) {
                         // If wakeAndUnlocking, this is handled in AuthRippleInteractor
                         if (!mBiometricUnlockController.isWakeAndUnlock()) {
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 9c7af181284e3..db8e3b4e3f6e0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt
@@ -58,32 +58,31 @@ constructor(@Assisted private val context: Context) :
         layoutDirection = currentConfig.layoutDirection
     }
 
-    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.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) }) {
-            it.onMovedToDisplay(newDisplayId, newConfiguration)
-        }
+        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) }
+        // First notify raw config change
+        forEachListener { it.onConfigChanged(newConfig) }
+
         val fontScale = newConfig.fontScale
         val density = newConfig.densityDpi
         val uiMode = newConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK
         val uiModeChanged = uiMode != this.uiMode
-        if (density != this.density || fontScale != this.fontScale || inCarMode && uiModeChanged) {
-            listeners.filterForEach({ this.listeners.contains(it) }) {
-                it.onDensityOrFontScaleChanged()
-            }
+
+        if (density != this.density || fontScale != this.fontScale || (inCarMode && uiModeChanged)) {
+            forEachListener { it.onDensityOrFontScaleChanged() }
             this.density = density
             this.fontScale = fontScale
         }
@@ -91,9 +90,7 @@ constructor(@Assisted private val context: Context) :
         val smallestScreenWidth = newConfig.smallestScreenWidthDp
         if (smallestScreenWidth != this.smallestScreenWidth) {
             this.smallestScreenWidth = smallestScreenWidth
-            listeners.filterForEach({ this.listeners.contains(it) }) {
-                it.onSmallestScreenWidthChanged()
-            }
+            forEachListener { it.onSmallestScreenWidthChanged() }
         }
 
         val maxBounds = newConfig.windowConfiguration.maxBounds
@@ -103,41 +100,37 @@ 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) {
             // We need to force the style re-evaluation to make sure that it's up to date
             // and attrs were reloaded.
             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) }) {
-                it.onLayoutDirectionChanged(layoutDirection == LAYOUT_DIRECTION_RTL)
-            }
+            val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
+            forEachListener { it.onLayoutDirectionChanged(isRtl) }
         }
 
         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) }) {
-                it.onOrientationChanged(orientation)
-            }
+            forEachListener { it.onOrientationChanged(orientation) }
         }
     }
 
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 34c193d188146..57dd4085e4065 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 03378c28c517b..8f46552820158 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -96,7 +96,6 @@ public class DozeParameters implements
     private final SecureSettings mSecureSettings;
     private final Optional<MinModeManager> mMinModeManager;
 
-    private boolean mDozeAlwaysOn;
     private boolean mControlScreenOffAnimation;
     private boolean mIsQuickPickupEnabled;
 
@@ -288,7 +287,8 @@ public boolean isMinModeActive() {
      * @return {@code true} if enabled and available.
      */
     public boolean getAlwaysOn() {
-        return mDozeAlwaysOn && !mBatteryController.isAodPowerSave() && !isMinModeActive();
+        return mAmbientDisplayConfiguration.alwaysOnEnabled(mUserTracker.getUserId())
+                && !mBatteryController.isAodPowerSave() && !isMinModeActive();
     }
 
     /**
@@ -443,8 +443,6 @@ public String[] brightnessNames() {
 
     @Override
     public void onTuningChanged(String key, String newValue) {
-        mDozeAlwaysOn = mAmbientDisplayConfiguration.alwaysOnEnabled(mUserTracker.getUserId());
-
         if (key.equals(Settings.Secure.DOZE_ALWAYS_ON)) {
             updateControlScreenOff();
         }
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 21659b8586617..55e3fef046535 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;
@@ -284,6 +285,7 @@ void updateDozing() {
         for (Callback callback : mCallbacks) {
             callback.onDozingChanged(dozing);
         }
+        ScrimUtils.get().onDozingChanged(dozing);
         mDozeInteractor.setIsDozing(dozing);
         mStatusBarStateController.setIsDozing(dozing);
     }
@@ -325,6 +327,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..f3dcdea95af71 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
@@ -85,6 +85,7 @@ public void clearMessages() {
         }
         mMessage = "";
         setText("");
+        clearBackgroundAndIcon();
     }
 
     /**
@@ -103,6 +104,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 +248,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 +264,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..dd10f5f66f1cd 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);
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 07812aa472ac9..bb0ba2b44b0e5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java
@@ -98,6 +98,7 @@
 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.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 +116,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 +177,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
     private final OccludedToLockscreenTransitionViewModel mOccludedToLockscreenTransitionViewModel;
     private final DreamViewModel mDreamViewModel;
     private final KeyguardInteractor mKeyguardInteractor;
+    private final TunerService mTunerService;
 
     private ViewGroup mSystemIconsContainer;
     private final StatusOverlayHoverListenerFactory mStatusOverlayHoverListenerFactory;
@@ -390,7 +401,8 @@ public KeyguardStatusBarViewController(
             GoneToGlanceableHubTransitionViewModel goneToGlanceableHubTransitionViewModel,
             OccludedToLockscreenTransitionViewModel occludedToLockscreenTransitionViewModel,
             DreamViewModel dreamViewModel,
-            KeyguardInteractor keyguardInteractor
+            KeyguardInteractor keyguardInteractor,
+            TunerService tunerService
     ) {
         super(view);
         mCoroutineDispatcher = dispatcher;
@@ -427,6 +439,7 @@ public KeyguardStatusBarViewController(
         mOccludedToLockscreenTransitionViewModel = occludedToLockscreenTransitionViewModel;
         mDreamViewModel = dreamViewModel;
         mKeyguardInteractor = keyguardInteractor;
+        mTunerService = tunerService;
 
         mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled();
         if (!SceneContainerFlag.isEnabled()) {
@@ -509,6 +522,9 @@ protected void onViewAttached() {
                 false,
                 mVolumeSettingObserver,
                 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()) {
@@ -574,6 +590,21 @@ protected void onViewDetached() {
         if (SceneContainerFlag.isEnabled()) {
             mKeyguardStateController.removeCallback(mKeyguardStateControllerCallback);
         }
+        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. */
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 0730dfa3ed57e..93153dcd41fe9 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;
@@ -302,7 +304,7 @@ public void setIconSize(int size) {
         mIconSize = size;
     }
 
-    private void updateState() {
+    public void updateState() {
         resetViewStates();
         calculateIconXTranslations();
         applyIconStates();
@@ -837,11 +839,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);
@@ -884,7 +890,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 27abdd2f66648..6bda8d99b0305 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;
@@ -57,10 +59,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;
@@ -74,7 +72,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;
@@ -83,6 +80,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;
@@ -106,13 +104,15 @@ 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 static final String NETWORK_TRAFFIC_ENABLED =
+            "system:" + Settings.System.NETWORK_TRAFFIC_ENABLED;
 
     private final String mSlotHotspot;
     private final String mSlotBluetooth;
@@ -125,13 +125,12 @@ 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 String mSlotNetworkTraffic;
     private final int mDisplayId;
     private final SharedPreferences mSharedPreferences;
     private final DateFormatUtil mDateFormatUtil;
@@ -157,13 +156,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;
 
@@ -180,6 +176,14 @@ public class PhoneStatusBarPolicy
     private BluetoothController mBluetooth;
     private AlarmClockInfo mNextAlarm;
 
+    private NfcAdapter mAdapter;
+
+    private TunerService mTunerService;
+
+    private boolean mShowBluetoothBattery;
+
+    private boolean mShowNetworkTraffic;
+
     @Inject
     public PhoneStatusBarPolicy(Context context, StatusBarIconController iconController,
             CommandQueue commandQueue, BroadcastDispatcher broadcastDispatcher,
@@ -191,18 +195,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;
@@ -224,14 +226,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);
@@ -250,17 +249,18 @@ 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);
+        mSlotNetworkTraffic = resources.getString(com.android.internal.R.string.status_bar_network_traffic);
 
         mDisplayId = displayId;
         mSharedPreferences = sharedPreferences;
         mDateFormatUtil = dateFormatUtil;
+
+        mTunerService = tunerService;
     }
 
     /** Initialize the object after construction. */
@@ -276,6 +276,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);
 
@@ -289,6 +290,8 @@ public void init() {
         updateTTY();
 
         // bluetooth status
+        mShowBluetoothBattery = Settings.System.getIntForUser(mContext.getContentResolver(),
+            BLUETOOTH_SHOW_BATTERY, 1, UserHandle.USER_CURRENT) != 0;
         updateBluetooth();
 
         // Alarm clock
@@ -328,25 +331,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));
@@ -361,6 +345,17 @@ 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();
+
+        // network traffic
+        mShowNetworkTraffic = Settings.System.getIntForUser(mContext.getContentResolver(),
+            NETWORK_TRAFFIC_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+        mIconController.setNetworkTraffic(mSlotNetworkTraffic);
+
         mRotationLockController.addCallback(this);
         mBluetooth.addCallback(this);
         mProvisionedController.addCallback(this);
@@ -374,13 +369,14 @@ 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);
+        mTunerService.addTunable(this, NETWORK_TRAFFIC_ENABLED);
     }
 
     private String getManagedProfileAccessibilityString() {
@@ -423,6 +419,24 @@ 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;
+            case NETWORK_TRAFFIC_ENABLED:
+                mShowNetworkTraffic =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                updateNetworkTraffic();
+                break;
+            default:
+                break;
+        }
+    }
+
     private void updateAlarm() {
         final AlarmClockInfo alarm = mAlarmManager.getNextAlarmClock(mUserTracker.getUserId());
         final boolean hasAlarm = alarm != null && alarm.getTriggerTime() > 0;
@@ -445,6 +459,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);
@@ -499,7 +524,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) {
@@ -531,6 +556,14 @@ private final void updateBluetooth() {
         mIconController.setIconVisibility(mSlotBluetooth, bluetoothVisible);
     }
 
+    private final void updateNetworkTraffic() {
+        if (mShowNetworkTraffic) {
+            mIconController.setNetworkTraffic(mSlotNetworkTraffic);
+        } else {
+            mIconController.removeIcon(mSlotNetworkTraffic, 0);
+        }
+    }
+
     private final void updateTTY() {
         if (mTelecomManager == null) {
             updateTTY(TelecomManager.TTY_MODE_OFF);
@@ -771,6 +804,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;
@@ -791,63 +829,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) {
@@ -873,6 +854,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 954c3911cccb1..4336df6891333 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -19,17 +19,26 @@
 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.inputmethodservice.InputMethodService;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.provider.Settings;
 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;
@@ -37,15 +46,22 @@
 import androidx.annotation.NonNull;
 
 import com.android.internal.policy.SystemBarUtils;
+import com.android.settingslib.Utils;
 import com.android.systemui.Dependency;
 import com.android.systemui.Flags;
 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.tuner.TunerService;
 import com.android.systemui.user.ui.binder.StatusBarUserChipViewBinder;
 import com.android.systemui.user.ui.viewmodel.StatusBarUserChipViewModel;
 import com.android.systemui.util.leak.RotationUtils;
@@ -53,11 +69,21 @@
 import java.util.Objects;
 import java.util.function.BooleanSupplier;
 
-public class PhoneStatusBarView extends FrameLayout {
+public class PhoneStatusBarView extends FrameLayout implements Callbacks, 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 = "PhoneStatusBarView";
+    private final CommandQueue mCommandQueue;
     private final StatusBarWindowControllerStore mStatusBarWindowControllerStore;
 
     private int mRotationOrientation = -1;
+    private RotationButtonController mRotationButtonController;
     @Nullable
     private View mCutoutSpace;
     @Nullable
@@ -77,14 +103,71 @@ public class PhoneStatusBarView extends FrameLayout {
     private float mFontScale;
     private StatusBarLongPressGestureDetector mStatusBarLongPressGestureDetector;
 
+    private final TunerService mTunerService;
+
+    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
      */
     private int mCutoutSideNudge = 0;
 
+    private boolean mBrightnessControlEnabled;
+
     public PhoneStatusBarView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mCommandQueue = Dependency.get(CommandQueue.class);
         mStatusBarWindowControllerStore = Dependency.get(StatusBarWindowControllerStore.class);
+        mTunerService = Dependency.get(TunerService.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);
+
+            mRotationButtonController = new RotationButtonController(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(
@@ -117,10 +200,20 @@ void init(StatusBarUserChipViewModel viewModel) {
         StatusBarUserChipViewBinder.bind(container, viewModel);
     }
 
+    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();
     }
@@ -128,16 +221,28 @@ public void onFinishInflate() {
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
+        mTunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_START);
+        mTunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_TOP);
+        mTunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_END);
         if (updateDisplayParameters()) {
             updateLayoutForCutout();
             updateWindowHeight();
         }
+
+        if (mRotationButtonController != null && !hasNavigationBar()) {
+            mCommandQueue.addCallback(this);
+        }
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
+        mTunerService.removeTunable(this);
         mDisplayCutout = null;
+
+        if (mRotationButtonController != null) {
+            mCommandQueue.removeCallback(this);
+        }
     }
 
     // Per b/300629388, we let the PhoneStatusBarView detect onConfigurationChanged to
@@ -165,6 +270,33 @@ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
         return super.onApplyWindowInsets(insets);
     }
 
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case STATUSBAR_EXTRA_PADDING_START:
+                mStatusBarPaddingStart = convertToDip(TunerService.parseInteger(newValue, 0));
+                updateResources();
+                break;
+            case STATUSBAR_EXTRA_PADDING_TOP:
+                mStatusBarPaddingTop = convertToDip(TunerService.parseInteger(newValue, 0));
+                updateResources();
+                break;
+            case STATUSBAR_EXTRA_PADDING_END:
+                mStatusBarPaddingEnd = convertToDip(TunerService.parseInteger(newValue, 0));
+                updateResources();
+                break;
+            default:
+                break;
+         }
+    }
+
+    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
      */
@@ -270,6 +402,23 @@ public boolean onInterceptTouchEvent(MotionEvent 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 boolean getBrightnessControlEnabled() {
+        return mBrightnessControlEnabled;
+    }
+
+    public void setBrightnessControlEnabled(boolean enabled) {
+        mBrightnessControlEnabled = enabled;
+    }
+
     public void updateResources() {
         mCutoutSideNudge = getResources().getDimensionPixelSize(
                 R.dimen.display_cutout_margin_consumption);
@@ -303,14 +452,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 bd0eeae960c50..30257368a812d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt
@@ -220,6 +220,10 @@ private constructor(
         mView.importantForAccessibility = mode
     }
 
+    fun setBrightnessControlEnabled(enabled: Boolean) {
+        mView.brightnessControlEnabled = enabled
+    }
+
     /**
      * Sends a touch event to the status bar view.
      *
@@ -241,14 +245,22 @@ private constructor(
 
     /** Called when a touch event occurred on {@link PhoneStatusBarView}. */
     fun onTouch(event: MotionEvent) {
+        if (mView.brightnessControlEnabled) {
+            centralSurfaces.brightnessControl(event)
+            if (!centralSurfaces.commandQueuePanelsEnabled) return
+        }
+
+        val upOrCancel =
+            event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL
+
         if (statusBarWindowStateController.windowIsShowing()) {
-            val upOrCancel =
-                event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL
             centralSurfaces.setInteracting(
                 WINDOW_STATUS_BAR,
                 !upOrCancel || shadeController.isExpandedVisible,
             )
         }
+
+        centralSurfaces.onBrightnessChanged(upOrCancel)
     }
 
     private fun addDarkReceivers() {
@@ -265,6 +277,10 @@ private constructor(
         darkIconDispatcher.removeDarkReceiver(clockRight)
     }
 
+    fun getPhoneStatusBarView(): PhoneStatusBarView {
+        return mView
+    }
+
     inner class PhoneStatusBarViewTouchHandler : Gefingerpoken {
         override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
             if (event.action == MotionEvent.ACTION_DOWN) {
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 2884a35c6142d..613381857ab27 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -206,11 +206,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.
@@ -246,7 +241,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;
@@ -487,7 +482,9 @@ private void hydrateStateInternally(ScrimView behindScrim) {
                             mStatusBarKeyguardViewManager.onKeyguardFadedAway();
                         }
                         dispatchScrimsVisible();
-                        dispatchBackScrimState(mScrimBehind.getViewAlpha());
+                        if (mScrimBehind != null) {
+                            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+                        }
                     }
                 };
 
@@ -709,7 +706,9 @@ private void internalTransitionTo(ScrimState state, Callback callback) {
             scheduleUpdate();
         }
 
-        dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        if (mScrimBehind != null) {
+            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        }
     }
 
     private static void debugLog(String state) {
@@ -738,11 +737,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);
     }
 
     /**
@@ -1115,7 +1110,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) {
@@ -1226,7 +1221,9 @@ private void applyAndDispatchState() {
         setOrAdaptCurrentAnimation(mScrimBehind);
         setOrAdaptCurrentAnimation(mNotificationsScrim);
         setOrAdaptCurrentAnimation(mScrimInFront);
-        dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        if (mScrimBehind != null) {
+            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        }
     }
 
     /**
@@ -1294,7 +1291,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;
 
@@ -1302,7 +1299,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
@@ -1321,6 +1320,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.
@@ -1351,6 +1351,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) {
@@ -1430,17 +1431,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);
@@ -1561,7 +1563,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) {
@@ -1687,8 +1692,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..a524596153957 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -20,7 +20,6 @@
 
 import android.graphics.Color;
 
-import com.android.app.tracing.coroutines.TrackTracer;
 import com.android.systemui.Flags;
 import com.android.systemui.dock.DockManager;
 import com.android.systemui.res.R;
@@ -598,14 +597,6 @@ public void updateScrimColor(ScrimView scrim, float alpha, int tint) {
             tint = scrim == mScrimInFront ? ScrimController.DEBUG_FRONT_TINT
                     : ScrimController.DEBUG_BEHIND_TINT;
         }
-        TrackTracer.instantForGroup("scrim",
-                scrim == mScrimInFront ? "front_scrim_alpha" : "back_scrim_alpha",
-                (int) (alpha * 255));
-
-        TrackTracer.instantForGroup("scrim",
-                scrim == mScrimInFront ? "front_scrim_tint" : "back_scrim_tint",
-                Color.alpha(tint));
-
         scrim.setTint(tint);
         scrim.setViewAlpha(alpha);
     }
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..b877b44f06e51 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
@@ -21,7 +21,7 @@ import com.android.systemui.statusbar.pipeline.icons.shared.model.ModernStatusBa
 
 /** 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)
+    @IntDef(TYPE_ICON, TYPE_MOBILE_NEW, TYPE_WIFI_NEW, TYPE_BINDABLE, TYPE_NETWORK_TRAFFIC)
     @Retention(AnnotationRetention.SOURCE)
     internal annotation class IconType
 
@@ -44,7 +44,8 @@ open class StatusBarIconHolder private constructor() {
                 // this is effectively an unused return value.
                 TYPE_BINDABLE,
                 TYPE_MOBILE_NEW,
-                TYPE_WIFI_NEW -> true
+                TYPE_WIFI_NEW,
+                TYPE_NETWORK_TRAFFIC -> true
                 else -> true
             }
         set(visible) {
@@ -55,7 +56,8 @@ open class StatusBarIconHolder private constructor() {
                 TYPE_ICON -> icon!!.visible = visible
                 TYPE_BINDABLE,
                 TYPE_MOBILE_NEW,
-                TYPE_WIFI_NEW -> {}
+                TYPE_WIFI_NEW,
+                TYPE_NETWORK_TRAFFIC -> {}
             }
         }
 
@@ -96,12 +98,15 @@ open class StatusBarIconHolder private constructor() {
         /** Only applicable to [BindableIconHolder] */
         const val TYPE_BINDABLE = 5
 
+        const val TYPE_NETWORK_TRAFFIC = 6
+
         /** Returns a human-readable string representing the given type. */
         fun getTypeString(@IconType type: Int): String {
             return when (type) {
                 TYPE_ICON -> "ICON"
                 TYPE_MOBILE_NEW -> "MOBILE_NEW"
                 TYPE_WIFI_NEW -> "WIFI_NEW"
+                TYPE_NETWORK_TRAFFIC -> "NETWORK_TRAFFIC"
                 else -> "UNKNOWN"
             }
         }
@@ -132,6 +137,13 @@ open class StatusBarIconHolder private constructor() {
             holder.tag = subId
             return holder
         }
+
+        @JvmStatic
+        fun fromNetworkTraffic(): StatusBarIconHolder {
+            val holder = StatusBarIconHolder()
+            holder.type = TYPE_NETWORK_TRAFFIC
+            return holder
+        }
     }
 
     /**
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 c23e39de3f327..ea9bfbb52fb10 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -27,6 +27,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;
@@ -80,9 +81,11 @@
 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;
+import com.android.systemui.shade.NotificationPanelViewController;
 import com.android.systemui.shade.ShadeController;
 import com.android.systemui.shade.ShadeExpansionChangeEvent;
 import com.android.systemui.shade.ShadeExpansionListener;
@@ -97,6 +100,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;
@@ -175,6 +180,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     // Local cache of expansion events, to avoid duplicates
     private float mFraction = -1f;
     private boolean mTracking = false;
+    private boolean mIsFromBiometric = false;
     private boolean mBouncerShowingOverDream;
     private int mAttemptsToShowBouncer = 0;
     private DelayableExecutor mExecutor;
@@ -188,6 +194,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
             public void onFullyShown() {
                 mPrimaryBouncerAnimating = false;
                 updateStates();
+                showFaceRecognizingMessage();
             }
 
             @Override
@@ -291,6 +298,7 @@ public void onEvent(int event) {
     private boolean mCentralSurfacesRegistered;
 
     private View mNotificationContainer;
+    private NotificationPanelViewController mNotificationPanelVC;
 
     protected boolean mRemoteInputActive;
     private boolean mGlobalActionsVisible = false;
@@ -336,6 +344,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
@@ -356,6 +366,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;
@@ -395,7 +446,8 @@ public StatusBarKeyguardViewManager(
             Lazy<DeviceEntryInteractor> deviceEntryInteractorLazy,
             DismissCallbackRegistry dismissCallbackRegistry,
             Lazy<BouncerInteractor> bouncerInteractor,
-            CommunalSceneInteractor communalSceneInteractor
+            CommunalSceneInteractor communalSceneInteractor,
+            @Main Handler faceRecognizingHandler
     ) {
         mContext = context;
         mExecutor = executor;
@@ -431,6 +483,7 @@ public StatusBarKeyguardViewManager(
         mDeviceEntryInteractorLazy = deviceEntryInteractorLazy;
         mDismissCallbackRegistry = dismissCallbackRegistry;
         mCommunalSceneInteractor = communalSceneInteractor;
+        mFaceRecognizingHandler = faceRecognizingHandler;
     }
 
     KeyguardTransitionInteractor mKeyguardTransitionInteractor;
@@ -821,6 +874,10 @@ public void showPrimaryBouncer(boolean scrimmed, String reason) {
             } else {
                 mPrimaryBouncerInteractor.show(scrimmed, reason);
             }
+            if (mNotificationPanelVC != null && mIsFromBiometric) {
+                mNotificationPanelVC.resetHeightForBouncerShowing();
+                mIsFromBiometric = false;
+            }
         }
         updateStates();
     }
@@ -978,7 +1035,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();
@@ -1047,6 +1106,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 ->
@@ -1061,6 +1121,7 @@ public void onStartedWakingUp() {
     public void onStartedGoingToSleep() {
         mIsSleeping = true;
         setRootViewAnimationDisabled(true);
+        reset(true);
         NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();
         if (navBarView != null) {
             navBarView.forEachView(view ->
@@ -1625,12 +1686,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
@@ -1829,6 +1904,15 @@ public boolean needsFullscreenBouncer() {
                 || mode == KeyguardSecurityModel.SecurityMode.SimPuk;
     }
 
+    public void setNotificationPanelViewController(NotificationPanelViewController notificationPanelViewController) {
+        mNotificationPanelVC = notificationPanelViewController;
+    }
+
+    @Override
+    public void setIsFromBiometric(boolean isFromBiometric) {
+        mIsFromBiometric = isFromBiometric;
+    }
+
     @VisibleForTesting
     void setAttemptsToShowBouncer(int attempts) {
         mAttemptsToShowBouncer = attempts;
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 7d0537d8437f0..68020258afb7f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
@@ -80,6 +80,7 @@
 import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
 import com.android.systemui.statusbar.notification.row.ExpandableNotificationRowDragController;
 import com.android.systemui.statusbar.notification.row.OnUserInteractionCallback;
+import com.android.systemui.statusbar.policy.GameSpaceManager;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.wmshell.BubblesManager;
 
@@ -141,6 +142,7 @@ boolean onDismiss(PendingIntent intent, boolean isActivityIntent, boolean animat
     private final MetricsLogger mMetricsLogger;
     private final StatusBarNotificationActivityStarterLogger mLogger;
 
+    private final CentralSurfaces mCentralSurfaces;
     private final NotificationPresenter mPresenter;
     private final PanelExpansionInteractor mPanelExpansionInteractor;
     private final NotificationShadeWindowController mNotificationShadeWindowController;
@@ -178,6 +180,7 @@ boolean onDismiss(PendingIntent intent, boolean isActivityIntent, boolean animat
             MetricsLogger metricsLogger,
             StatusBarNotificationActivityStarterLogger logger,
             OnUserInteractionCallback onUserInteractionCallback,
+            CentralSurfaces centralSurfaces,
             NotificationPresenter presenter,
             PanelExpansionInteractor panelExpansionInteractor,
             NotificationShadeWindowController notificationShadeWindowController,
@@ -213,6 +216,7 @@ boolean onDismiss(PendingIntent intent, boolean isActivityIntent, boolean animat
         mShadeAnimationInteractor = shadeAnimationInteractor;
         mMetricsLogger = metricsLogger;
         mLogger = logger;
+        mCentralSurfaces = centralSurfaces;
         mOnUserInteractionCallback = onUserInteractionCallback;
         mPresenter = presenter;
         mActivityTransitionAnimator = activityTransitionAnimator;
@@ -632,6 +636,11 @@ private void removeHunAfterClick(ExpandableNotificationRow row) {
 
     @VisibleForTesting
     void launchFullScreenIntent(NotificationEntry entry) {
+        GameSpaceManager gameSpace = mCentralSurfaces.getGameSpaceManager();
+        if (gameSpace != null && gameSpace.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 1cc1df420ae5d..8d83b3e591139 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;
@@ -51,6 +56,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;
@@ -76,6 +82,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;
@@ -108,8 +117,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(
@@ -139,7 +152,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;
@@ -167,6 +181,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));
@@ -189,8 +205,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(
@@ -198,6 +216,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 */
@@ -258,7 +317,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()) {
@@ -276,7 +340,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);
@@ -361,7 +430,7 @@ public boolean suppressAwakeHeadsUp(NotificationEntry entry) {
 
         @Override
         public boolean suppressAwakeInterruptions(NotificationEntry entry) {
-            return isDeviceInVrMode();
+            return isDeviceInVrMode() || entry.getSbn().getIsContentSecure();
         }
 
         @Override
@@ -420,4 +489,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 fb2ee939fa138..6310b0b31e25b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
@@ -16,6 +16,7 @@ import com.android.app.tracing.namedRunnable
 import com.android.internal.jank.InteractionJankMonitor
 import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF
 import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.DejankUtils
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Main
@@ -24,7 +25,6 @@ import com.android.systemui.keyguard.WakefulnessLifecycle
 import com.android.systemui.shade.ShadeViewController
 import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor
 import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.statusbar.CircleReveal
 import com.android.systemui.statusbar.LightRevealScrim
 import com.android.systemui.statusbar.NotificationShadeWindowController
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 a6cf40660a781..117742c2f34c9 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
@@ -19,11 +19,14 @@
 import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_BINDABLE;
 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_NETWORK_TRAFFIC;
 import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_WIFI_NEW;
 
 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;
@@ -37,7 +40,9 @@
 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.NetworkTraffic;
 import com.android.systemui.statusbar.StatusBarIconView;
 import com.android.systemui.statusbar.StatusIconDisplayable;
 import com.android.systemui.statusbar.connectivity.ui.MobileContextProvider;
@@ -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,7 @@ 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_TRAFFIC -> addNetworkTraffic(index, slot);
             case TYPE_BINDABLE ->
                 // Safe cast, since only BindableIconHolders can set this tag on themselves
                     addBindableIcon((BindableIconHolder) holder, index);
@@ -186,6 +201,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;
@@ -240,6 +257,12 @@ protected StatusIconDisplayable addNewMobileIcon(
         return view;
     }
 
+    private NetworkTraffic addNetworkTraffic(int index, String slot) {
+        NetworkTraffic view = onCreateNetworkTraffic(slot);
+        mGroup.addView(view, index, onCreateLayoutParams(Shape.WRAP_CONTENT));
+        return view;
+    }
+
     private StatusBarIconView onCreateStatusBarIconView(String slot, boolean blocked) {
         return new StatusBarIconView(mContext, slot, null, blocked);
     }
@@ -277,6 +300,11 @@ private ModernStatusBarMobileView onCreateModernStatusBarMobileView(
         }
     }
 
+    private NetworkTraffic onCreateNetworkTraffic(String slot) {
+        NetworkTraffic view = NetworkTraffic.fromContext(mContext, slot);
+        return view;
+    }
+
     protected LinearLayout.LayoutParams onCreateLayoutParams(Shape shape) {
         int width = shape == StatusBarIcon.Shape.FIXED_SPACE
                 ? mIconSize
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..d40c974680d17 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
@@ -81,6 +81,9 @@ void setResourceIcon(String slot, @Nullable String resPackage, @DrawableRes int
      */
     void setNewWifiIcon();
 
+    /** */
+    void setNetworkTraffic(String slot);
+
     /**
      * Notify this class that there is a new set of mobile icons to display, keyed off of this list
      * of subIds. The icons will be added and bound to the mobile data pipeline via
@@ -103,6 +106,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..1da1523525c81 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
@@ -136,12 +136,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();
@@ -226,6 +225,17 @@ public void onTuningChanged(String key, String newValue) {
         }
     }
 
+    @Override
+    public void setNetworkTraffic(String slot) {
+        StatusBarIconHolder holder = mStatusBarIconList.getIconHolder(slot, 0);
+        if (holder == null) {
+            holder = StatusBarIconHolder.fromNetworkTraffic();
+            setIcon(slot, holder);
+        } else {
+            handleSet(slot, holder);
+        }
+    }
+
     private void addSystemIcon(String slot, StatusBarIconHolder holder) {
         int viewIndex = mStatusBarIconList.getViewIndex(slot, holder.getTag());
         boolean hidden = mIconHideList.contains(slot);
@@ -516,6 +526,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 ec96ed84d81f7..04d35c99aeff3 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
@@ -69,6 +69,12 @@ interface BatteryRepository {
     /** State unknown means that we can't detect a battery */
     val isStateUnknown: Flow<Boolean>
 
+    /**
+     * [LineageSettings.System.STATUS_BAR_BATTERY_STYLE]. A user setting to indicate the battery
+     * style in the home screen status bar
+     */
+    val batteryIconStyle: StateFlow<Int>
+
     /**
      * [LineageSettings.System.STATUS_BAR_SHOW_BATTERY_PERCENT]. A user setting to indicate whether
      * we should show the battery percentage in the home screen status bar
@@ -76,6 +82,10 @@ interface BatteryRepository {
     val showBatteryPercentMode: StateFlow<Int>
 
     companion object {
+        const val ICON_STYLE_DEFAULT = 0
+        const val ICON_STYLE_CIRCLE = 1
+        const val ICON_STYLE_TEXT = 2
+        const val ICON_STYLE_CIRCLE_DOTTED = 3
         const val SHOW_PERCENT_HIDDEN = 0
         const val SHOW_PERCENT_INSIDE = 1
         const val SHOW_PERCENT_NEXT_TO = 2
@@ -165,18 +175,20 @@ constructor(
 
     override val isStateUnknown = batteryState.map { it.isStateUnknown }
 
-    override val showBatteryPercentMode =
+    override val batteryIconStyle =
         callbackFlow {
                 val resolver = context.contentResolver
                 val uri =
                     LineageSettings.System.getUriFor(
-                        LineageSettings.System.STATUS_BAR_SHOW_BATTERY_PERCENT
+                        LineageSettings.System.STATUS_BAR_BATTERY_STYLE
                     )
 
                 fun readMode(): Int {
                     return LineageSettings.System.getIntForUser(
-                        resolver, LineageSettings.System.STATUS_BAR_SHOW_BATTERY_PERCENT,
-                        BatteryRepository.SHOW_PERCENT_HIDDEN, UserHandle.USER_CURRENT
+                        resolver,
+                        LineageSettings.System.STATUS_BAR_BATTERY_STYLE,
+                        BatteryRepository.ICON_STYLE_DEFAULT,
+                        UserHandle.USER_CURRENT,
                     )
                 }
 
@@ -187,8 +199,74 @@ constructor(
                         }
                     }
 
-                resolver.registerContentObserver(uri, /* notifyForDescendants = */ false,
-                    observer, UserHandle.USER_ALL)
+                resolver.registerContentObserver(
+                    uri,
+                    /* notifyForDescendants = */ false,
+                    observer,
+                    UserHandle.USER_ALL,
+                )
+
+                // Emit current value immediately
+                trySend(readMode())
+
+                awaitClose { resolver.unregisterContentObserver(observer) }
+            }
+            .distinctUntilChanged()
+            .flowOn(bgDispatcher)
+            .stateIn(
+                scope = scope,
+                started = SharingStarted.Lazily,
+                initialValue = BatteryRepository.ICON_STYLE_DEFAULT,
+            )
+
+    override val showBatteryPercentMode =
+        callbackFlow {
+                val resolver = context.contentResolver
+                val uris =
+                    listOf(
+                        LineageSettings.System.getUriFor(
+                            LineageSettings.System.STATUS_BAR_BATTERY_STYLE
+                        ),
+                        LineageSettings.System.getUriFor(
+                            LineageSettings.System.STATUS_BAR_SHOW_BATTERY_PERCENT
+                        ),
+                    )
+
+                fun readMode(): Int {
+                    val iconStyle =
+                        LineageSettings.System.getIntForUser(
+                            resolver,
+                            LineageSettings.System.STATUS_BAR_BATTERY_STYLE,
+                            BatteryRepository.ICON_STYLE_DEFAULT,
+                            UserHandle.USER_CURRENT,
+                        )
+                    return if (iconStyle == BatteryRepository.ICON_STYLE_TEXT) {
+                        BatteryRepository.SHOW_PERCENT_NEXT_TO
+                    } else {
+                        LineageSettings.System.getIntForUser(
+                            resolver,
+                            LineageSettings.System.STATUS_BAR_SHOW_BATTERY_PERCENT,
+                            BatteryRepository.SHOW_PERCENT_HIDDEN,
+                            UserHandle.USER_CURRENT,
+                        )
+                    }
+                }
+
+                val observer =
+                    object : ContentObserver(Handler(Looper.getMainLooper())) {
+                        override fun onChange(selfChange: Boolean) {
+                            trySend(readMode())
+                        }
+                    }
+
+                for (uri in uris) {
+                    resolver.registerContentObserver(
+                        uri,
+                        /* notifyForDescendants = */ false,
+                        observer,
+                        UserHandle.USER_ALL,
+                    )
+                }
 
                 // Emit current value immediately
                 trySend(readMode())
@@ -200,7 +278,7 @@ constructor(
             .stateIn(
                 scope = scope,
                 started = SharingStarted.Lazily,
-                initialValue = BatteryRepository.SHOW_PERCENT_HIDDEN
+                initialValue = BatteryRepository.SHOW_PERCENT_HIDDEN,
             )
 
     /** Get and re-fetch the estimate every 2 minutes while active */
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 a1c9d95680d6d..6251deaf03aa5 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
@@ -74,6 +74,9 @@ class BatteryInteractor @Inject constructor(
     /** @see [BatteryRepository.isPowerSaveEnabled] */
     val powerSave = repo.isPowerSaveEnabled
 
+    /** @see [BatteryRepository.batteryIconStyle] */
+    val batteryIconStyle: StateFlow<Int> = repo.batteryIconStyle
+
     /** @see [BatteryRepository.showBatteryPercentMode] */
     val showBatteryPercentMode: StateFlow<Int> = repo.showBatteryPercentMode
 
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 f149f1b8d40f8..a5531f3054675 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
@@ -82,7 +82,6 @@ fun BatteryWithPercent(
                 viewModel = viewModel,
                 isDarkProvider = isDarkProvider,
                 modifier = Modifier.height(batteryHeight).wrapContentWidth(),
-                suppressAttribution = showPercent,
             )
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt
index 314d225940000..ed2797bea089f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt
@@ -32,10 +32,12 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.drawscope.clipRect
 import androidx.compose.ui.graphics.drawscope.inset
 import androidx.compose.ui.graphics.drawscope.scale
+import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.layout.Measurable
@@ -44,12 +46,17 @@ import androidx.compose.ui.layout.MeasureResult
 import androidx.compose.ui.layout.MeasureScope
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.layout.onLayoutRectChanged
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.drawText
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.util.fastFirst
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.util.fastFirstOrNull
 import com.android.systemui.common.ui.compose.load
 import com.android.systemui.compose.modifiers.sysuiResTag
 import com.android.systemui.statusbar.phone.domain.interactor.IsAreaDark
+import com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepository
 import com.android.systemui.statusbar.pipeline.battery.shared.ui.BatteryColors
 import com.android.systemui.statusbar.pipeline.battery.shared.ui.BatteryFrame
 import com.android.systemui.statusbar.pipeline.battery.shared.ui.BatteryGlyph
@@ -162,7 +169,6 @@ fun UnifiedBattery(
     viewModel: BatteryViewModel,
     isDarkProvider: () -> IsAreaDark,
     modifier: Modifier,
-    suppressAttribution: Boolean = false,
 ) {
     var bounds by remember { mutableStateOf(Rect()) }
 
@@ -175,8 +181,10 @@ fun UnifiedBattery(
     }
 
     BatteryLayout(
-        attribution = if (suppressAttribution) null else viewModel.attribution,
+        attribution = viewModel.attribution,
+        iconStyleProvider = { viewModel.batteryIconStyle },
         levelProvider = { viewModel.level },
+        showLevelProvider = { viewModel.isBatteryPercentInsideIconSettingEnabled },
         isFullProvider = { viewModel.isFull },
         glyphsProvider = { viewModel.glyphList },
         colorsProvider = colorProvider,
@@ -193,7 +201,9 @@ fun UnifiedBattery(
 @Composable
 fun BatteryLayout(
     attribution: BatteryGlyph?,
+    iconStyleProvider: () -> Int,
     levelProvider: () -> Int?,
+    showLevelProvider: () -> Boolean,
     isFullProvider: () -> Boolean,
     glyphsProvider: () -> List<BatteryGlyph>,
     colorsProvider: () -> BatteryColors,
@@ -202,30 +212,49 @@ fun BatteryLayout(
 ) {
     Layout(
         content = {
-            BatteryBody(
-                pathSpec = BatteryFrame.bodyPathSpec,
-                levelProvider = levelProvider,
-                glyphsProvider = glyphsProvider,
-                isFullProvider = isFullProvider,
-                colorsProvider = colorsProvider,
-                modifier = Modifier.layoutId(BatteryMeasurePolicy.LayoutId.Frame),
-                contentDescription = contentDescription,
-            )
-            if (attribution != null) {
-                BatteryAttribution(
+            val iconStyle = iconStyleProvider()
+
+            if (
+                iconStyle == BatteryRepository.ICON_STYLE_CIRCLE ||
+                    iconStyle == BatteryRepository.ICON_STYLE_CIRCLE_DOTTED
+            ) {
+                CircleBatteryBody(
                     attr = attribution,
+                    iconStyleProvider = iconStyleProvider,
+                    levelProvider = levelProvider,
+                    showLevelProvider = showLevelProvider,
                     colorsProvider = colorsProvider,
-                    modifier =
-                        Modifier.layoutId(
-                            BatteryMeasurePolicy.LayoutId.Attribution(wrapped = attribution)
-                        ),
+                    modifier = Modifier.layoutId(BatteryMeasurePolicy.LayoutId.FrameCircle),
+                    contentDescription = contentDescription,
                 )
+            } else if (iconStyle == BatteryRepository.ICON_STYLE_TEXT) {
+                // Empty on purpose
             } else {
-                BatteryCap(
-                    colorsProvider = colorsProvider,
+                BatteryBody(
+                    pathSpec = BatteryFrame.bodyPathSpec,
+                    levelProvider = levelProvider,
+                    glyphsProvider = glyphsProvider,
                     isFullProvider = isFullProvider,
-                    modifier = Modifier.layoutId(BatteryMeasurePolicy.LayoutId.Cap),
+                    colorsProvider = colorsProvider,
+                    modifier = Modifier.layoutId(BatteryMeasurePolicy.LayoutId.Frame),
+                    contentDescription = contentDescription,
                 )
+                if (attribution != null) {
+                    BatteryAttribution(
+                        attr = attribution,
+                        colorsProvider = colorsProvider,
+                        modifier =
+                            Modifier.layoutId(
+                                BatteryMeasurePolicy.LayoutId.Attribution(wrapped = attribution)
+                            ),
+                    )
+                } else {
+                    BatteryCap(
+                        colorsProvider = colorsProvider,
+                        isFullProvider = isFullProvider,
+                        modifier = Modifier.layoutId(BatteryMeasurePolicy.LayoutId.Cap),
+                    )
+                }
             }
         },
         measurePolicy = BatteryMeasurePolicy(),
@@ -238,6 +267,8 @@ class BatteryMeasurePolicy : MeasurePolicy {
     sealed class LayoutId {
         data object Frame : LayoutId()
 
+        data object FrameCircle : LayoutId()
+
         data object Cap : LayoutId()
 
         // We don't have to depend on the whole [BatteryGlyph] here, we just need to know the
@@ -249,7 +280,10 @@ class BatteryMeasurePolicy : MeasurePolicy {
         measurables: List<Measurable>,
         constraints: Constraints,
     ): MeasureResult {
-        val batteryFrame = measurables.fastFirst { it.layoutId == LayoutId.Frame }
+        val batteryFrame =
+            measurables.fastFirstOrNull {
+                it.layoutId == LayoutId.Frame || it.layoutId == LayoutId.FrameCircle
+            } ?: return layout(0, 0) {}
 
         // We will scale the entire battery icon based on the given height
         val scale = constraints.maxHeight / BatteryFrame.innerHeight
@@ -259,8 +293,18 @@ class BatteryMeasurePolicy : MeasurePolicy {
             batteryFrame.measure(
                 constraints =
                     constraints.copy(
-                        minWidth = batterySize.width.roundToInt(),
-                        maxWidth = batterySize.width.roundToInt(),
+                        minWidth =
+                            if (batteryFrame.layoutId == LayoutId.FrameCircle) {
+                                batterySize.height.roundToInt()
+                            } else {
+                                batterySize.width.roundToInt()
+                            },
+                        maxWidth =
+                            if (batteryFrame.layoutId == LayoutId.FrameCircle) {
+                                batterySize.height.roundToInt()
+                            } else {
+                                batterySize.width.roundToInt()
+                            },
                         minHeight = batterySize.height.roundToInt(),
                         maxHeight = batterySize.height.roundToInt(),
                     )
@@ -323,6 +367,100 @@ class BatteryMeasurePolicy : MeasurePolicy {
     }
 }
 
+@Composable
+fun CircleBatteryBody(
+    attr: BatteryGlyph?,
+    iconStyleProvider: () -> Int,
+    levelProvider: () -> Int?,
+    showLevelProvider: () -> Boolean,
+    colorsProvider: () -> BatteryColors,
+    modifier: Modifier = Modifier,
+    contentDescription: String = "",
+) {
+    val textMeasurer = rememberTextMeasurer()
+
+    Canvas(modifier = modifier, contentDescription = contentDescription) {
+        val iconStyle = iconStyleProvider()
+        val level = levelProvider()
+        val showLevel = showLevelProvider()
+        val colors = colorsProvider()
+
+        val strokeWidth = size.height / 6.5f
+        val radius = size.height / 2f - strokeWidth / 2f
+        val center = Offset(size.width / 2, size.height / 2)
+
+        // Draw thin gray ring first
+        drawCircle(colors.backgroundOnly, radius, center, style = Stroke(strokeWidth))
+
+        // Draw colored arc representing charge level
+        if (level != null && level > 0) {
+            drawArc(
+                colors.attribution,
+                270f,
+                3.6f * level,
+                useCenter = false,
+                topLeft = Offset(center.x - radius, center.y - radius),
+                size = Size(radius * 2, radius * 2),
+                style =
+                    Stroke(
+                        strokeWidth,
+                        pathEffect =
+                            if (iconStyle == BatteryRepository.ICON_STYLE_CIRCLE_DOTTED) {
+                                PathEffect.dashPathEffect(floatArrayOf(3f, 2f), 0f)
+                            } else {
+                                null
+                            },
+                    ),
+            )
+        }
+
+        if (attr != null) {
+            // Draw attribution
+            inset(strokeWidth * 2f) {
+                val attrScale = attr.scaleTo(size.width, size.height)
+                val pathBounds = attr.path.getBounds()
+
+                withTransform({
+                    scale(attrScale, Offset.Zero)
+                    translate(
+                        (size.width - (pathBounds.width * attrScale)) / 2f,
+                        (size.height - (pathBounds.height * attrScale)) / 2f,
+                    )
+                }) {
+                    drawPath(
+                        path = attr.path,
+                        color = Color.Black,
+                        style = Stroke(2f),
+                        blendMode = BlendMode.Clear,
+                    )
+                    drawPath(attr.path, colors.attribution)
+                }
+            }
+        } else if (showLevel && level != null && level < 100) {
+            // Draw charge level
+            val textLayoutResult =
+                textMeasurer.measure(
+                    text = level.toString(),
+                    style =
+                        TextStyle(
+                            color = colors.attribution,
+                            fontSize = 6.sp,
+                            fontWeight = FontWeight.Bold,
+                        ),
+                )
+
+            drawText(
+                textLayoutResult = textLayoutResult,
+                topLeft =
+                    Offset(
+                        size.width / 2 - textLayoutResult.size.width / 2f,
+                        size.height / 2 - textLayoutResult.size.height / 2f,
+                    ),
+            )
+        }
+    }
+}
+
 /**
  * Draws just the round-rect piece of the battery frame. If [glyphsProvider] is non-empty, then this
  * composable also renders the glyphs centered in the frame.
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 1f271dae9c36c..2a3e7c0827d20 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 com.android.systemui.dagger.qualifiers.Application
 import com.android.systemui.lifecycle.ExclusiveActivatable
 import com.android.systemui.lifecycle.Hydrator
 import com.android.systemui.res.R
+import com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepository
 import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryAttributionModel.Charging
 import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryAttributionModel.Defend
 import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryAttributionModel.PowerSave
@@ -78,6 +79,13 @@ sealed class BatteryViewModel(
             source = interactor.showPercentNextToIcon,
         )
 
+    val isBatteryPercentInsideIconSettingEnabled: Boolean by
+        hydrator.hydratedStateOf(
+            traceName = "isBatteryPercentInsideIconSettingEnabled",
+            initialValue = interactor.showPercentInsideIcon.value,
+            source = interactor.showPercentInsideIcon,
+        )
+
     /** A [List<BatteryGlyph>] representation of the current [level] */
     private val levelGlyphs: Flow<List<BatteryGlyph>> =
         interactor.level.map { it?.glyphRepresentation() ?: emptyList() }
@@ -213,6 +221,13 @@ sealed class BatteryViewModel(
                 },
         )
 
+    val batteryIconStyle: Int by
+        hydrator.hydratedStateOf(
+            traceName = "batteryIconStyle",
+            initialValue = BatteryRepository.ICON_STYLE_DEFAULT,
+            source = interactor.batteryIconStyle,
+        )
+
     /** For use in the shade, where we might need to show an estimate */
     val batteryTimeRemainingEstimate: String? by
         hydrator.hydratedStateOf(
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 e61a21b0e8e66..36110b2f3c84e 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
@@ -38,6 +38,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.data.repository.CarrierConfigCoreStartable
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierConfigRepository
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierConfigRepositoryImpl
@@ -168,6 +170,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 07843f1ef0417..025e6d8b817fc 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
@@ -20,6 +20,7 @@ import android.telephony.CellSignalStrength
 import android.telephony.SubscriptionInfo
 import android.telephony.TelephonyManager
 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
@@ -158,6 +159,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 2e796263afa9a..ff4d847743715 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
@@ -164,6 +165,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 410389a8d94cf..e155e0849031b 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
@@ -220,6 +221,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 8973b6039dcf5..4d34fc14875aa 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
@@ -36,6 +36,7 @@ import com.android.systemui.kairos.util.nameTag
 import com.android.systemui.kairosBuilder
 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
@@ -403,6 +404,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/prod/CarrierMergedConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt
index db08f25eadafb..d7e7006721d75 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
@@ -173,6 +174,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 7c76fc0905b5c..efdab46efc2c0 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
@@ -183,6 +184,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 5094bc7e083a1..9834eb1866d00 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)
         )
     }
 
@@ -349,6 +352,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 }
@@ -388,6 +400,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,
@@ -409,6 +422,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 7dac06093edcc..d33bcc78af0a6 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
@@ -28,6 +28,7 @@ import com.android.systemui.kairos.util.nameTag
 import com.android.systemui.kairosBuilder
 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
@@ -409,6 +410,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 5547ec9762084..00700e416f706 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) {
@@ -392,7 +396,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() {
@@ -422,6 +426,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
@@ -436,6 +455,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
@@ -494,6 +515,7 @@ class MobileConnectionRepositoryImpl(
             subscriptionModel: Flow<SubscriptionModel?>,
             defaultNetworkName: NetworkNameModel,
             networkNameSeparator: String,
+            imsRepository: ImsRepository,
         ): MobileConnectionRepository {
             return MobileConnectionRepositoryImpl(
                 subId,
@@ -511,6 +533,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 739d82393d9fe..e1b186ca46ed1 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
@@ -160,6 +161,12 @@ fun BuildScope.MobileConnectionRepositoryKairosAdapter(
                     "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).isAllowedDuringAirplaneMode"
                 }
             ),
+        imsState =
+            kairosRepo.imsState.toStateFlow(
+                nameTag {
+                    "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).imsState"
+                }
+            ),
         hasPrioritizedNetworkCapabilities =
             kairosRepo.hasPrioritizedNetworkCapabilities.toStateFlow(
                 nameTag {
@@ -195,6 +202,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 0b1cc4fcbda1c..3e581aae685b5 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
@@ -43,6 +43,8 @@ import android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN
 import android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID
 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
@@ -111,6 +113,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() {
 
@@ -513,6 +516,8 @@ constructor(
             )
     }
 
+    override val imsState: State<ImsStateModel> = buildState { imsRepo.imsState.toState() }
+
     @AssistedFactory
     fun interface Factory {
         fun create(
@@ -523,6 +528,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 fb1c8975f84b1..8376ca28b306a 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 4fd4c5c45f448..c621cc0c159d3 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,12 +17,15 @@
 package com.android.systemui.statusbar.pipeline.mobile.domain.interactor
 
 import android.content.Context
+import android.provider.Settings
 import com.android.internal.telephony.flags.Flags
 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.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
 import com.android.systemui.dagger.qualifiers.Background
+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
@@ -35,7 +38,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
@@ -125,6 +130,9 @@ interface MobileIconInteractor {
      */
     val isRoaming: Flow<Boolean>
 
+    /** See [MobileIconsInteractor.isRoamingForceHidden]. */
+    val isRoamingForceHidden: Flow<Boolean>
+
     /** See [MobileIconsInteractor.isForceHidden]. */
     val isForceHidden: Flow<Boolean>
 
@@ -133,6 +141,20 @@ 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>
 }
 
 /** Interactor for a single mobile connection. This connection _should_ have one subscription ID */
@@ -148,6 +170,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(),
@@ -163,6 +188,54 @@ 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;
+
+    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
+            )
+
     // 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
@@ -310,11 +383,13 @@ 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)
 
@@ -329,6 +404,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> =
@@ -345,12 +429,14 @@ class MobileIconInteractorImpl(
             numberOfLevels,
             showExclamationMark,
             carrierNetworkChangeActive,
-        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->
+            showRoaming,
+        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange, showRoaming ->
             SignalIconModel.Cellular(
                 cellularShownLevel,
                 numberOfLevels,
                 showExclamationMark,
                 carrierNetworkChange,
+                showRoaming,
             )
         }
 
@@ -371,6 +457,7 @@ class MobileIconInteractorImpl(
                 numberOfLevels.value,
                 showExclamationMark.value,
                 carrierNetworkChangeActive.value,
+                showRoaming.value,
             )
         isNonTerrestrial
             .flatMapLatest { ntn ->
@@ -384,4 +471,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 650091105c26b..5064053c18fdb 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,12 +17,15 @@
 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.internal.telephony.flags.Flags
 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
@@ -43,6 +46,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 {
@@ -125,11 +130,29 @@ 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>
 }
 
 /** Interactor for a single mobile connection. This connection _should_ have one subscription ID */
@@ -144,6 +167,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 =
@@ -256,6 +282,14 @@ class MobileIconInteractorKairosImpl(
             }
         }
 
+    private val showRoaming: State<Boolean> =
+        combine(
+            isRoaming,
+            isRoamingForceHidden
+        ) { roaming, roamingForceHidden ->
+            roaming && !roamingForceHidden
+        }
+
     private val level: State<Int> =
         combine(
             connectionRepository.isGsm,
@@ -337,12 +371,14 @@ class MobileIconInteractorKairosImpl(
             numberOfLevels,
             showExclamationMark,
             carrierNetworkChangeActive,
-        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->
+            showRoaming,
+        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange, showRoaming ->
             SignalIconModel.Cellular(
                 cellularShownLevel,
                 numberOfLevels,
                 showExclamationMark,
                 carrierNetworkChange,
+                showRoaming,
             )
         }
 
@@ -378,4 +414,31 @@ 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
+
+    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)
+    }
 }
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..52a0cc6ded9af 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,6 +172,12 @@ fun BuildScope.MobileIconInteractorKairosAdapter(
                         "MobileIconInteractorKairosAdapter(subId=$subscriptionId).carrierNetworkChangeActive"
                     }
                 ),
+            shouldShowFourgIcon =
+                shouldShowFourgIcon.toStateFlow(
+                    nameTag {
+                        "MobileIconInteractorKairosAdapter(subId=$subscriptionId).shouldShowFourgIcon"
+                    }
+                ),
         )
     }
 
@@ -165,6 +200,12 @@ 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>,
 ) : 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 1f4ccd59b063f..b39a33f01bf57 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 {
@@ -421,6 +432,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
 
@@ -440,6 +466,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 7240eed541314..e3f1c190d2614 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.NewStatusBarIcons
 import com.android.systemui.statusbar.core.StatusBarRootModernization
 import com.android.systemui.statusbar.pipeline.dagger.MobileSummaryLog
 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() {
 
@@ -429,6 +440,20 @@ constructor(
             .map { it.contains(ConnectivitySlot.MOBILE) }
     }
 
+    override val isRoamingForceHidden: State<Boolean> = buildState {
+        connectivityRepository.forceHiddenSlots
+            .toState(nameTag("MobileIconsInteractorKairosImpl.isRoamingForceHidden"))
+            .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 +471,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 068486081c07f..5c4eb9256b1a6 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,22 @@ constructor(
             )
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isMobileHdForceHidden: Flow<Boolean> =
+        kairosInteractor.isMobileHdForceHidden
+            .toColdConflatedFlow(
+                kairosNetwork,
+                nameTag("MobileIconsInteractorKairosAdapter.isMobileHdForceHidden"),
+            )
+            .stateIn(scope, SharingStarted.WhileSubscribed(), true)
+
+    override val isVoWifiForceHidden: Flow<Boolean> =
+        kairosInteractor.isVoWifiForceHidden
+            .toColdConflatedFlow(
+                kairosNetwork,
+                nameTag("MobileIconsInteractorKairosAdapter.isVoWifiForceHidden"),
+            )
+            .stateIn(scope, SharingStarted.WhileSubscribed(), true)
+
     override val activeMobileDataSubscriptionId: StateFlow<Int?>
         get() = repo.activeMobileDataSubscriptionId
 
@@ -207,6 +223,14 @@ constructor(
             )
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isRoamingForceHidden: Flow<Boolean> =
+        kairosInteractor.isRoamingForceHidden
+            .toColdConflatedFlow(
+                kairosNetwork,
+                nameTag("MobileIconsInteractorKairosAdapter.isRoamingForceHidden"),
+            )
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
     override val isDeviceInEmergencyCallsOnlyMode: Flow<Boolean>
         get() = repo.isDeviceEmergencyCallCapable
 
@@ -233,6 +257,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 +269,9 @@ constructor(
                 carrierNetworkChangeActive
             }
 
+            override val shouldShowFourgIcon: StateFlow<Boolean> = latest { shouldShowFourgIcon }
+                .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..075a337be22e7 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 = true,
             )
         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 9640fd4d38544..cb2771a11cb11 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)
 
@@ -210,14 +210,19 @@ object MobileIconBinder {
                         }
                     }
 
+                    // Set the mobile HD indicator (VoLTE/VoNR)
+                    launch {
+                        viewModel.showHd.distinctUntilChanged().collect { isHd ->
+                            mobileHdView.isVisible = isHd
+                            mobileHdSpace.isVisible = isHd
+                        }
+                    }
+
                     // Set the roaming indicator
                     launch {
-                        viewModel.roaming.distinctUntilChanged().collect { isRoaming ->
+                        viewModel.isRoamingVisible.distinctUntilChanged().collect { isRoaming ->
                             if (NewStatusBarIcons.isEnabled) {
                                 endSideRoamingView.isVisible = isRoaming
-                            } else {
-                                roamingView.isVisible = isRoaming
-                                roamingSpace.isVisible = isRoaming
                             }
                         }
                     }
@@ -268,7 +273,7 @@ object MobileIconBinder {
                                 networkTypeView.imageTintList = tint
                             }
 
-                            roamingView.imageTintList = tint
+                            mobileHdView.imageTintList = tint
                             endSideRoamingView.imageTintList = tint
                             activityIn.imageTintList = tint
                             activityOut.imageTintList = 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 591208e2afc1d..589559c5ad231 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
@@ -21,6 +21,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.LinearLayout
 import com.android.keyguard.AlphaOptimizedLinearLayout
 import com.android.systemui.kairos.ExperimentalKairosApi
 import com.android.systemui.kairos.KairosNetwork
@@ -37,11 +38,14 @@ 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) {
 
     var subId: Int = -1
+    private lateinit var mobileGroup: LinearLayout
 
     override fun toString(): String {
         return "ModernStatusBarMobileView(" +
@@ -99,6 +103,33 @@ 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
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        mobileGroup = requireViewById(R.id.mobile_group)
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        mobileGroup.measure(widthMeasureSpec, heightMeasureSpec)
+        setMeasuredDimension(mobileGroup.measuredWidth, mobileGroup.measuredHeight)
+    }
+
     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..f84d5c516fa86 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,9 @@ 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 +147,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 +169,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 +271,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 +344,18 @@ private class CellularIconViewModel(
             )
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isRoamingVisible: StateFlow<Boolean> =
+        combine(
+                roaming,
+                iconInteractor.isRoamingForceHidden
+            ) { isRoaming, isHidden ->
+                // If it's force hidden, just hide.
+                // Otherwise follow roaming state
+                isRoaming && !isHidden
+            }
+            .distinctUntilChanged()
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
     private val activity: Flow<DataActivityModel?> =
         if (!constants.shouldShowActivityConfig) {
             flowOf(null)
@@ -325,4 +380,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/MobileIconsViewModelKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModelKairos.kt
index 2150afef5d9e3..cab5a04bc9baa 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,16 @@ 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(false) { isMobileHdForceHidden }
+            override val isVoWifi: State<Boolean> = latest(false) { isVoWifi }
+            override val isVoWifiForceHidden: State<Boolean> = latest(false) { isVoWifiForceHidden }
+            override val shouldShowFourgIcon: State<Boolean> = latest(false) { shouldShowFourgIcon }
         }
 
     private fun trackedCommonViewModel(subId: Int) =
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/ui/binder/HomeStatusBarViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt
index f300b54a79233..0675148a27ae9 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
@@ -18,7 +18,9 @@ package com.android.systemui.statusbar.pipeline.shared.ui.binder
 
 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.net.Uri
 import android.os.Handler
@@ -31,10 +33,15 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.app.animation.Interpolators
+import com.android.systemui.crdroid.batterybar.BatteryBarController
+import com.android.systemui.crdroid.logo.LogoImage
 import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDisplaySingleton
 import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.res.R
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
+import com.android.systemui.shared.system.ActivityManagerWrapper
+import com.android.systemui.shared.system.TaskStackChangeListener
+import com.android.systemui.shared.system.TaskStackChangeListeners
 import com.android.systemui.statusbar.chips.mediaprojection.domain.model.MediaProjectionStopDialogModel
 import com.android.systemui.statusbar.chips.ui.binder.OngoingActivityChipBinder
 import com.android.systemui.statusbar.chips.ui.binder.OngoingActivityChipViewBinding
@@ -58,7 +65,6 @@ import com.android.systemui.statusbar.policy.Clock
 import javax.inject.Inject
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.update
@@ -101,10 +107,16 @@ constructor(
     }
 
     private data class ClockState(
-        val visibilityModel: VisibilityModel,
+        val autoHide: Boolean,
         val denyListed: Boolean,
         val hideForHun: Boolean,
-        val position: Int
+        val showChip: Boolean,
+        val position: Int,
+        val visibilityModel: VisibilityModel,
+    )
+
+    private data class Padding(
+        val start: Int, val top: Int, val end: Int, val bottom: Int,
     )
 
     override fun bind(
@@ -123,6 +135,13 @@ constructor(
         val rightClock: Clock = view.findViewById(R.id.clock_right)
         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
@@ -131,6 +150,8 @@ constructor(
             leftClock.hideInitially(state = View.GONE)
             centerClock.hideInitially(state = View.GONE)
             rightClock.hideInitially(state = View.GONE)
+            batteryBar.hideInitially()
+            leftLogo.hideInitially()
             notificationIconsArea.hideInitially()
         }
 
@@ -138,54 +159,112 @@ constructor(
             repeatOnLifecycle(Lifecycle.State.CREATED) {
                 val context = view.context
 
-                val clockState = MutableStateFlow(
-                    ClockState(
-                        visibilityModel = VisibilityModel(View.GONE, true),
-                        denyListed = false,
-                        hideForHun = false,
-                        position = context.contentResolver.readClockPosition()
+                val clockState =
+                    MutableStateFlow(
+                        ClockState(
+                            autoHide = false,
+                            denyListed = false,
+                            hideForHun = false,
+                            showChip = false,
+                            position = context.contentResolver.readClockPosition(),
+                            visibilityModel = VisibilityModel(View.GONE, true),
+                        )
                     )
-                )
 
+                val clockAutoHideUri: Uri =
+                    LineageSettings.System.getUriFor(
+                        LineageSettings.System.STATUS_BAR_CLOCK_AUTO_HIDE
+                    )
                 val iconHideListUri: Uri =
                     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 contentObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
-                    override fun onChange(selfChange: Boolean, uri: Uri?) {
-                        clockState.update { current ->
-                            when (uri) {
-                                iconHideListUri -> current.copy(
-                                    denyListed = StatusBarIconController.getIconHideList(context,
-                                        Settings.Secure.getString(context.contentResolver,
-                                            StatusBarIconController.ICON_HIDE_LIST)
-                                    ).contains("clock")
-                                )
-                                statusBarClockUri -> current.copy(
-                                    position = context.contentResolver.readClockPosition()
-                                )
-                                else -> current
+                val taskStackListener =
+                    object : TaskStackChangeListener {
+                        override fun onTaskStackChanged() {
+                            val autoHide = shouldClockAutoHideForCurrentTask()
+
+                            if (clockState.value.autoHide != autoHide) {
+                                clockState.update { it.copy(autoHide = autoHide) }
                             }
                         }
                     }
-                }
 
-                context.contentResolver.registerContentObserver(
-                    iconHideListUri, false, contentObserver, UserHandle.USER_ALL
-                )
-                context.contentResolver.registerContentObserver(
-                    statusBarClockUri, false, contentObserver, UserHandle.USER_ALL
-                )
+                val contentObserver =
+                    object : ContentObserver(Handler(Looper.getMainLooper())) {
+                        override fun onChange(selfChange: Boolean, uri: Uri?) {
+                            clockState.update { current ->
+                                when (uri) {
+                                    clockAutoHideUri -> {
+                                        val enabled =
+                                            context.contentResolver.readClockAutoHide() != 0
+
+                                        if (enabled) {
+                                            TaskStackChangeListeners.getInstance()
+                                                .registerTaskStackListener(taskStackListener)
+                                        } else {
+                                            TaskStackChangeListeners.getInstance()
+                                                .unregisterTaskStackListener(taskStackListener)
+                                        }
+
+                                        current.copy(
+                                            autoHide =
+                                                enabled && shouldClockAutoHideForCurrentTask()
+                                        )
+                                    }
+                                    iconHideListUri ->
+                                        current.copy(
+                                            denyListed =
+                                                StatusBarIconController.getIconHideList(
+                                                        context,
+                                                        Settings.Secure.getString(
+                                                            context.contentResolver,
+                                                            StatusBarIconController.ICON_HIDE_LIST,
+                                                        ),
+                                                    )
+                                                    .contains("clock")
+                                        )
+                                    statusBarClockUri ->
+                                        current.copy(
+                                            position = context.contentResolver.readClockPosition()
+                                        )
+                                    statusBarClockChipUri -> {
+                                        val enabled =
+                                            Settings.System.getIntForUser(context.contentResolver,
+                                                Settings.System.STATUSBAR_CLOCK_CHIP, 0,
+                                                UserHandle.USER_CURRENT
+                                            ) == 1
+                                        current.copy(
+                                            showChip = enabled
+                                        )
+                                    }
+                                    else -> current
+                                }
+                            }
+                        }
+                    }
 
-                contentObserver.onChange(false, iconHideListUri)
-                contentObserver.onChange(false, statusBarClockUri)
+                val urisToObserve = listOf(clockAutoHideUri, iconHideListUri, statusBarClockUri, statusBarClockChipUri)
+                urisToObserve.forEach { uri ->
+                    context.contentResolver.registerContentObserver(
+                        uri,
+                        false,
+                        contentObserver,
+                        UserHandle.USER_ALL,
+                    )
+                    contentObserver.onChange(false, uri)
+                }
 
                 // Ensure cleanup when lifecycle ends
                 val job = coroutineContext[Job]
                 job?.invokeOnCompletion {
                     runCatching {
                         context.contentResolver.unregisterContentObserver(contentObserver)
+                        TaskStackChangeListeners.getInstance()
+                            .unregisterTaskStackListener(taskStackListener)
                     }
                 }
 
@@ -370,35 +449,37 @@ constructor(
 
                     launch {
                         combine(
-                            viewModel.isClockVisible,
-                            viewModel.hideStartSideContentForHeadsUp
-                        ) { visibilityModel, hideForHun ->
-                            visibilityModel to hideForHun
-                        }.collect { (visibilityModel, hideForHun) ->
-                            clockState.update { current ->
-                                current.copy(
-                                    visibilityModel = visibilityModel,
-                                    hideForHun = hideForHun
-                                )
+                                viewModel.isClockVisible,
+                                viewModel.hideStartSideContentForHeadsUp,
+                            ) { visibilityModel, hideForHun ->
+                                visibilityModel to hideForHun
+                            }
+                            .collect { (visibilityModel, hideForHun) ->
+                                clockState.update { current ->
+                                    current.copy(
+                                        visibilityModel = visibilityModel,
+                                        hideForHun = hideForHun,
+                                    )
+                                }
                             }
-                        }
                     }
 
-                    var activeClock: Clock = leftClock
-                    activeClock.setIsActiveClock(true)
-                    centerClock.setIsActiveClock(false)
-                    rightClock.setIsActiveClock(false)
-
                     launch {
+                        var lastChipEnabled: Boolean? = null
+                        var lastClockPosition: Int? = null
+
                         clockState.collect { state ->
                             // We only want to hide left clock for HUN
-                            val hunBlocksClock = state.position == CLOCK_POSITION_LEFT
-                                && state.hideForHun
+                            val hunBlocksClock =
+                                state.position == CLOCK_POSITION_LEFT && state.hideForHun
 
                             // Apply denylist on top of ViewModel visibility
                             val finalVisibility =
-                                if (state.visibilityModel.visibility == View.VISIBLE &&
-                                    !hunBlocksClock && !state.denyListed
+                                if (
+                                    state.visibilityModel.visibility == View.VISIBLE &&
+                                        !hunBlocksClock &&
+                                        !state.autoHide &&
+                                        !state.denyListed
                                 ) {
                                     state.visibilityModel
                                 } else {
@@ -406,7 +487,7 @@ constructor(
                                 }
 
                             // Pick active clock view
-                            val newActiveClock: Clock =
+                            val activeClock: Clock =
                                 when (state.position) {
                                     CLOCK_POSITION_CENTER -> centerClock ?: leftClock
                                     CLOCK_POSITION_RIGHT -> rightClock ?: leftClock
@@ -414,18 +495,6 @@ constructor(
                                     else -> leftClock
                                 }
 
-                            if (newActiveClock !== activeClock) {
-                                // Deactivate previous clock
-                                activeClock.setIsActiveClock(false)
-                                activeClock.visibility = View.GONE
-
-                                // Activate new one
-                                activeClock = newActiveClock
-                                activeClock.setIsActiveClock(true)
-                            }
-
-                            val showClock = finalVisibility.visibility == View.VISIBLE
-
                             // Hide all clocks first
                             leftClock.visibility = View.GONE
                             centerClock.visibility = View.GONE
@@ -434,21 +503,32 @@ constructor(
                             // Show only the active one
                             activeClock.adjustVisibility(finalVisibility)
 
-                            leftClock.setVisibleByModernization(
-                                showClock && activeClock === leftClock
-                            )
-                            centerClock.setVisibleByModernization(
-                                showClock && activeClock === centerClock
-                            )
-                            rightClock.setVisibleByModernization(
-                                showClock && activeClock === rightClock
-                            )
+                            // Only touch chip UI when needed
+                            val chipNeedsUpdate = (lastChipEnabled != state.showChip)
+                                        || (lastClockPosition != state.position)
+                            if (chipNeedsUpdate) {
+                                applyClockChip(
+                                    context = context,
+                                    enabled = state.showChip,
+                                    activeClock = activeClock,
+                                    leftClock = leftClock,
+                                    centerClock = centerClock,
+                                    rightClock = rightClock,
+                                    leftPaddingInit = leftPaddingInit,
+                                    centerPaddingInit = centerPaddingInit,
+                                    rightPaddingInit = rightPaddingInit
+                                )
+                                lastChipEnabled = state.showChip
+                                lastClockPosition = state.position
+                            }
                         }
                     }
 
                     launch {
                         viewModel.isNotificationIconContainerVisible.collect {
                             notificationIconsArea.adjustVisibility(it)
+                            batteryBar.adjustVisibility(it)
+                            leftLogo.adjustVisibility(it)
                         }
                     }
 
@@ -524,15 +604,32 @@ constructor(
         }
     }
 
+    private fun ContentResolver.readClockAutoHide(): Int {
+        return LineageSettings.System.getIntForUser(
+            this,
+            LineageSettings.System.STATUS_BAR_CLOCK_AUTO_HIDE,
+            0,
+            UserHandle.USER_CURRENT,
+        )
+    }
+
     private fun ContentResolver.readClockPosition(): Int {
         return LineageSettings.System.getIntForUser(
             this,
             LineageSettings.System.STATUS_BAR_CLOCK,
             CLOCK_POSITION_LEFT,
-            UserHandle.USER_CURRENT
+            UserHandle.USER_CURRENT,
         )
     }
 
+    private fun shouldClockAutoHideForCurrentTask(): Boolean {
+        return ActivityManagerWrapper.getInstance()
+            .runningTask
+            ?.configuration
+            ?.windowConfiguration
+            ?.activityType == WindowConfiguration.ACTIVITY_TYPE_HOME
+    }
+
     private fun SystemEventAnimationState.isAnimatingChip() =
         when (this) {
             AnimatingIn,
@@ -587,6 +684,46 @@ 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,
+        enabled: Boolean,
+        activeClock: Clock,
+        leftClock: Clock,
+        centerClock: Clock,
+        rightClock: Clock,
+        leftPaddingInit: Padding,
+        centerPaddingInit: Padding,
+        rightPaddingInit: Padding
+    ) {
+        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)
+        }
+
+        fun apply(clock: Clock) {
+            val hPad = dpToPx(context, 10)
+            val vPad = dpToPx(context, 2)
+            clock.setBackgroundResource(R.drawable.sb_date_bg)
+            clock.setPaddingRelative(hPad, vPad, hPad, vPad)
+        }
+
+        // Always reset first so the previous active clock loses chip when position changes
+        reset(leftClock, leftPaddingInit)
+        reset(centerClock, centerPaddingInit)
+        reset(rightClock, rightPaddingInit)
+
+        if (!enabled) return
+
+        apply(activeClock)
+    }
+
     /**
      * 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/wifi/data/repository/WifiRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt
index bc7d376a8740c..9152cf191e6a5 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.wifi.shared.model.WifiNetworkModel
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiScanEntry
@@ -50,6 +51,11 @@ interface WifiRepository {
      */
     val wifiScanResults: StateFlow<List<WifiScanEntry>>
 
+    /**
+     * 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 8d1edd9cada4e..a6c9e5f9ece27 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.wifi.data.repository.demo.DemoWifiRepository
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
@@ -127,4 +128,9 @@ constructor(
         activeRepo
             .flatMapLatest { it.wifiScanResults }
             .stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.wifiScanResults.value)
+
+    override val imsStates: StateFlow<List<ImsStateModel>> =
+        activeRepo
+            .flatMapLatest { it.imsStates }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.imsStates.value)
 }
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 5d879ddc4dddf..b15b34a671d4f 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
@@ -17,6 +17,7 @@
 package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo
 
 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.wifi.data.repository.WifiRepository
@@ -60,6 +61,10 @@ constructor(
         MutableStateFlow(emptyList())
     override val wifiScanResults: StateFlow<List<WifiScanEntry>> = _wifiScanResults
 
+    private val _imsStates: MutableStateFlow<List<ImsStateModel>> =
+        MutableStateFlow(emptyList())
+    override val imsStates: StateFlow<List<ImsStateModel>> = _imsStates
+
     fun startProcessingCommands() {
         demoCommandJob =
             scope.launch {
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 b79fb9b5caf36..2c0da946f9068 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.wifi.data.repository.RealWifiRepository
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
@@ -49,6 +50,9 @@ class DisabledWifiRepository @Inject constructor() : RealWifiRepository {
     override val wifiScanResults: StateFlow<List<WifiScanEntry>> =
         MutableStateFlow<List<WifiScanEntry>>(emptyList()).asStateFlow()
 
+    override val imsStates: StateFlow<List<ImsStateModel>> =
+        MutableStateFlow<List<ImsStateModel>>(emptyList()).asStateFlow()
+
     companion object {
         private val NETWORK = WifiNetworkModel.Unavailable
         private val ACTIVITY = DataActivityModel(hasActivityIn = false, hasActivityOut = false)
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 eaceb5e225350..212ecd144696e 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.toWifiDataActivityModel
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
@@ -83,6 +85,7 @@ constructor(
     private val wifiManager: WifiManager,
     @WifiInputLog private val inputLogger: LogBuffer,
     @WifiTableLog private val tableLogger: TableLogBuffer,
+    private val commonImsRepo: CommonImsRepository,
 ) : RealWifiRepository, LifecycleOwner {
 
     override val lifecycle =
@@ -501,6 +504,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(
@@ -513,10 +517,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 c0b0c4acb51ac..30ce715b81d45 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,10 +18,12 @@ 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.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
@@ -63,6 +65,12 @@ interface WifiInteractor {
 
     /** True if there are networks available other than the currently-connected one */
     val areNetworksAvailable: StateFlow<Boolean>
+
+    /** 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
@@ -71,6 +79,7 @@ class WifiInteractorImpl
 constructor(
     connectivityRepository: ConnectivityRepository,
     wifiRepository: WifiRepository,
+    commonImsRepo: CommonImsRepository,
     @Application scope: CoroutineScope,
 ) : WifiInteractor {
 
@@ -117,6 +126,26 @@ constructor(
             }
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+
+    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 ceb57dfecacc4..ef5ba83f89479 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -17,25 +17,22 @@
 package com.android.systemui.statusbar.policy;
 
 import android.annotation.NonNull;
-import android.app.ActivityManager;
 import android.app.StatusBarManager;
-import android.app.WindowConfiguration;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 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.net.Uri;
 import android.os.Bundle;
 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;
@@ -58,12 +55,8 @@
 import com.android.systemui.res.R;
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.TaskStackChangeListener;
-import com.android.systemui.shared.system.TaskStackChangeListeners;
 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;
 
@@ -72,6 +65,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;
 
@@ -84,7 +78,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";
@@ -92,17 +85,28 @@ 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;
 
-    private boolean mClockAutoHide = false;
     private boolean mClockVisibleByPolicy = true;
     private boolean mClockVisibleByUser = true;
 
     private boolean mAttached;
     private boolean mScreenReceiverRegistered;
-    private boolean mTaskStackListenerRegistered;
     private Calendar mCalendar;
     private String mContentDescriptionFormatString;
     private SimpleDateFormat mClockFormat;
@@ -115,14 +119,26 @@ 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 ContentObserver mContentObserver;
     private boolean mShowSeconds;
     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 mIsActiveClock = true;
-    private boolean mVisibleByModernization = true;
 
     /**
      * Color to be set on this {@link TextView}, when wallpaperTextColor is <b>not</b> utilized.
@@ -152,33 +168,8 @@ public Clock(Context context, AttributeSet attrs, int defStyle) {
                 R.styleable.Clock,
                 0, 0);
         try {
-            mAmPmStyle = LineageSettings.System.getInt(mContext.getContentResolver(),
-                    LineageSettings.System.STATUS_BAR_AM_PM, AM_PM_STYLE_GONE);
-            mContentObserver = new ContentObserver(null) {
-                final Uri clockAmPmUri = LineageSettings.System.getUriFor(
-                        LineageSettings.System.STATUS_BAR_AM_PM);
-                final Uri clockAutoHideUri = LineageSettings.System.getUriFor(
-                        LineageSettings.System.STATUS_BAR_CLOCK_AUTO_HIDE);
-
-                @Override
-                public void onChange(boolean selfChange, Uri uri) {
-                    if (clockAmPmUri.equals(uri)) {
-                        mAmPmStyle = LineageSettings.System.getInt(
-                                mContext.getContentResolver(),
-                                LineageSettings.System.STATUS_BAR_AM_PM, AM_PM_STYLE_GONE);
-                        // Force refresh of dependent variables.
-                        mContentDescriptionFormatString = "";
-                        mDateTimePatternGenerator = null;
-                        mContext.getMainExecutor().execute(() -> {
-                            updateClock(true);
-                        });
-                    } else if (clockAutoHideUri.equals(uri)) {
-                        handleTaskStackListener(
-                                LineageSettings.System.getInt(mContext.getContentResolver(),
-                                        LineageSettings.System.STATUS_BAR_CLOCK_AUTO_HIDE, 0) != 0);
-                    }
-                }
-            };
+            mAmPmStyle = LineageSettings.System.getIntForUser(mContext.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 {
@@ -220,7 +211,7 @@ public void onRestoreInstanceState(Parcelable state) {
         mClockVisibleByUser = bundle.getBoolean(VISIBLE_BY_USER, true);
         mShowSeconds = bundle.getBoolean(SHOW_SECONDS, false);
         if (bundle.containsKey(VISIBILITY)) {
-            setVisibility(bundle.getInt(VISIBILITY));
+            super.setVisibility(bundle.getInt(VISIBILITY));
         }
     }
 
@@ -242,17 +233,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);
-            mContext.getContentResolver().registerContentObserver(
-                    LineageSettings.System.getUriFor(
-                            LineageSettings.System.STATUS_BAR_CLOCK_AUTO_HIDE),
-                    false, mContentObserver);
-            mContentObserver.onChange(false, LineageSettings.System.getUriFor(
-                    LineageSettings.System.STATUS_BAR_CLOCK_AUTO_HIDE));
+            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();
@@ -285,25 +272,9 @@ 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);
-            handleTaskStackListener(false);
-        }
-    }
-
-    private void handleTaskStackListener(boolean register) {
-        if (!mIsStatusBar) {
-            // We don't support clock auto hide for quick settings.
-            return;
-        }
-        if (register && !mTaskStackListenerRegistered) {
-            TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener);
-            mTaskStackListenerRegistered = true;
-        } else if (!register && mTaskStackListenerRegistered) {
-            TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);
-            mTaskStackListenerRegistered = false;
         }
     }
 
@@ -345,32 +316,15 @@ public void onReceive(Context context, Intent intent) {
 
     @Override
     public void setVisibility(int visibility) {
-        // In a multi clock setup, only the active clock is allowed to become visible.
-        // Inactive clocks can still be hidden.
-        if (!mIsActiveClock && visibility == View.VISIBLE) {
-            return;
-        }
-
-        if (visibility == View.VISIBLE && !shouldBeVisible()) {
-            return;
+        if (!StatusBarRootModernization.isEnabled()) {
+            if (visibility == View.VISIBLE && !shouldBeVisible()) {
+                return;
+            }
         }
 
         super.setVisibility(visibility);
     }
 
-    public void setIsActiveClock(boolean active) {
-        mIsActiveClock = active;
-    }
-
-    public void setVisibleByModernization(boolean visible) {
-        if (mVisibleByModernization == visible) return;
-        mVisibleByModernization = visible;
-
-        if (StatusBarRootModernization.isEnabled()) {
-            setVisibility(shouldBeVisible() ? View.VISIBLE : View.GONE);
-        }
-    }
-
     private void setClockVisibleByUser(boolean visible) {
         StatusBarRootModernization.assertInLegacyMode();
 
@@ -386,11 +340,7 @@ private void setClockVisibilityByPolicy(boolean visible) {
     }
 
     private boolean shouldBeVisible() {
-        if (StatusBarRootModernization.isEnabled()) {
-            return mVisibleByModernization && !mClockAutoHide;
-        }
-
-        return !mClockAutoHide && mClockVisibleByPolicy && mClockVisibleByUser;
+        return mClockVisibleByPolicy && mClockVisibleByUser;
     }
 
     private void updateClockVisibility() {
@@ -420,18 +370,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
@@ -527,27 +497,6 @@ private void updateShowSeconds() {
         }
     }
 
-    private void updateShowClock() {
-        ActivityManager.RunningTaskInfo runningTask =
-                ActivityManagerWrapper.getInstance().getRunningTask();
-        final int activityType = runningTask != null
-                ? runningTask.configuration.windowConfiguration.getActivityType()
-                : WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
-        final boolean clockAutoHide = activityType == WindowConfiguration.ACTIVITY_TYPE_HOME;
-
-        if (mClockAutoHide == clockAutoHide) {
-            return;
-        }
-
-        mClockAutoHide = clockAutoHide;
-
-        if (StatusBarRootModernization.isEnabled()) {
-            setVisibility(shouldBeVisible() ? View.VISIBLE : View.GONE);
-        } else {
-            updateClockVisibility();
-        }
-    }
-
     private final CharSequence getSmallTime() {
         Context context = getContext();
         boolean is24 = DateFormat.is24HourFormat(context, mCurrentUserId);
@@ -600,13 +549,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 {
@@ -618,12 +615,10 @@ private final CharSequence getSmallTime() {
                     formatted.delete(magic2, magic2 + 1);
                     formatted.delete(magic1, magic1 + 1);
                 }
-                return formatted;
             }
         }
 
-        return result;
-
+        return formatted;
     }
 
     private boolean mDemoMode;
@@ -687,22 +682,5 @@ public void run() {
             mSecondsHandler.postAtTime(this, SystemClock.uptimeMillis() / 1000 * 1000 + 1000);
         }
     };
-
-    private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {
-        @Override
-        public void onTaskStackChanged() {
-            updateShowClock();
-        }
-
-        @Override
-        public void onTaskRemoved(int taskId) {
-            updateShowClock();
-        }
-
-        @Override
-        public void onTaskMovedToFront(int taskId) {
-            updateShowClock();
-        }
-    };
 }
 
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..0910d0c53764c 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,74 @@ 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;
+            synchronized (this) {
+                clampedLevel = Math.max(1, Math.min(requestedLevel, mMaxLevel));
+                if (mCurrentLevel == clampedLevel) return;
+                mCurrentLevel = clampedLevel;
+            }
+
+            try {
+                if (DEBUG) Log.d(TAG, "Setting torch strength level: " + clampedLevel);
+                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 +288,7 @@ public void addCallback(@NonNull FlashlightListener l) {
             mListeners.add(new WeakReference<>(l));
             l.onFlashlightAvailabilityChanged(isAvailable());
             l.onFlashlightChanged(isEnabled());
+            l.onFlashlightStrengthChanged(getCurrentLevel());
         }
     }
 
@@ -175,7 +301,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 +330,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 +400,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/GameSpaceManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/GameSpaceManager.kt
new file mode 100644
index 0000000000000..80052fafaab99
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/GameSpaceManager.kt
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2021 Chaldeaprjkt
+ * Copyright (C) 2022-2025 crDroid Android Project
+ * Copyright (C) 2025 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.policy
+
+import android.app.ActivityTaskManager
+import android.app.TaskStackListener
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.PowerManager
+import android.os.RemoteException
+import android.os.UserHandle
+import android.provider.Settings
+
+import com.android.systemui.dagger.SysUISingleton
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.channels.awaitClose
+import javax.inject.Inject
+
+@SysUISingleton
+class GameSpaceManager @Inject constructor(
+    private val context: Context,
+    private val keyguardStateController: KeyguardStateController,
+) {
+    private val taskManager by lazy { ActivityTaskManager.getService() }
+    private val powerManager by lazy { context.getSystemService(Context.POWER_SERVICE) as PowerManager }
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+
+    private val _activeGame = MutableStateFlow<String?>(null)
+    val activeGame: StateFlow<String?> = _activeGame.asStateFlow()
+
+    private val refreshTrigger = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    private var observationJob: Job? = null
+
+    private val taskStackListener = object : TaskStackListener() {
+        override fun onTaskStackChanged() = refresh()
+        override fun onTaskRemoved(taskId: Int) = refresh()
+    }
+
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            when (intent?.action) {
+                Intent.ACTION_SCREEN_OFF -> _activeGame.value = null
+                Intent.ACTION_SCREEN_ON -> refresh()
+            }
+        }
+    }
+
+    private val keyguardCallback = object : KeyguardStateController.Callback {
+        override fun onKeyguardShowingChanged() {
+            if (!keyguardStateController.isShowing) refresh()
+        }
+    }
+
+    init {
+        observe()
+    }
+
+    fun observe() {
+        if (observationJob != null) return
+
+        observationJob = coroutineScope.launch {
+            merge(
+                refreshTrigger,
+                screenAndKeyguardFlow()
+            ).collect {
+                updateGameState()
+            }
+        }
+
+        registerReceivers()
+    }
+
+    fun unobserve() {
+        observationJob?.cancel()
+        observationJob = null
+        unregisterReceivers()
+    }
+
+    fun shouldSuppressFullScreenIntent(): Boolean {
+        return Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.GAMESPACE_SUPPRESS_FULLSCREEN_INTENT, 0,
+            UserHandle.USER_CURRENT
+        ) == 1 && activeGame.value != null
+    }
+
+    private fun refresh() {
+        refreshTrigger.tryEmit(Unit)
+    }
+
+    private fun registerReceivers() {
+        try {
+            taskManager.registerTaskStackListener(taskStackListener)
+            context.registerReceiver(
+                broadcastReceiver,
+                IntentFilter().apply {
+                    addAction(Intent.ACTION_SCREEN_OFF)
+                    addAction(Intent.ACTION_SCREEN_ON)
+                },
+                Context.RECEIVER_NOT_EXPORTED
+            )
+            keyguardStateController.addCallback(keyguardCallback)
+        } catch (_: Exception) {}
+    }
+
+    private fun unregisterReceivers() {
+        try {
+            taskManager.unregisterTaskStackListener(taskStackListener)
+            context.unregisterReceiver(broadcastReceiver)
+            keyguardStateController.removeCallback(keyguardCallback)
+        } catch (_: Exception) {}
+    }
+
+    private fun screenAndKeyguardFlow(): Flow<Unit> = callbackFlow {
+        val screenFilter = IntentFilter().apply {
+            addAction(Intent.ACTION_SCREEN_ON)
+            addAction(Intent.ACTION_SCREEN_OFF)
+        }
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                trySend(Unit)
+            }
+        }
+
+        val callback = object : KeyguardStateController.Callback {
+            override fun onKeyguardShowingChanged() {
+                trySend(Unit)
+            }
+        }
+
+        context.registerReceiver(receiver, screenFilter, Context.RECEIVER_NOT_EXPORTED)
+        keyguardStateController.addCallback(callback)
+        awaitClose {
+            context.unregisterReceiver(receiver)
+            keyguardStateController.removeCallback(callback)
+        }
+    }
+
+    private suspend fun updateGameState() {
+        if (!powerManager.isInteractive || keyguardStateController.isShowing) {
+            if (_activeGame.value != null) {
+                _activeGame.value = null
+                dispatchGameState()
+            }
+            return
+        }
+
+        val currentPackage = getForegroundPackage()
+        val isGame = currentPackage != null && isInGameList(currentPackage)
+
+        if (_activeGame.value != currentPackage && isGame) {
+            _activeGame.value = currentPackage
+            dispatchGameState()
+        } else if (!isGame && _activeGame.value != null) {
+            _activeGame.value = null
+            dispatchGameState()
+        }
+    }
+
+    private suspend fun getForegroundPackage(): String? = withContext(Dispatchers.IO) {
+        try {
+            taskManager.focusedRootTaskInfo?.topActivity?.packageName
+        } catch (e: RemoteException) {
+            null
+        }
+    }
+
+    private fun isInGameList(packageName: String): Boolean {
+        val games = Settings.System.getStringForUser(
+            context.contentResolver,
+            Settings.System.GAMESPACE_GAME_LIST,
+            UserHandle.USER_CURRENT
+        ) ?: return false
+
+        return games.split(";").mapNotNull {
+            it.substringBefore('=').takeIf(String::isNotBlank)
+        }.toSet().contains(packageName)
+    }
+
+    private fun dispatchGameState() {
+        val action = if (_activeGame.value != null) ACTION_GAME_START else ACTION_GAME_STOP
+        Intent(action).apply {
+            setPackage(GAMESPACE_PACKAGE)
+            component = ComponentName.unflattenFromString(RECEIVER_CLASS)
+            putExtra(EXTRA_CALLER_NAME, context.packageName)
+            _activeGame.value?.let { putExtra(EXTRA_ACTIVE_GAME, it) }
+            addFlags(
+                Intent.FLAG_RECEIVER_REPLACE_PENDING or
+                        Intent.FLAG_RECEIVER_FOREGROUND or
+                        Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND
+            )
+            context.sendBroadcastAsUser(this, UserHandle.CURRENT, android.Manifest.permission.MANAGE_GAME_MODE)
+        }
+    }
+
+    companion object {
+        private const val ACTION_GAME_START = "io.chaldeaprjkt.gamespace.action.GAME_START"
+        private const val ACTION_GAME_STOP = "io.chaldeaprjkt.gamespace.action.GAME_STOP"
+        private const val GAMESPACE_PACKAGE = "io.chaldeaprjkt.gamespace"
+        private const val RECEIVER_CLASS = "io.chaldeaprjkt.gamespace/.gamebar.GameBroadcastReceiver"
+        private const val EXTRA_CALLER_NAME = "source"
+        private const val EXTRA_ACTIVE_GAME = "package_name"
+    }
+}
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 81d06a8db0b6e..87c0d65e10098 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java
@@ -43,6 +43,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;
@@ -246,6 +247,7 @@ private void setKeyguardFadingAway(boolean keyguardFadingAway) {
                     keyguardFadingAway ? 1 : 0);
             mKeyguardFadingAway = keyguardFadingAway;
             invokeForEachCallback(Callback::onKeyguardFadingAwayChanged);
+            ScrimUtils.get().onKeyguardFadingAwayChanged(keyguardFadingAway);
         }
     }
 
@@ -362,6 +364,7 @@ public void notifyKeyguardGoingAway(boolean keyguardGoingAway) {
             mKeyguardGoingAway = keyguardGoingAway;
             mKeyguardInteractorLazy.get().setIsKeyguardGoingAway(keyguardGoingAway);
             invokeForEachCallback(Callback::onKeyguardGoingAwayChanged);
+            ScrimUtils.get().onKeyguardGoingAwayChanged(keyguardGoingAway);
         }
     }
 
@@ -371,6 +374,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/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/theme/ThemeOverlayApplier.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java
index fe928c381156c..b7c604cf2f02d 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java
@@ -68,10 +68,12 @@ public class ThemeOverlayApplier implements Dumpable {
     static final String SYSUI_PACKAGE = "com.android.systemui";
 
     static final String OVERLAY_BLACK_THEME =
-            "org.lineageos.overlay.customization.blacktheme";
+            "com.android.system.theme.black";
 
     static final String OVERLAY_CATEGORY_DYNAMIC_COLOR =
             "android.theme.customization.dynamic_color";
+    static final String OVERLAY_CATEGORY_BG_COLOR =
+            "android.theme.customization.bg_color";
     static final String OVERLAY_CATEGORY_ACCENT_COLOR =
             "android.theme.customization.accent_color";
     static final String OVERLAY_CATEGORY_SYSTEM_PALETTE =
@@ -85,6 +87,14 @@ public class ThemeOverlayApplier implements Dumpable {
 
     static final String OVERLAY_COLOR_BOTH = "android.theme.customization.color_both";
 
+    static final String OVERLAY_LUMINANCE_FACTOR = "android.theme.customization.luminance_factor";
+
+    static final String OVERLAY_CHROMA_FACTOR = "android.theme.customization.chroma_factor";
+
+    static final String OVERLAY_WHOLE_PALETTE = "android.theme.customization.whole_palette";
+
+    static final String OVERLAY_TINT_BACKGROUND = "android.theme.customization.tint_background";
+
     static final String COLOR_SOURCE_PRESET = "preset";
 
     static final String COLOR_SOURCE_HOME = "home_wallpaper";
@@ -113,6 +123,15 @@ 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";
+    @VisibleForTesting
+    static final String OVERLAY_CATEGORY_LOCK_CLOCK_FONT =
+            "android.theme.customization.lockscreen_clock_font";
 
     /*
      * All theme customization categories used by the system, in order that they should be applied,
@@ -120,15 +139,16 @@ 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_LOCK_CLOCK_FONT,
             OVERLAY_CATEGORY_ACCENT_COLOR,
             OVERLAY_CATEGORY_DYNAMIC_COLOR,
             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
@@ -137,9 +157,12 @@ public class ThemeOverlayApplier implements Dumpable {
             OVERLAY_CATEGORY_ACCENT_COLOR,
             OVERLAY_CATEGORY_DYNAMIC_COLOR,
             OVERLAY_CATEGORY_FONT,
+            OVERLAY_CATEGORY_LOCK_CLOCK_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<>();
@@ -166,25 +189,25 @@ public ThemeOverlayApplier(OverlayManager overlayManager,
         mTargetPackageToCategories.put(ANDROID_PACKAGE, Sets.newHashSet(
                 OVERLAY_CATEGORY_SYSTEM_PALETTE, OVERLAY_CATEGORY_ACCENT_COLOR,
                 OVERLAY_CATEGORY_DYNAMIC_COLOR,
-                OVERLAY_CATEGORY_FONT, OVERLAY_CATEGORY_SHAPE,
-                OVERLAY_CATEGORY_ICON_ANDROID));
-        mTargetPackageToCategories.put(SYSUI_PACKAGE,
-                Sets.newHashSet(OVERLAY_CATEGORY_ICON_SYSUI));
+                OVERLAY_CATEGORY_FONT, OVERLAY_CATEGORY_LOCK_CLOCK_FONT,
+                OVERLAY_CATEGORY_SHAPE, OVERLAY_CATEGORY_ICON_ANDROID));
+        mTargetPackageToCategories.put(SYSUI_PACKAGE, Sets.newHashSet(
+                OVERLAY_CATEGORY_ICON_SYSUI,
+                OVERLAY_CATEGORY_ICON_SIGNAL,
+                OVERLAY_CATEGORY_ICON_WIFI));
+
         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);
+        mCategoryToTargetPackage.put(OVERLAY_CATEGORY_LOCK_CLOCK_FONT, ANDROID_PACKAGE);
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_SHAPE, ANDROID_PACKAGE);
         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 +257,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);
+                    }
                 }
             }
 
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index 1e5f7451d3448..ca1a103564bda 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -25,11 +25,16 @@
 import static com.android.systemui.theme.ThemeOverlayApplier.COLOR_SOURCE_HOME;
 import static com.android.systemui.theme.ThemeOverlayApplier.COLOR_SOURCE_LOCK;
 import static com.android.systemui.theme.ThemeOverlayApplier.COLOR_SOURCE_PRESET;
+import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_BG_COLOR;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_ACCENT_COLOR;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_DYNAMIC_COLOR;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_SYSTEM_PALETTE;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_THEME_STYLE;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_BOTH;
+import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_LUMINANCE_FACTOR;
+import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CHROMA_FACTOR;
+import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_WHOLE_PALETTE;
+import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_TINT_BACKGROUND;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_INDEX;
 import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_SOURCE;
 import static com.android.systemui.theme.ThemeOverlayApplier.TIMESTAMP_FIELD;
@@ -346,9 +351,10 @@ private void handleWallpaperColors(WallpaperColors wallpaperColors, int flags, i
                     && !isSeedColorSet(jsonObject, wallpaperColors)) {
                 mSkipSettingChange = true;
                 if (jsonObject.has(OVERLAY_CATEGORY_ACCENT_COLOR) || jsonObject.has(
-                        OVERLAY_CATEGORY_SYSTEM_PALETTE)) {
+                        OVERLAY_CATEGORY_SYSTEM_PALETTE) || jsonObject.has(OVERLAY_CATEGORY_BG_COLOR)) {
                     jsonObject.remove(OVERLAY_CATEGORY_DYNAMIC_COLOR);
                     jsonObject.remove(OVERLAY_CATEGORY_ACCENT_COLOR);
+                    jsonObject.remove(OVERLAY_CATEGORY_BG_COLOR);
                     jsonObject.remove(OVERLAY_CATEGORY_SYSTEM_PALETTE);
                     jsonObject.remove(OVERLAY_COLOR_INDEX);
                 }
@@ -685,15 +691,26 @@ 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);
+        final float luminanceFactor = fetchLuminanceFactorFromSetting();
+        final float chromaFactor = fetchChromaFactorFromSetting();
+        final boolean wholePalette = fetchWholePaletteFromSetting();
+        final boolean tintBg = fetchTintBackgroundFromSetting();
+        final Integer bgColor = fetchBgColorFromSetting();
+        mDarkColorScheme = new ColorScheme(color, true /* isDark */, mThemeStyle, mContrast,
+                luminanceFactor, chromaFactor, wholePalette, tintBg, bgColor);
+        mLightColorScheme = new ColorScheme(color, false /* isDark */, mThemeStyle, mContrast,
+                luminanceFactor, chromaFactor, wholePalette, tintBg, bgColor);
         mColorScheme = isNightMode() ? mDarkColorScheme : mLightColorScheme;
 
         mAccentOverlay = newFabricatedOverlay("accent");
-        assignColorsToOverlay(mAccentOverlay, DynamicColors.getAllAccentPalette(), false);
+        assignColorsToOverlay(mAccentOverlay, DynamicColors.getAllAccentPalette(luminanceFactor, chromaFactor, wholePalette), false);
 
         mNeutralOverlay = newFabricatedOverlay("neutral");
-        assignColorsToOverlay(mNeutralOverlay, DynamicColors.getAllNeutralPalette(), false);
+        if (tintBg) {
+            assignColorsToOverlay(mNeutralOverlay, DynamicColors.getAllNeutralPalette(luminanceFactor, chromaFactor, wholePalette), false);
+        } else {
+            assignColorsToOverlay(mNeutralOverlay, DynamicColors.getAllNeutralPalette(), false);
+        }
 
         mDynamicOverlay = newFabricatedOverlay("dynamic");
         // Themed Colors
@@ -812,6 +829,7 @@ private void updateThemeOverlays() {
                 categoryToPackage.remove(OVERLAY_CATEGORY_SYSTEM_PALETTE);
                 categoryToPackage.remove(OVERLAY_CATEGORY_ACCENT_COLOR);
                 categoryToPackage.remove(OVERLAY_CATEGORY_DYNAMIC_COLOR);
+                categoryToPackage.remove(OVERLAY_CATEGORY_BG_COLOR);
             } catch (NumberFormatException e) {
                 // This is a package name. All good, let's continue
             }
@@ -976,6 +994,84 @@ protected HardwareDefaultSetting getThemeSettingsDefaults() {
                 isWallpaper ? COLOR_SOURCE_HOME : COLOR_SOURCE_PRESET);
     }
 
+    private float fetchLuminanceFactorFromSetting() {
+        final String overlayPackageJson = mSecureSettings.getStringForUser(
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                mUserTracker.getUserId());
+        if (!TextUtils.isEmpty(overlayPackageJson)) {
+            try {
+                JSONObject object = new JSONObject(overlayPackageJson);
+                float res = (float) object.optDouble(OVERLAY_LUMINANCE_FACTOR, 1d);
+                return res != 0f ? res : 1f;
+            } catch (JSONException | IllegalArgumentException e) {
+                Log.i(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
+            }
+        }
+        return 1f;
+    }
+
+    private float fetchChromaFactorFromSetting() {
+        final String overlayPackageJson = mSecureSettings.getStringForUser(
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                mUserTracker.getUserId());
+        if (!TextUtils.isEmpty(overlayPackageJson)) {
+            try {
+                JSONObject object = new JSONObject(overlayPackageJson);
+                float res = (float) object.optDouble(OVERLAY_CHROMA_FACTOR, 1d);
+                return res != 0f ? res : 1f;
+            } catch (JSONException | IllegalArgumentException e) {
+                Log.i(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
+            }
+        }
+        return 1f;
+    }
+
+    private boolean fetchWholePaletteFromSetting() {
+        final String overlayPackageJson = mSecureSettings.getStringForUser(
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                mUserTracker.getUserId());
+        if (!TextUtils.isEmpty(overlayPackageJson)) {
+            try {
+                JSONObject object = new JSONObject(overlayPackageJson);
+                return object.optInt(OVERLAY_WHOLE_PALETTE, 0) == 1;
+            } catch (JSONException | IllegalArgumentException e) {
+                Log.i(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
+            }
+        }
+        return false;
+    }
+
+    private boolean fetchTintBackgroundFromSetting() {
+        final String overlayPackageJson = mSecureSettings.getStringForUser(
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                mUserTracker.getUserId());
+        if (!TextUtils.isEmpty(overlayPackageJson)) {
+            try {
+                JSONObject object = new JSONObject(overlayPackageJson);
+                return object.optInt(OVERLAY_TINT_BACKGROUND, 0) == 1;
+            } catch (JSONException | IllegalArgumentException e) {
+                Log.i(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
+            }
+        }
+        return false;
+    }
+
+    private Integer fetchBgColorFromSetting() {
+        final String overlayPackageJson = mSecureSettings.getStringForUser(
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                mUserTracker.getUserId());
+        if (!TextUtils.isEmpty(overlayPackageJson)) {
+            try {
+                JSONObject object = new JSONObject(overlayPackageJson);
+                int res = object.optInt(OVERLAY_CATEGORY_BG_COLOR);
+                return res != 0 ? res : null;
+            } catch (JSONException | IllegalArgumentException e) {
+                Log.i(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
+            }
+        }
+        return null;
+    }
+
     @Override
     public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
         pw.println("mSystemColors=" + mCurrentColors);
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..154a23f4b1a9d 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarTuner.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarTuner.java
@@ -15,9 +15,13 @@
  */
 package com.android.systemui.tuner;
 
+import android.content.Context;
 import android.os.Bundle;
+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 +35,35 @@ public class StatusBarTuner extends SettingsBasePreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.status_bar_prefs, rootKey);
+        if (!isVoiceCapable(requireContext())) {
+            removeMobilePreferences();
+        }
+    }
+
+    public static boolean isVoiceCapable(Context context) {
+        TelephonyManager telephony =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return telephony != null && telephony.isVoiceCapable();
+    }
+
+    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/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/ScrimUtils.kt b/packages/SystemUI/src/com/android/systemui/util/ScrimUtils.kt
new file mode 100644
index 0000000000000..3fb11e43467a9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/ScrimUtils.kt
@@ -0,0 +1,173 @@
+/*
+ * 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.Looper
+import android.service.notification.StatusBarNotification
+import com.android.systemui.statusbar.StatusBarState.KEYGUARD
+import com.android.systemui.statusbar.StatusBarState.SHADE_LOCKED
+import java.util.concurrent.atomic.AtomicBoolean
+
+/* Scrim - aka testing utils */
+class ScrimUtils private constructor() {
+
+    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) {}
+    }
+
+    private val listeners = WeakListenerManager<ScrimEventListener>()
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    private val mQsVisible = AtomicBoolean()
+    private val mPulsing = AtomicBoolean()
+    private val mFadingAwayDuration = 500L
+
+    @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 {
+        @Volatile private var instance: ScrimUtils? = null
+
+        @JvmStatic
+        fun get(): ScrimUtils =
+            instance ?: synchronized(this) {
+                instance ?: ScrimUtils().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) }
+        }
+    }
+
+    fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        listeners.notifyOnMain { it.onKeyguardFadingAwayChanged(fadingAway) }
+        postKeyguardRetry()
+    }
+
+    fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        listeners.notifyOnMain { it.onKeyguardGoingAwayChanged(goingAway) }
+        postKeyguardRetry()
+    }
+
+    fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        listeners.notifyOnMain { it.onPrimaryBouncerShowingChanged(showing) }
+        postKeyguardRetry()
+    }
+
+    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) }
+        }
+    }
+
+    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) }
+        }
+    }
+
+    fun setPulsing(pulsing: Boolean) {
+        if (mPulsing.getAndSet(pulsing) != pulsing) {
+            listeners.notify { it.setPulsing(pulsing) }
+        }
+    }
+
+    fun onStartedWakingUp() {
+        mAwake = true
+        listeners.notify { it.onStartedWakingUp() }
+    }
+
+    fun onScreenTurnedOff() {
+        mAwake = false
+        listeners.notify { it.onScreenTurnedOff() }
+    }
+
+    fun onUserChanged() {
+        listeners.notify { it.onUserChanged() }
+    }
+
+    fun onNotificationPosted(sbn: StatusBarNotification) {
+        listeners.notifyOnMain { it.onNotificationPosted(sbn) }
+    }
+
+    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
+        }
+}
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/volume/SegmentedButtons.java b/packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java
index d9593bd56f007..a69e82ac073db 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java
@@ -31,8 +31,10 @@
 
 public class SegmentedButtons extends LinearLayout {
     private static final int LABEL_RES_KEY = R.id.label;
-    private static final Typeface REGULAR = Typeface.create("sans-serif", Typeface.NORMAL);
-    private static final Typeface MEDIUM = Typeface.create("sans-serif-medium", Typeface.NORMAL);
+    private final String txtFont;
+    private final String txtMediumFont;
+    private final Typeface REGULAR;
+    private final Typeface MEDIUM;
 
     private final Context mContext;
     protected final LayoutInflater mInflater;
@@ -47,6 +49,10 @@ public SegmentedButtons(Context context, AttributeSet attrs) {
         mInflater = LayoutInflater.from(mContext);
         setOrientation(HORIZONTAL);
         mConfigurableTexts = new ConfigurableTexts(mContext);
+        txtFont = getResources().getString(com.android.internal.R.string.config_bodyFontFamily);
+        txtMediumFont = getResources().getString(com.android.internal.R.string.config_bodyFontFamilyMedium);
+        REGULAR = Typeface.create(txtFont, Typeface.NORMAL);
+        MEDIUM = Typeface.create(txtMediumFont, Typeface.NORMAL);
     }
 
     public void setCallback(Callback callback) {
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/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
index 437dab59bcd56..20d67a4d658c4 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
@@ -50,6 +50,7 @@
 import android.util.ArrayMap;
 import android.util.Log;
 import android.util.Slog;
+import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.CaptioningManager;
 
@@ -114,6 +115,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
                     .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
                     .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
                     .build();
+    private static final Object ADAPTIVE_PLAYBACK_TOKEN = new Object();
 
     static final ArrayMap<Integer, Integer> STREAMS = new ArrayMap<>();
     static {
@@ -162,6 +164,10 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
     private boolean mDeviceInteractive = true;
     boolean mInAudioSharing = false;
 
+    private boolean mAdaptivePlaybackEnabled;
+    private int mAdaptivePlaybackTimeout;
+    private boolean mAdaptivePlaybackResumable;
+
     private VolumePolicy mVolumePolicy;
     private UserActivityListener mUserActivityListener;
 
@@ -239,6 +245,11 @@ public VolumeDialogControllerImpl(
 
         dumpManager.registerDumpable("VolumeDialogControllerImpl", this);
 
+        mAdaptivePlaybackEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.ADAPTIVE_PLAYBACK_ENABLED, 0, mUserTracker.getUserId()) == 1;
+        mAdaptivePlaybackTimeout = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.ADAPTIVE_PLAYBACK_TIMEOUT, 30000, mUserTracker.getUserId());
+
         boolean accessibilityVolumeStreamActive = accessibilityManager
                 .isAccessibilityVolumeStreamActive();
         mVolumeController.setA11yMode(accessibilityVolumeStreamActive ?
@@ -657,6 +668,25 @@ private boolean updateStreamLevelW(int stream, int level) {
         final StreamState ss = streamStateW(stream);
         if (ss.level == level) return false;
         ss.level = level;
+        if (mAdaptivePlaybackEnabled && stream == AudioSystem.STREAM_MUSIC && level == 0
+                && mAudio.isMusicActive()) {
+            mAudio.dispatchMediaKeyEvent(
+                    new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PAUSE));
+            mAudio.dispatchMediaKeyEvent(
+                    new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PAUSE));
+            mAdaptivePlaybackResumable = true;
+            mWorker.removeCallbacksAndMessages(ADAPTIVE_PLAYBACK_TOKEN);
+            mWorker.postDelayed(() -> mAdaptivePlaybackResumable = false, ADAPTIVE_PLAYBACK_TOKEN,
+                    mAdaptivePlaybackTimeout);
+        }
+        if (stream == AudioSystem.STREAM_MUSIC && level > 0 && mAdaptivePlaybackResumable) {
+            mWorker.removeCallbacksAndMessages(ADAPTIVE_PLAYBACK_TOKEN);
+            mAudio.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_MEDIA_PLAY));
+            mAudio.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_UP,
+                    KeyEvent.KEYCODE_MEDIA_PLAY));
+            mAdaptivePlaybackResumable = false;
+        }
         if (isLogWorthy(stream)) {
             Events.writeEvent(Events.EVENT_LEVEL_CHANGED, stream, level);
         }
@@ -1271,6 +1301,10 @@ private final class SettingObserver extends ContentObserver {
                 Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
         private final Uri ZEN_MODE_CONFIG_URI =
                 Settings.Global.getUriFor(Settings.Global.ZEN_MODE_CONFIG_ETAG);
+        private final Uri ADAPTIVE_PLAYBACK_ENABLED_URI =
+                Settings.System.getUriFor(Settings.System.ADAPTIVE_PLAYBACK_ENABLED);
+        private final Uri ADAPTIVE_PLAYBACK_TIMEOUT_URI =
+                Settings.System.getUriFor(Settings.System.ADAPTIVE_PLAYBACK_TIMEOUT);
 
         public SettingObserver(Handler handler) {
             super(handler);
@@ -1279,6 +1313,10 @@ public SettingObserver(Handler handler) {
         public void init() {
             mContext.getContentResolver().registerContentObserver(ZEN_MODE_URI, false, this);
             mContext.getContentResolver().registerContentObserver(ZEN_MODE_CONFIG_URI, false, this);
+            mContext.getContentResolver().registerContentObserver(ADAPTIVE_PLAYBACK_ENABLED_URI,
+                    false, this);
+            mContext.getContentResolver().registerContentObserver(ADAPTIVE_PLAYBACK_TIMEOUT_URI,
+                    false, this);
         }
 
         public void destroy() {
@@ -1294,6 +1332,16 @@ public void onChange(boolean selfChange, Uri uri) {
             if (ZEN_MODE_CONFIG_URI.equals(uri)) {
                 changed |= updateZenConfig();
             }
+            if (ADAPTIVE_PLAYBACK_ENABLED_URI.equals(uri)) {
+                mAdaptivePlaybackEnabled = Settings.System.getIntForUser(
+                        mContext.getContentResolver(), Settings.System.ADAPTIVE_PLAYBACK_ENABLED, 0,
+                        mUserTracker.getUserId()) == 1;
+            }
+            if (ADAPTIVE_PLAYBACK_TIMEOUT_URI.equals(uri)) {
+                mAdaptivePlaybackTimeout = Settings.System.getIntForUser(
+                        mContext.getContentResolver(), Settings.System.ADAPTIVE_PLAYBACK_TIMEOUT,
+                        30000, mUserTracker.getUserId());
+            }
 
             if (changed) {
                 mCallbacks.onStateChanged(mState);
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index a61b56a8a63d2..57be757363b67 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -2693,8 +2693,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,
@@ -2703,7 +2703,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/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt
index 82fabca7a848a..bb6b59c08e970 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
@@ -32,6 +34,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 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
@@ -81,6 +84,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 +116,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 {
@@ -128,7 +145,7 @@ private fun VolumeDialogSlider(
         isVertical = isVolumeDialogVertical,
         colors = colors,
         interactionSource = interactionSource,
-        haptics =
+        haptics = if (isHapticsEnabled) {
             Haptics.Enabled(
                 hapticsViewModelFactory = hapticsViewModelFactory,
                 hapticConfigs =
@@ -139,7 +156,10 @@ private fun VolumeDialogSlider(
                     } else {
                         Orientation.Horizontal
                     },
-            ),
+            )
+        } else {
+            Haptics.Disabled
+        },
         stepDistance = 1f,
         track = { sliderState ->
             SliderTrack(
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 b934459096ad4..d9d31aaaa8a1f 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.05f,
                     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/wallpapers/data/repository/WallpaperRepository.kt b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt
index 9d34002b8e347..a8f831c68584a 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
@@ -31,13 +31,13 @@ import android.provider.Settings
 import android.util.Log
 import android.view.View
 import com.android.internal.R
+import com.android.internal.util.crdroid.Utils.ambientAod
 import com.android.systemui.broadcast.BroadcastDispatcher
 import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.res.R as SysUIR
 import com.android.systemui.shade.ShadeDisplayAware
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.shared.Flags.extendedWallpaperEffects
 import com.android.systemui.user.data.model.SelectedUserModel
 import com.android.systemui.user.data.model.SelectionStatus
@@ -132,9 +132,7 @@ constructor(
                 ::Pair,
             )
             .map {
-                val userEnabled =
-                    secureSettings.getInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1) == 1
-                userEnabled && configEnabled() && ambientAod()
+                configEnabled()
             }
             .flowOn(bgDispatcher)
 
@@ -203,11 +201,11 @@ constructor(
                 context.resources.getInteger(SysUIR.integer.config_dozeSupportsAodWallpaperOverride)
             ) {
                 0 -> false
-                1 -> true
+                1 -> null /* follow user setting here */
                 else -> null
             }
         return if (sysuiOverride != null) sysuiOverride
-        else context.resources.getBoolean(R.bool.config_dozeSupportsAodWallpaper)
+        else ambientAod()
     }
 
     private suspend fun getWallpaper(
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/WeatherViewController.kt b/packages/SystemUI/src/com/android/systemui/weather/WeatherViewController.kt
new file mode 100644
index 0000000000000..c19eb8c16f64a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/weather/WeatherViewController.kt
@@ -0,0 +1,218 @@
+/*
+ * 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.os.UserHandle
+import android.provider.Settings
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+
+import com.android.internal.util.crdroid.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,
+) : 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) {
+            if (mDozing == dozing) return
+            mDozing = dozing
+
+            val weatherEnabled = weatherSettingsFlow.value.weatherEnabled
+
+            if (mDozing || !weatherEnabled) {
+                hideAllViews()
+                OmniJawsClient.get().removeObserver(context, this@WeatherViewController)
+            } else {
+                OmniJawsClient.get().addObserver(context, this@WeatherViewController)
+                updateWeather()
+                showAllViews()
+            }
+        }
+    }
+
+    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)
+    )
+
+    private fun getSystemSetting(setting: String, defaultValue: Int = 0) =
+        Settings.System.getIntForUser(context.contentResolver, setting, defaultValue, UserHandle.USER_CURRENT) != 0
+
+    private fun applyWeatherSettings(settings: WeatherSettings) {
+        if (mDozing || !settings.weatherEnabled) {
+            hideAllViews()
+            OmniJawsClient.get().removeObserver(context, this@WeatherViewController)
+        } else {
+            OmniJawsClient.get().addObserver(context, this@WeatherViewController)
+            updateWeather()
+            showAllViews()
+        }
+    }
+
+    override fun weatherUpdated() = updateWeather()
+
+    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))
+                weatherTemp.text = buildWeatherText(info)
+                weatherTemp.isSelected = true
+            }
+        } catch (e: Exception) {}
+    }
+
+    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)
+            }
+        }
+    }
+
+    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
+    )
+
+    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"
+
+        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/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..948f224810f8e 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
+
+    // crDroid Settings
+    CRDROID_SETTINGS = 4000;
   }
 }
diff --git a/services/Android.bp b/services/Android.bp
index 2f6f9dc9d0a39..0e8278db0d75a 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -116,6 +116,7 @@ filegroup {
     name: "services-non-updatable-sources",
     srcs: [
         ":incremental_aidl",
+        ":services.applock-sources",
         ":services.core-aidl-sources",
         ":services.core-sources",
         ":services.core-sources-am-wm",
@@ -133,6 +134,7 @@ filegroup {
         ":services.coverage-sources",
         ":services.credentials-sources",
         ":services.devicepolicy-sources",
+        ":services.freeform-sources",
         ":services.midi-sources",
         ":services.musicsearch-sources",
         ":services.net-sources",
@@ -299,6 +301,7 @@ java_library {
 
     // The convention is to name each service module 'services.$(module_name)'
     static_libs: [
+        "services.applock",
         "services.core",
         "services.accessibility",
         "services.appprediction",
@@ -314,6 +317,7 @@ java_library {
         "services.credentials",
         "services.devicepolicy",
         "services.flags",
+        "services.freeform",
         "services.midi",
         "services.musicsearch",
         "services.net",
diff --git a/services/applock/Android.bp b/services/applock/Android.bp
new file mode 100644
index 0000000000000..a935f28a7b7ac
--- /dev/null
+++ b/services/applock/Android.bp
@@ -0,0 +1,29 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
+filegroup {
+    name: "services.applock-sources",
+    srcs: [
+        "java/**/*.java",
+        "java/**/*.kt"
+    ],
+    path: "java",
+    visibility: ["//frameworks/base/services"],
+}
+
+java_library_static {
+    name: "services.applock",
+    defaults: ["platform_service_defaults"],
+    srcs: [":services.applock-sources"],
+    libs: ["services.core"],
+    static_libs: [
+        "kotlinx_coroutines"
+    ],
+    jarjar_rules: "jarjar-rules.txt",
+}
diff --git a/services/applock/jarjar-rules.txt b/services/applock/jarjar-rules.txt
new file mode 100644
index 0000000000000..d63a31e8befd1
--- /dev/null
+++ b/services/applock/jarjar-rules.txt
@@ -0,0 +1,3 @@
+rule kotlin.** com.android.server.jarjar.@0
+rule kotlinx.** com.android.server.jarjar.@0
+
diff --git a/services/applock/java/com/android/server/app/AppLockConfig.kt b/services/applock/java/com/android/server/app/AppLockConfig.kt
new file mode 100644
index 0000000000000..e32d0160464fc
--- /dev/null
+++ b/services/applock/java/com/android/server/app/AppLockConfig.kt
@@ -0,0 +1,426 @@
+/*
+ * 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.server.app
+
+import android.app.AppLockData
+import android.app.AppLockManager.DEFAULT_BIOMETRICS_ALLOWED
+import android.app.AppLockManager.DEFAULT_HIDE_IN_LAUNCHER
+import android.app.AppLockManager.DEFAULT_PROTECT_APP
+import android.app.AppLockManager.DEFAULT_REDACT_NOTIFICATION
+import android.app.AppLockManager.DEFAULT_TIMEOUT
+import android.os.FileUtils
+import android.os.FileUtils.S_IRWXU
+import android.os.FileUtils.S_IRWXG
+import android.util.ArrayMap
+import android.util.Slog
+
+import java.io.File
+import java.io.IOException
+
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+private const val APP_LOCK_DIR_NAME = "app_lock"
+private const val APP_LOCK_CONFIG_FILE = "app_lock_config.json"
+
+private const val CURRENT_VERSION = 3
+
+// Only in version 0
+private const val KEY_PACKAGES = "packages"
+private const val KEY_SECURE_NOTIFICATION = "secure_notification"
+
+// From version 1 and up. Non existent version key
+// is considered as version 0
+private const val KEY_VERSION = "version"
+private const val KEY_TIMEOUT = "timeout"
+private const val KEY_APP_LOCK_DATA_LIST = "app_lock_data_list"
+private const val KEY_PACKAGE_NAME = "package_name"
+private const val KEY_PROTECT_APP = "protect_app"
+private const val KEY_REDACT_NOTIFICATION = "redact_notification"
+private const val KEY_BIOMETRICS_ALLOWED = "biometrics_allowed"
+
+// From version 2 and up.
+private const val KEY_HIDE_FROM_LAUNCHER = "hide_from_launcher"
+
+/**
+ * Container for app lock configuration. Also handles logic of reading
+ * and writing configuration to disk, serialized as a JSON file.
+ * All operations must be synchronized with an external lock.
+ *
+ * @hide
+ */
+internal class AppLockConfig(dataDir: File) {
+
+    private val appLockDir = File(dataDir, APP_LOCK_DIR_NAME)
+    private val appLockConfigFile = File(appLockDir, APP_LOCK_CONFIG_FILE)
+
+    private val appLockDataMap = ArrayMap<String, AppLockData>()
+
+    var appLockTimeout: Long = DEFAULT_TIMEOUT
+    var biometricsAllowed = DEFAULT_BIOMETRICS_ALLOWED
+
+    init {
+        appLockDir.mkdirs()
+        FileUtils.setPermissions(appLockDir, S_IRWXU or S_IRWXG, -1, -1)
+    }
+
+    /**
+     * Add an application to [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @return true if package was added, false if already exists.
+     */
+    fun addPackageToMap(packageName: String): Boolean {
+        return if (!appLockDataMap.containsKey(packageName)) {
+            appLockDataMap[packageName] =
+                AppLockData(
+                    packageName,
+                    DEFAULT_PROTECT_APP,
+                    DEFAULT_REDACT_NOTIFICATION,
+                    DEFAULT_HIDE_IN_LAUNCHER
+                )
+            true
+        } else {
+            false
+        }
+    }
+
+    /**
+     * Remove an application from [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @return true if package was removed, false otherwise.
+     */
+    fun removePackageFromMap(packageName: String): Boolean {
+        return if (appLockDataMap.containsKey(packageName)) {
+            appLockDataMap.remove(packageName) != null
+            true
+        } else {
+            false
+        }
+    }
+
+    /**
+     * Set notifications as protected or not for an application
+     * in [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @param shouldProtectApp whether to protect app or not.
+     * @return true if config was changed, false otherwise.
+     */
+    fun setShouldProtectApp(packageName: String, shouldProtectApp: Boolean): Boolean {
+        addPackageToMap(packageName)
+        return appLockDataMap[packageName]?.let {
+            if (it.shouldProtectApp != shouldProtectApp) {
+                appLockDataMap[packageName] = AppLockData(
+                    it.packageName,
+                    shouldProtectApp,
+                    it.shouldRedactNotification,
+                    it.hideFromLauncher
+                )
+                true
+            } else {
+                false
+            }
+        } ?: run {
+            Slog.e(TAG, "Attempt to protect app for package $packageName that is not in list")
+            false
+        }
+    }
+
+    /**
+     * Check whether app is protected or not for an application
+     * in [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @return true if app is protected by app lock,
+     *     false otherwise.
+     */
+    fun shouldProtectApp(packageName: String): Boolean {
+        return appLockDataMap[packageName]?.shouldProtectApp == true
+    }
+
+    /**
+     * Get all the packages protected with app lock.
+     *
+     * @return a unique list of package names.
+     */
+    fun getAppLockDataList(): List<AppLockData> {
+        return appLockDataMap.values.toList()
+    }
+
+    /**
+     * Get all the packages protected with app lock.
+     *
+     * @return a unique list of package names.
+     */
+    fun getAppLockAppList(): List<String> {
+        return appLockDataMap.keys.toList()
+    }
+
+    /**
+     * Get all the packages protected with app lock.
+     *
+     * @return a unique list of package names.
+     */
+    fun getAppLockHiddenAppList(): List<String> {
+        return appLockDataMap.filterValues { it.hideFromLauncher }.keys.toList()
+    }
+
+    /**
+     * Set notifications as protected or not for an application
+     * in [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @param shouldRedactNotification whether to redact notification or not.
+     * @return true if config was changed, false otherwise.
+     */
+    fun setShouldRedactNotification(packageName: String, shouldRedactNotification: Boolean): Boolean {
+        addPackageToMap(packageName)
+        return appLockDataMap[packageName]?.let {
+            if (it.shouldRedactNotification != shouldRedactNotification) {
+                appLockDataMap[packageName] = AppLockData(
+                    it.packageName,
+                    it.shouldProtectApp,
+                    shouldRedactNotification,
+                    it.hideFromLauncher
+                )
+                true
+            } else {
+                false
+            }
+        } ?: run {
+            Slog.e(TAG, "Attempt to redact notifications for package $packageName that is not in list")
+            false
+        }
+    }
+
+    /**
+     * Check whether notifications are protected or not for an application
+     * in [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @return true if notification contents are redacted in app locked state,
+     *     false otherwise.
+     */
+    fun shouldRedactNotification(packageName: String): Boolean {
+        return appLockDataMap[packageName]?.shouldRedactNotification == true
+    }
+
+    /**
+     * Mark an application as hidden from launcher in [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @param hide the parameter value in [AppLockData].
+     * @return true if hidden state was changed, false otherwise.
+     */
+    fun hidePackage(packageName: String, hide: Boolean): Boolean {
+        addPackageToMap(packageName)
+        return appLockDataMap[packageName]?.let {
+            if (it.hideFromLauncher != hide) {
+                appLockDataMap[packageName] = AppLockData(
+                    it.packageName,
+                    it.shouldProtectApp,
+                    it.shouldRedactNotification,
+                    hide
+                )
+                true
+            } else {
+                false
+            }
+        } ?: run {
+            Slog.e(TAG, "Attempt to hide app for package $packageName that is not in list")
+            false
+        }
+    }
+
+    /**
+     * Check whether app is hidden in launcher or not for an application
+     * in [appLockDataMap].
+     *
+     * @param packageName the package name of the application.
+     * @return true if app is hidden in launcher by app lock,
+     *     false otherwise.
+     */
+    fun shouldHideApp(packageName: String): Boolean {
+        return appLockDataMap[packageName]?.hideFromLauncher == true
+    }
+
+    /**
+     * Parse contents from [appLockConfigFile].
+     */
+    fun read() {
+        reset()
+        if (!appLockConfigFile.isFile) {
+            Slog.i(TAG, "No configuration saved")
+            return
+        }
+        try {
+            appLockConfigFile.inputStream().bufferedReader().use {
+                val rootObject = JSONObject(it.readText())
+
+                val version = rootObject.optInt(KEY_VERSION, 0)
+                if (version != CURRENT_VERSION) {
+                    migrateData(rootObject, version)
+                }
+
+                appLockTimeout = rootObject.optLong(KEY_TIMEOUT, DEFAULT_TIMEOUT)
+                biometricsAllowed = rootObject.optBoolean(KEY_BIOMETRICS_ALLOWED, DEFAULT_BIOMETRICS_ALLOWED)
+                val appLockDataList = rootObject.optJSONArray(KEY_APP_LOCK_DATA_LIST) ?: return@use
+                for (i in 0 until appLockDataList.length()) {
+                    val appLockData = appLockDataList.getJSONObject(i)
+                    val packageName = appLockData.getString(KEY_PACKAGE_NAME)
+                    appLockDataMap[packageName] = AppLockData(
+                        packageName,
+                        appLockData.getBoolean(KEY_PROTECT_APP),
+                        appLockData.getBoolean(KEY_REDACT_NOTIFICATION),
+                        appLockData.getBoolean(KEY_HIDE_FROM_LAUNCHER)
+                    )
+                }
+            }
+        } catch(e: IOException) {
+            Slog.wtf(TAG, "Failed to read config file", e)
+        } catch(e: JSONException) {
+            Slog.wtf(TAG, "Failed to parse config file", e)
+        }
+        logD {
+            "readConfig: data = $appLockDataMap, " +
+            "timeout = $appLockTimeout, " +
+            "biometricsAllowed = $biometricsAllowed"
+        }
+    }
+
+    private fun reset() {
+        appLockDataMap.clear()
+        appLockTimeout = DEFAULT_TIMEOUT
+        biometricsAllowed = DEFAULT_BIOMETRICS_ALLOWED
+    }
+
+    private fun migrateData(jsonData: JSONObject, dataVersion: Int) {
+        Slog.i(TAG, "Migrating data from version $dataVersion")
+        when (dataVersion) {
+            0 -> {
+                val packageObject = jsonData.remove(KEY_PACKAGES) as? JSONObject
+                if (packageObject != null) {
+                    val appLockDataList = JSONArray()
+                    packageObject.keys().forEach { pkg ->
+                        val isSecure = packageObject.getJSONObject(pkg)
+                            .optBoolean(KEY_SECURE_NOTIFICATION, DEFAULT_REDACT_NOTIFICATION)
+                        appLockDataList.put(
+                            JSONObject()
+                                .put(KEY_PACKAGE_NAME, pkg)
+                                .put(KEY_REDACT_NOTIFICATION, isSecure)
+                        )
+                    }
+                    jsonData.put(KEY_APP_LOCK_DATA_LIST, appLockDataList)
+                }
+            }
+            1 -> {
+                val appLockDataList = jsonData.optJSONArray(KEY_APP_LOCK_DATA_LIST)
+                if (appLockDataList != null) {
+                    val size = appLockDataList.length()
+                    if (size > 0) {
+                        val backupList = mutableListOf<JSONObject>()
+                        for (i in (size - 1)..0) {
+                            val appData = appLockDataList.getJSONObject(i)
+                                .put(KEY_HIDE_FROM_LAUNCHER, DEFAULT_HIDE_IN_LAUNCHER)
+                            backupList.add(appData)
+                            appLockDataList.remove(i)
+                        }
+                        backupList.forEach {
+                            appLockDataList.put(it)
+                        }
+                        jsonData.put(KEY_APP_LOCK_DATA_LIST, appLockDataList)
+                    }
+                }
+            }
+            2 -> {
+                val appLockDataList = jsonData.optJSONArray(KEY_APP_LOCK_DATA_LIST)
+                if (appLockDataList != null) {
+                    val size = appLockDataList.length()
+                    if (size > 0) {
+                        val backupList = mutableListOf<JSONObject>()
+                        for (i in (size - 1)..0) {
+                            var isProtect = DEFAULT_PROTECT_APP
+                            if (appLockDataList.getJSONObject(i).has(KEY_PROTECT_APP)) {
+                                isProtect = appLockDataList.getJSONObject(i)
+                                    .getBoolean(KEY_PROTECT_APP)
+                            }
+                            val appData = appLockDataList.getJSONObject(i)
+                                .put(KEY_PROTECT_APP, isProtect)
+                            backupList.add(appData)
+                            appLockDataList.remove(i)
+                        }
+                        backupList.forEach {
+                            appLockDataList.put(it)
+                        }
+                        jsonData.put(KEY_APP_LOCK_DATA_LIST, appLockDataList)
+                    }
+                }
+            }
+            else -> throw IllegalArgumentException("Unknown data version $dataVersion")
+        }
+        val nextVersion = dataVersion + 1
+        if (nextVersion != CURRENT_VERSION) {
+            migrateData(jsonData, nextVersion)
+        }
+    }
+
+    /**
+     * Write contents to [appLockConfigFile].
+     */
+    fun write() {
+        logD {
+            "Writing data to file"
+        }
+        val rootObject = JSONObject()
+        try {
+            rootObject.put(KEY_VERSION, CURRENT_VERSION)
+            rootObject.put(KEY_TIMEOUT, appLockTimeout)
+            rootObject.put(KEY_BIOMETRICS_ALLOWED, biometricsAllowed)
+            rootObject.put(
+                KEY_APP_LOCK_DATA_LIST,
+                JSONArray(
+                    appLockDataMap.values.map {
+                        JSONObject().apply {
+                            put(KEY_PACKAGE_NAME, it.packageName)
+                            put(KEY_PROTECT_APP, it.shouldProtectApp)
+                            put(KEY_REDACT_NOTIFICATION, it.shouldRedactNotification)
+                            put(KEY_HIDE_FROM_LAUNCHER, it.hideFromLauncher)
+                        }
+                    }
+                )
+            )
+        } catch(e: JSONException) {
+            Slog.wtf(TAG, "Failed to create json configuration", e)
+            return
+        }
+        try {
+            appLockConfigFile.outputStream().bufferedWriter().use {
+                val flattenedString = rootObject.toString(4)
+                logD {
+                    "flattenedString = $flattenedString"
+                }
+                it.write(flattenedString, 0, flattenedString.length)
+                it.flush()
+            }
+        } catch(e: IOException) {
+            Slog.wtf(TAG, "Failed to write config to file", e)
+        }
+    }
+}
diff --git a/services/applock/java/com/android/server/app/AppLockManagerService.kt b/services/applock/java/com/android/server/app/AppLockManagerService.kt
new file mode 100644
index 0000000000000..3a269ba2365cb
--- /dev/null
+++ b/services/applock/java/com/android/server/app/AppLockManagerService.kt
@@ -0,0 +1,1168 @@
+/*
+ * 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.server.app
+
+import android.Manifest
+import android.annotation.RequiresPermission
+import android.app.Activity
+import android.app.ActivityManager
+import android.app.ActivityManagerInternal
+import android.app.ActivityOptions
+import android.app.ActivityTaskManager
+import android.app.AlarmManager
+import android.app.AppLockData
+import android.app.AppLockManager
+import android.app.IAppLockManagerService
+import android.app.KeyguardManager
+import android.app.PendingIntent
+import android.app.TaskStackListener
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.IntentSender
+import android.content.pm.PackageManager
+import android.content.pm.PackageManagerInternal
+import android.os.Binder
+import android.os.Environment
+import android.os.Process
+import android.os.RemoteException
+import android.os.SystemClock
+import android.os.UserHandle
+import android.util.ArrayMap
+import android.util.ArraySet
+import android.util.Log
+import android.util.Slog
+
+import com.android.internal.R
+import com.android.internal.annotations.GuardedBy
+import com.android.internal.util.crdroid.Utils
+import com.android.server.LocalServices
+import com.android.server.SystemService
+import com.android.server.app.AppLockManagerServiceInternal
+import com.android.server.notification.NotificationManagerInternal
+import com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo
+import com.android.server.wm.ActivityTaskManagerInternal
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+
+internal val TAG = AppLockManagerService::class.simpleName
+
+private const val ACTION_APP_LOCK_TIMEOUT = "com.android.server.app.AppLockManagerService.APP_LOCK_TIMEOUT"
+private const val SETTINGS_PACKAGE = "com.android.settings"
+
+internal inline fun logD(crossinline msg: () -> String) {
+    if (Log.isLoggable(TAG, Log.DEBUG)) {
+        Slog.d(TAG, msg())
+    }
+}
+
+/**
+ * Service to manage per app lock.
+ *
+ * @hide
+ */
+class AppLockManagerService(
+    private val context: Context
+) : IAppLockManagerService.Stub() {
+
+    private val localService = LocalService()
+    private val serviceScope = CoroutineScope(Dispatchers.Default)
+
+    private val currentUserId: Int
+        get() = activityManagerInternal.currentUserId
+
+    private var isDeviceSecure = false
+
+    private val mutex = Mutex()
+
+    @GuardedBy("mutex")
+    private val userConfigMap = ArrayMap<Int, AppLockConfig>()
+
+    @GuardedBy("mutex")
+    private val topPackages = ArraySet<String>()
+
+    @GuardedBy("mutex")
+    private val unlockedPackages = ArraySet<String>()
+
+    private val biometricUnlocker: BiometricUnlocker by lazy {
+        BiometricUnlocker(context)
+    }
+
+    private val atmInternal: ActivityTaskManagerInternal by lazy {
+        LocalServices.getService(ActivityTaskManagerInternal::class.java)
+    }
+
+    private val notificationManagerInternal: NotificationManagerInternal by lazy {
+        LocalServices.getService(NotificationManagerInternal::class.java)
+    }
+
+    private val keyguardManager: KeyguardManager by lazy {
+        context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+    }
+
+    private val alarmManager: AlarmManager by lazy {
+        context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+    }
+
+    private val activityManagerInternal: ActivityManagerInternal by lazy {
+        LocalServices.getService(ActivityManagerInternal::class.java)
+    }
+
+    private val packageManager: PackageManager by lazy {
+        context.packageManager
+    }
+
+    private val pmInternal: PackageManagerInternal by lazy {
+        LocalServices.getService(PackageManagerInternal::class.java)
+    }
+
+    private var deviceLocked = false
+
+    private val alarmsMutex = Mutex()
+
+    @GuardedBy("alarmsMutex")
+    private val scheduledAlarms = ArrayMap<String, PendingIntent>()
+
+    private val whiteListedSystemApps: List<String> by lazy {
+        val systemPackages = pmInternal.getInstalledApplications(
+            PackageManager.MATCH_SYSTEM_ONLY.toLong(),
+            currentUserId,
+            Process.myUid()
+        ).map { it.packageName }
+        context.resources.getStringArray(R.array.config_appLockAllowedSystemApps).filter {
+            systemPackages.contains(it)
+        }
+    }
+
+    private val packageChangeReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action != Intent.ACTION_PACKAGE_REMOVED
+                    && intent?.action != Intent.ACTION_PACKAGE_ADDED) return
+            val userId = getSendingUserId()
+            if (userId != currentUserId) {
+                logD {
+                    "Ignoring package removal broadcast from user $userId"
+                }
+                return
+            }
+            val isReplacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false /* defaultValue */)
+            if (isReplacing) {
+                logD {
+                    "Ignoring package update broadcast"
+                }
+                return
+            }
+            val packageName = intent.data?.schemeSpecificPart ?: run {
+                Slog.e(TAG, "Failed to get package name")
+                return
+            }
+            serviceScope.launch {
+                val config = mutex.withLock {
+                    userConfigMap[userId] ?: run {
+                        Slog.e(TAG, "Config unavailable for user $userId")
+                        return@launch
+                    }
+                }
+                if (intent?.action == Intent.ACTION_PACKAGE_REMOVED) {
+                    mutex.withLock {
+                        if (config.shouldProtectApp(packageName)) {
+                            logD {
+                                "Package $packageName in the protected list, cleaning up"
+                            }
+                            alarmsMutex.withLock {
+                                scheduledAlarms.remove(packageName)?.let {
+                                    alarmManager.cancel(it)
+                                }
+                            }
+                            unlockedPackages.remove(packageName)
+                        }
+                    }
+                    logD {
+                        "Package $packageName uninstalled, cleaning up"
+                    }
+                    mutex.withLock {
+                        if (config.removePackageFromMap(packageName)) {
+                            withContext(Dispatchers.IO) {
+                                config.write()
+                            }
+                        }
+                    }
+                } else if (intent?.action == Intent.ACTION_PACKAGE_ADDED) {
+                    logD {
+                        "Package $packageName installed, configuring app lock"
+                    }
+                    mutex.withLock {
+                        if (config.addPackageToMap(packageName)) {
+                            withContext(Dispatchers.IO) {
+                                config.write()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private val taskStackListener = object : TaskStackListener() {
+        override fun onTaskStackChanged() {
+            logD {
+                "onTaskStackChanged"
+            }
+            serviceScope.launch {
+                val currentTopPackages = atmInternal.topVisibleActivities.map {
+                    it.activityToken
+                }.filter {
+                    atmInternal.isVisibleActivity(it)
+                }.map {
+                    atmInternal.getActivityName(it)?.packageName
+                }.filterNotNull().toSet()
+                logD {
+                    "currentTopPackages = $currentTopPackages"
+                }
+                // We should return early if current top packages
+                // are empty to avoid doing anything absurd.
+                if (currentTopPackages.isEmpty()) return@launch
+                val packagesToLock = mutex.withLock {
+                    logD {
+                        "topPackages = $topPackages"
+                    }
+                    val packages = topPackages.filter {
+                        !currentTopPackages.contains(it) && unlockedPackages.contains(it)
+                    }.toSet()
+                    topPackages.clear()
+                    topPackages.addAll(currentTopPackages)
+                    return@withLock packages
+                }
+                packagesToLock.forEach {
+                    scheduleLockAlarm(it)
+                }
+                alarmsMutex.withLock {
+                    currentTopPackages.forEach { pkg ->
+                        scheduledAlarms.remove(pkg)?.let {
+                            logD {
+                                "Cancelling timeout alarm for $pkg"
+                            }
+                            alarmManager.cancel(it)
+                        }
+                    }
+                }
+                currentTopPackages.forEach {
+                    checkAndUnlockPackage(it)
+                }
+            }
+        }
+
+        override fun onActivityUnpinned() {
+            logD {
+                "onActivityUnpinned"
+            }
+            onTaskStackChanged()
+        }
+    }
+
+    private fun scheduleLockAlarm(pkg: String) {
+        logD {
+            "scheduleLockAlarm, package = $pkg"
+        }
+        serviceScope.launch {
+            alarmsMutex.withLock {
+                if (scheduledAlarms.containsKey(pkg)) {
+                    logD {
+                        "Alarm already scheduled for package $pkg"
+                    }
+                    return@launch
+                }
+            }
+            val timeout = mutex.withLock {
+                userConfigMap[currentUserId]?.appLockTimeout
+            } ?: run {
+                Slog.e(TAG, "Failed to retrieve user config for $currentUserId")
+                return@launch
+            }
+            val pendingIntent = PendingIntent.getBroadcast(
+                context,
+                pkg.hashCode(),
+                Intent(ACTION_APP_LOCK_TIMEOUT).apply {
+                    putExtra(Intent.EXTRA_PACKAGE_NAME, pkg)
+                },
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            alarmManager.setExactAndAllowWhileIdle(
+                AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                SystemClock.elapsedRealtime() + timeout,
+                pendingIntent
+            )
+            alarmsMutex.withLock {
+                scheduledAlarms[pkg] = pendingIntent
+            }
+        }
+    }
+
+    private fun checkAndUnlockPackage(pkg: String) {
+        if (!isDeviceSecure) return
+        serviceScope.launch {
+            mutex.withLock {
+                if (unlockedPackages.contains(pkg)) return@launch
+                val config = userConfigMap[currentUserId] ?: run {
+                    Slog.e(TAG, "Config unavailable for user $currentUserId")
+                    return@launch
+                }
+                if (!config.shouldProtectApp(pkg)) return@launch
+            }
+            logD {
+                "$pkg is locked out, asking user to unlock"
+            }
+            unlockInternal(pkg, currentUserId,
+                onSuccess = {
+                    serviceScope.launch {
+                        mutex.withLock {
+                            unlockedPackages.add(pkg)
+                        }
+                    }
+                },
+                onCancel = {
+                    // Send user to home on cancel
+                    context.mainExecutor.execute {
+                        atmInternal.startHomeActivity(currentUserId,
+                            "unlockInternal#onCancel")
+                    }
+                }
+            )
+        }
+    }
+
+    private val lockAlarmReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action != ACTION_APP_LOCK_TIMEOUT) return
+            logD {
+                "Lock alarm received"
+            }
+            val packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME) ?: return
+            logD {
+                "$packageName timed out"
+            }
+            serviceScope.launch {
+                mutex.withLock {
+                    if (topPackages.contains(packageName)) {
+                        logD {
+                            "$packageName is currently in foreground, skipping lock"
+                        }
+                        // Mark it as unlocked, since it actually is
+                        unlockedPackages.add(packageName)
+                        return@withLock
+                    }
+                    unlockedPackages.remove(packageName)
+                }
+                alarmsMutex.withLock {
+                    scheduledAlarms.remove(packageName)
+                }
+                val isContentSecure = mutex.withLock {
+                    userConfigMap[currentUserId]?.shouldRedactNotification(packageName) ?: run {
+                        Slog.e(TAG, "Config unavailable for user $currentUserId")
+                        return@launch
+                    }
+                }
+                notificationManagerInternal.updateSecureNotifications(
+                    packageName,
+                    isContentSecure,
+                    true /* isBubbleUpSuppressed */,
+                    currentUserId
+                )
+            }
+        }
+    }
+
+    private fun getActualUserId(userId: Int, tag: String): Int {
+        return ActivityManager.handleIncomingUser(Binder.getCallingPid(),
+            Binder.getCallingUid(), userId, false /* allowAll */,
+            true /* requireFull */, tag, AppLockManagerService::class.qualifiedName)
+    }
+
+    private inline fun <R> clearAndExecute(crossinline block: () -> R): R {
+        val ident = Binder.clearCallingIdentity()
+        try {
+            return block()
+        } finally {
+            Binder.restoreCallingIdentity(ident)
+        }
+    }
+
+    private fun unlockInternal(
+        pkg: String,
+        userId: Int,
+        onSuccess: () -> Unit,
+        onCancel: () -> Unit,
+    ) {
+        clearAndExecute {
+            if (!biometricUnlocker.canUnlock()) {
+                Slog.e(TAG, "Application cannot be unlocked with biometrics or device credentials")
+                return@clearAndExecute
+            }
+            biometricUnlocker.unlock(getLabelForPackage(pkg, userId), onSuccess, onCancel)
+        }
+    }
+
+    private fun getLabelForPackage(pkg: String, userId: Int): String? =
+        try {
+            pmInternal.getApplicationInfo(
+                pkg,
+                PackageManager.MATCH_ALL.toLong(),
+                Process.myUid(),
+                userId,
+            ).loadLabel(packageManager).toString()
+        } catch(e: PackageManager.NameNotFoundException) {
+            Slog.e(TAG, "Package $pkg not found")
+            null
+        }
+
+    /**
+     * Set whether app should be protected by app lock.
+     *
+     * @param packageName the package name.
+     * @param shouldProtectApp true to hide notification content.
+     * @param userId the user id of the caller.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun setShouldProtectApp(
+        packageName: String,
+        shouldProtectApp: Boolean,
+        userId: Int,
+    ) {
+        logD {
+            "setShouldProtectApp: packageName = $packageName, userId = $userId"
+        }
+        enforceCallingPermission("setShouldProtectApp")
+        checkPackage(packageName, userId)
+        val actualUserId = getActualUserId(userId, "setShouldProtectApp")
+        serviceScope.launch {
+            mutex.withLock {
+                val config = userConfigMap[actualUserId] ?: run {
+                    Slog.e(TAG, "setShouldProtectApp requested by unknown " +
+                        "user id $actualUserId")
+                    return@withLock
+                }
+                if (!config.setShouldProtectApp(packageName, shouldProtectApp)) {
+                    return@withLock
+                }
+                notificationManagerInternal.updateSecureNotifications(
+                    packageName,
+                    shouldProtectApp /* isContentSecure */,
+                    shouldProtectApp /* isBubbleUpSuppressed */,
+                    actualUserId
+                )
+                withContext(Dispatchers.IO) {
+                    config.write()
+                }
+            }
+        }
+    }
+
+    private fun checkPackage(pkg: String, userId: Int) {
+        try {
+            val aInfo = pmInternal.getApplicationInfo(
+                pkg,
+                PackageManager.MATCH_ALL.toLong(),
+                Process.myUid(),
+                userId
+            )
+            if (!aInfo.isSystemApp()) return
+            if (Utils.launchablePackages(context).contains(pkg)) return
+            if (!whiteListedSystemApps.contains(pkg))
+                throw IllegalArgumentException("System package $pkg is not whitelisted")
+        } catch(e: PackageManager.NameNotFoundException) {
+            throw IllegalArgumentException("Package $pkg is not installed")
+        }
+    }
+
+    /**
+     * Get the current auto lock timeout.
+     *
+     * @param userId the user id of the caller.
+     * @return the timeout in milliseconds if configuration for
+     *     current user exists, -1 otherwise.
+     */
+    override fun getTimeout(userId: Int): Long {
+        logD {
+            "getTimeout: userId = $userId"
+        }
+        val actualUserId = getActualUserId(userId, "getTimeout")
+        return runBlocking {
+            mutex.withLock {
+                userConfigMap[actualUserId]?.let { it.appLockTimeout } ?: run {
+                    Slog.e(TAG, "getTimeout requested by unknown user id $actualUserId")
+                    -1L
+                }
+            }
+        }
+    }
+
+    /**
+     * Set auto lock timeout.
+     *
+     * @param timeout the timeout in milliseconds. Must be >= 5.
+     * @param userId the user id of the caller.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun setTimeout(timeout: Long, userId: Int) {
+        logD {
+            "setTimeout: timeout = $timeout, userId = $userId"
+        }
+        if (timeout < 5L) {
+            throw IllegalArgumentException("Timeout must be greater than or equal to 5")
+        }
+        enforceCallingPermission("setTimeout")
+        val actualUserId = getActualUserId(userId, "setTimeout")
+        serviceScope.launch {
+            mutex.withLock {
+                val config = userConfigMap[actualUserId] ?: run {
+                    Slog.e(TAG, "setTimeout requested by unknown user id $actualUserId")
+                    return@withLock
+                }
+                if (config.appLockTimeout == timeout) return@withLock
+                config.appLockTimeout = timeout
+                withContext(Dispatchers.IO) {
+                    config.write()
+                }
+            }
+        }
+    }
+
+    /**
+     * Get all the packages protected with app lock.
+     *
+     * @param userId the user id of the caller.
+     * @return list of [AppLockData] of the protected apps.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun getPackageData(userId: Int): List<AppLockData> {
+        logD {
+            "getPackages: userId = $userId"
+        }
+        enforceCallingPermission("getPackages")
+        val actualUserId = getActualUserId(userId, "getPackages")
+        return runBlocking {
+            mutex.withLock {
+                userConfigMap[actualUserId]?.getAppLockDataList() ?: run {
+                    Slog.e(TAG, "getPackages requested by unknown user id $actualUserId")
+                    emptyList()
+                }
+            }
+        }
+    }
+
+    /**
+     * Set whether notification content should be redacted for a package
+     * in locked state.
+     *
+     * @param packageName the package name.
+     * @param shouldRedactNotification true to hide notification content.
+     * @param userId the user id of the caller.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun setShouldRedactNotification(
+        packageName: String,
+        shouldRedactNotification: Boolean,
+        userId: Int,
+    ) {
+        logD {
+            "setShouldRedactNotification: packageName = $packageName, userId = $userId"
+        }
+        enforceCallingPermission("setShouldRedactNotification")
+        val actualUserId = getActualUserId(userId, "setShouldRedactNotification")
+        serviceScope.launch {
+            mutex.withLock {
+                val config = userConfigMap[actualUserId] ?: run {
+                    Slog.e(TAG, "setShouldRedactNotification requested by unknown " +
+                        "user id $actualUserId")
+                    return@withLock
+                }
+                if (!config.setShouldRedactNotification(packageName, shouldRedactNotification)) {
+                    return@withLock
+                }
+                val isLocked = !unlockedPackages.contains(packageName)
+                    && !topPackages.contains(packageName)
+                val shouldSecureContent = shouldRedactNotification && isLocked
+                notificationManagerInternal.updateSecureNotifications(
+                    packageName,
+                    shouldSecureContent,
+                    isLocked /* isBubbleUpSuppressed */,
+                    actualUserId
+                )
+                withContext(Dispatchers.IO) {
+                    config.write()
+                }
+            }
+        }
+    }
+
+    /**
+     * Set whether to allow unlocking with biometrics.
+     *
+     * @param biometricsAllowed whether to use biometrics.
+     * @param userId the user id of the caller.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun setBiometricsAllowed(biometricsAllowed: Boolean, userId: Int) {
+        logD {
+            "setBiometricsAllowed: biometricsAllowed = $biometricsAllowed, userId = $userId"
+        }
+        enforceCallingPermission("setBiometricsAllowed")
+        val actualUserId = getActualUserId(userId, "setBiometricsAllowed")
+        serviceScope.launch {
+            mutex.withLock {
+                val config = userConfigMap[actualUserId] ?: run {
+                    Slog.e(TAG, "setBiometricsAllowed requested by unknown user id $actualUserId")
+                    return@withLock
+                }
+                if (config.biometricsAllowed == biometricsAllowed) return@withLock
+                config.biometricsAllowed = biometricsAllowed
+                biometricUnlocker.biometricsAllowed = biometricsAllowed
+                withContext(Dispatchers.IO) {
+                    config.write()
+                }
+            }
+        }
+    }
+
+    /**
+     * Check whether biometrics is allowed for unlocking.
+     *
+     * @return true if biometrics will be used for unlocking, false otheriwse.
+     */
+    override fun isBiometricsAllowed(userId: Int): Boolean {
+        logD {
+            "isBiometricsAllowed: userId = $userId"
+        }
+        val actualUserId = getActualUserId(userId, "isBiometricsAllowed")
+        return runBlocking {
+            mutex.withLock {
+                userConfigMap[actualUserId]?.let { it.biometricsAllowed } ?: run {
+                    Slog.e(TAG, "isBiometricsAllowed requested by unknown user id $actualUserId")
+                    AppLockManager.DEFAULT_BIOMETRICS_ALLOWED
+                }
+            }
+        }
+    }
+
+    /**
+     * Unlock a package following authentication with credentials.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param packageName the name of the package to unlock.
+     * @param userId the user id of the caller.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun unlockPackage(packageName: String, userId: Int) {
+        logD {
+            "unlockPackage: packageName = $packageName, userId = $userId"
+        }
+        enforceCallingPermission("unlockPackage")
+        val actualUserId = getActualUserId(userId, "unlockPackage")
+        serviceScope.launch {
+            mutex.withLock {
+                val config = userConfigMap[actualUserId] ?: run {
+                    Slog.e(TAG, "unlockPackage requested by unknown user id $actualUserId")
+                    return@launch
+                }
+                if (!config.shouldProtectApp(packageName)) {
+                    Slog.w(TAG, "Unlock requested for package $packageName " +
+                        "that is not in list")
+                    return@launch
+                }
+                unlockedPackages.add(packageName)
+            }
+            notificationManagerInternal.updateSecureNotifications(
+                packageName,
+                false /* isContentSecure */,
+                false /* isBubbleUpSuppressed */,
+                actualUserId
+            )
+        }
+    }
+
+    /**
+     * Hide or unhide an application from launcher.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param packageName the name of the package to hide or unhide.
+     * @param hide whether to hide or not.
+     * @param userId the user id of the caller.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun setPackageHidden(
+        packageName: String,
+        hide: Boolean,
+        userId: Int,
+    ) {
+        logD {
+            "setPackageHidden: packageName = $packageName, hide = $hide, userId = $userId"
+        }
+        enforceCallingPermission("setPackageHidden")
+        val actualUserId = getActualUserId(userId, "setPackageHidden")
+        serviceScope.launch {
+            mutex.withLock {
+                val config = userConfigMap[actualUserId] ?: run {
+                    Slog.e(TAG, "setPackageHidden requested by unknown " +
+                        "user id $actualUserId")
+                    return@withLock
+                }
+                if (!config.hidePackage(packageName, hide)) {
+                    return@withLock
+                }
+                withContext(Dispatchers.IO) {
+                    config.write()
+                }
+            }
+        }
+    }
+
+    /**
+     * Check whether package is protected by app lock
+     *
+     * @param packageName the package name sent by caller.
+     * @param userId the user id of the caller.
+     * @return boolean whether app is protected or not.
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun isPackageProtected(packageName: String, userId: Int): Boolean {
+        logD {
+            "isPackageProtected: packageName = $packageName, userId = $userId"
+        }
+        val actualUserId = getActualUserId(userId, "isPackageProtected")
+        return runBlocking {
+            mutex.withLock {
+                userConfigMap[actualUserId]?.shouldProtectApp(packageName) ?: run {
+                    Slog.e(TAG, "isPackageProtected requested by unknown user id $actualUserId")
+                    AppLockManager.DEFAULT_PROTECT_APP
+                }
+            }
+        }
+    }
+
+    /**
+     * Check whether package is hidden by app lock
+     *
+     * @param packageName the package name sent by caller.
+     * @param userId the user id of the caller.
+     * @return boolean whether app is hidden or not.
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun isPackageHidden(packageName: String, userId: Int): Boolean {
+        logD {
+            "isPackageHidden: packageName = $packageName, userId = $userId"
+        }
+        val actualUserId = getActualUserId(userId, "isPackageHidden")
+        return runBlocking {
+            mutex.withLock {
+                userConfigMap[actualUserId]?.shouldHideApp(packageName) ?: run {
+                    Slog.e(TAG, "isPackageHidden requested by unknown user id $actualUserId")
+                    AppLockManager.DEFAULT_HIDE_IN_LAUNCHER
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the list of applications hidden from launcher.
+     * Caller must hold {@link android.permission.MANAGE_APP_LOCK}.
+     *
+     * @param userId the user id of the caller.
+     * @return list of package names of the hidden apps.
+     * @throws [SecurityException] if caller does not have permission
+     *     [Manifest.permissions.MANAGE_APP_LOCK].
+     */
+    @RequiresPermission(Manifest.permission.MANAGE_APP_LOCK)
+    override fun getHiddenPackages(userId: Int): List<String> {
+        enforceCallingPermission("getHiddenPackages")
+        return localService.getHiddenPackages(userId).toList()
+    }
+
+    private fun enforceCallingPermission(msg: String) {
+        context.enforceCallingPermission(Manifest.permission.MANAGE_APP_LOCK, msg)
+    }
+
+    private fun onStart() {
+        LocalServices.addService(AppLockManagerServiceInternal::class.java, localService)
+    }
+
+    private fun onBootCompleted() {
+        Slog.i(TAG, "onBootCompleted")
+        context.registerReceiverAsUser(
+            lockAlarmReceiver,
+            UserHandle.SYSTEM,
+            IntentFilter(ACTION_APP_LOCK_TIMEOUT),
+            null /* broadcastPermission */,
+            null /* scheduler */,
+        )
+
+        context.registerReceiverForAllUsers(
+            packageChangeReceiver,
+            IntentFilter(Intent.ACTION_PACKAGE_REMOVED).apply {
+                addDataScheme(IntentFilter.SCHEME_PACKAGE)
+            },
+            null /* broadcastPermission */,
+            null /* scheduler */,
+        )
+
+        ActivityTaskManager.getService().registerTaskStackListener(taskStackListener)
+    }
+
+    private fun onUserStarting(userId: Int) {
+        Slog.i(TAG, "onUserStarting: userId = $userId")
+        isDeviceSecure = keyguardManager.isDeviceSecure(userId)
+        logD {
+            "isDeviceSecure = $isDeviceSecure"
+        }
+        serviceScope.launch {
+            mutex.withLock {
+                withContext(Dispatchers.IO) {
+                    val config = AppLockConfig(Environment.getDataSystemDeDirectory(userId))
+                    userConfigMap[userId] = config
+                    config.read()
+                    biometricUnlocker.biometricsAllowed = config.biometricsAllowed
+                    verifyPackagesLocked(config)
+                }
+            }
+        }
+    }
+
+    private fun verifyPackagesLocked(config: AppLockConfig) {
+        var currentPackages = config.getAppLockAppList()
+        val validPackages = pmInternal.getInstalledApplications(
+            PackageManager.MATCH_ALL.toLong(),
+            currentUserId,
+            Process.myUid()
+        ).map { it.packageName }
+        var changed = false
+        logD {
+            "Current packages = $currentPackages"
+            "Valid packages = $validPackages"
+        }
+        for (i in 0 until currentPackages.size) {
+            val pkg = currentPackages[i]
+            if (!validPackages.contains(pkg)) {
+                config.removePackageFromMap(pkg)
+                changed = true
+            }
+        }
+        currentPackages = config.getAppLockAppList()
+        for (i in 0 until validPackages.size) {
+            val pkg = validPackages[i]
+            if (!currentPackages.contains(pkg)) {
+                config.addPackageToMap(pkg)
+                changed = true
+            }
+        }
+        logD {
+            val filteredPackages = config.getAppLockAppList()
+            "Updated current packages = $filteredPackages"
+        }
+        if (changed) {
+            config.write()
+        }
+    }
+
+    private fun onUserStopping(userId: Int): Job {
+        Slog.i(TAG, "onUserStopping: userId = $userId")
+        return serviceScope.launch {
+            mutex.withLock {
+                unlockedPackages.clear()
+                userConfigMap[userId]?.let {
+                    withContext(Dispatchers.IO) {
+                        it.write()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun onUserSwitching(oldUserId: Int, newUserId: Int) {
+        Slog.i(TAG, "onUserSwitching: oldUserId = $oldUserId, newUserId = $newUserId")
+        serviceScope.launch {
+            if (oldUserId != UserHandle.USER_NULL) {
+                onUserStopping(oldUserId).join()
+            }
+            onUserStarting(newUserId)
+        }
+    }
+
+    private inner class LocalService : AppLockManagerServiceInternal {
+        /**
+         * Check whether user is valid and device is secure
+         */
+        private fun checkUserAndDeviceStatus(userId: Int): Boolean {
+            if (userId < 0) {
+                logD {
+                    "Ignoring requireUnlock call for special user $userId"
+                }
+                return false
+            }
+            isDeviceSecure = keyguardManager.isDeviceSecure(userId)
+            if (!isDeviceSecure) {
+                logD {
+                    "Device is not secure, app does not require unlock"
+                }
+                return false
+            }
+            return true
+        }
+
+        override fun requireUnlock(packageName: String, userId: Int): Boolean {
+            return requireUnlockInternal(packageName, userId, false /* ignoreLockState */)
+        }
+
+        private fun requireUnlockInternal(
+            packageName: String,
+            userId: Int,
+            ignoreLockState: Boolean,
+        ) : Boolean {
+            if (!checkUserAndDeviceStatus(userId)) return false
+            val isLocked = clearAndExecute {
+                // If device is locked then there is no point in proceeding.
+                !ignoreLockState && keyguardManager.isDeviceLocked()
+            }
+            if (isLocked) {
+                logD {
+                    "Device is locked, app does not require unlock"
+                }
+                return false
+            }
+            logD {
+                "requireUnlock: packageName = $packageName"
+            }
+            val actualUserId = getActualUserId(userId, "requireUnlock")
+            return runBlocking {
+                mutex.withLock {
+                    val config = userConfigMap[actualUserId] ?: run {
+                        Slog.e(TAG, "requireUnlock queried by unknown user id $actualUserId")
+                        return@withLock false
+                    }
+                    val requireUnlock = config.shouldProtectApp(packageName) &&
+                        !unlockedPackages.contains(packageName)
+                    logD {
+                        "requireUnlock = $requireUnlock"
+                    }
+                    return@withLock requireUnlock
+                }
+            }
+        }
+
+        override fun reportPasswordChanged(userId: Int) {
+            logD {
+                "reportPasswordChanged: userId = $userId"
+            }
+            if (userId != currentUserId) {
+                logD {
+                    "Ignoring password change event for user $userId"
+                }
+                return
+            }
+            isDeviceSecure = keyguardManager.isDeviceSecure(userId)
+            logD {
+                "isDeviceSecure = $isDeviceSecure"
+            }
+        }
+
+        override fun shouldRedactNotification(
+            packageName: String,
+            userId: Int,
+        ) : Boolean {
+            if (!checkUserAndDeviceStatus(userId)) return false
+            logD {
+                "shouldRedactNotification: packageName = $packageName, userId = $userId"
+            }
+            val actualUserId = getActualUserId(userId, "shouldRedactNotification")
+            if (!requireUnlockInternal(packageName, userId, true /* ignoreLockState */)) return false
+            return runBlocking {
+                mutex.withLock {
+                    val config = userConfigMap[actualUserId] ?: run {
+                        Slog.e(TAG, "shouldRedactNotification queried by " +
+                            "unknown user id $actualUserId")
+                        return@withLock false
+                    }
+                    val secure = config.shouldRedactNotification(packageName)
+                    logD {
+                        "Secure = $secure"
+                    }
+                    return@withLock secure
+                }
+            }
+        }
+
+        override fun notifyDeviceLocked(locked: Boolean, userId: Int) {
+            logD {
+                "Device locked = $locked for user $userId"
+            }
+            if (userId != currentUserId ||
+                    !isDeviceSecure ||
+                    deviceLocked == locked) return
+            deviceLocked = locked
+            serviceScope.launch {
+                val config = mutex.withLock {
+                    userConfigMap[currentUserId] ?: run {
+                        Slog.e(TAG, "Config unavailable for user $currentUserId")
+                        return@launch
+                    }
+                }
+                if (deviceLocked) {
+                    mutex.withLock {
+                        if (unlockedPackages.isEmpty()) return@withLock
+                        logD {
+                            "Locking all packages"
+                        }
+                        unlockedPackages.clear()
+                    }
+                    alarmsMutex.withLock {
+                        if (scheduledAlarms.isEmpty()) return@withLock
+                        scheduledAlarms.values.forEach {
+                            alarmManager.cancel(it)
+                        }
+                        scheduledAlarms.clear()
+                    }
+                } else {
+                    mutex.withLock {
+                        if (topPackages.isEmpty()) return@withLock
+                        // If device is locked with an app in the foreground,
+                        // even if it is removed from [unlockedPackages], it will
+                        // still be shown when unlocked, so we need to start home
+                        // activity as soon as such a condition is detected on unlock.
+                        val shouldGoToHome = topPackages.any {
+                            config.shouldProtectApp(it) &&
+                                !unlockedPackages.contains(it)
+                        }
+                        if (!shouldGoToHome) return@withLock
+                        logD {
+                            "Locking foreground package"
+                        }
+                        context.mainExecutor.execute {
+                            atmInternal.startHomeActivity(currentUserId,
+                                "Locked package in foreground")
+                        }
+                    }
+                }
+            }
+        }
+
+        override fun interceptActivity(info: ActivityInterceptorInfo): Intent? {
+            val packageName = info.activityInfo.packageName
+            logD {
+                "interceptActivity, pkg = $packageName"
+            }
+            if (!requireUnlock(packageName, info.userId)) return null
+            val target = IntentSender(
+                atmInternal.getIntentSender(
+                    ActivityManager.INTENT_SENDER_ACTIVITY,
+                    info.callingPackage,
+                    info.callingFeatureId,
+                    info.callingPid,
+                    info.userId,
+                    null /* token */,
+                    null /* resultCode */,
+                    0 /* requestCode */,
+                    arrayOf(info.intent),
+                    arrayOf(info.resolvedType),
+                    PendingIntent.FLAG_CANCEL_CURRENT or
+                        PendingIntent.FLAG_ONE_SHOT or
+                        PendingIntent.FLAG_IMMUTABLE,
+                    ActivityOptions.makeBasic().toBundle()
+                )
+            )
+            val intent = Intent(AppLockManager.ACTION_UNLOCK_APP)
+                .setPackage(SETTINGS_PACKAGE)
+                .apply {
+                    putExtra(Intent.EXTRA_PACKAGE_NAME, packageName)
+                    putExtra(Intent.EXTRA_INTENT, target)
+                    putExtra(Intent.EXTRA_USER_ID, info.userId)
+                    putExtra(AppLockManager.EXTRA_PACKAGE_LABEL, info.activityInfo.loadLabel(packageManager))
+                    putExtra(AppLockManager.EXTRA_ALLOW_BIOMETRICS, isBiometricsAllowed(info.userId))
+                }
+            return intent
+        }
+
+        override fun getHiddenPackages(userId: Int): Set<String> {
+            logD {
+                "getHiddenPackages: userId = $userId"
+            }
+            return runBlocking {
+                val actualUserId = getActualUserId(userId, "getHiddenPackages")
+                val config = mutex.withLock {
+                    userConfigMap[actualUserId] ?: run {
+                        Slog.e(TAG, "Config unavailable for user $userId")
+                        return@runBlocking emptySet()
+                    }
+                }
+                val list = config.getAppLockHiddenAppList()
+                logD {
+                    "data list = $list"
+                }
+                list.toSet()
+            }
+        }
+    }
+
+    class Lifecycle(context: Context) : SystemService(context) {
+        private val service = AppLockManagerService(context)
+
+        override fun onStart() {
+            publishBinderService(Context.APP_LOCK_SERVICE, service)
+            service.onStart()
+        }
+
+        override fun onBootPhase(phase: Int) {
+            if (phase == PHASE_ACTIVITY_MANAGER_READY) {
+                service.onBootCompleted()
+            }
+        }
+
+        override fun onUserStarting(user: TargetUser) {
+            service.onUserStarting(user.userIdentifier)
+        }
+
+        override fun onUserStopping(user: TargetUser) {
+            service.onUserStopping(user.userIdentifier)
+        }
+
+        override fun onUserSwitching(from: TargetUser?, to: TargetUser) {
+            service.onUserSwitching(
+                from?.userIdentifier ?: UserHandle.USER_NULL,
+                to.userIdentifier
+            )
+        }
+    }
+}
diff --git a/services/applock/java/com/android/server/app/BiometricUnlocker.kt b/services/applock/java/com/android/server/app/BiometricUnlocker.kt
new file mode 100644
index 0000000000000..1c0bf8d347c84
--- /dev/null
+++ b/services/applock/java/com/android/server/app/BiometricUnlocker.kt
@@ -0,0 +1,109 @@
+/*
+ * 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.server.app
+
+import android.content.Context
+import android.hardware.biometrics.BiometricConstants
+import android.hardware.biometrics.BiometricManager
+import android.hardware.biometrics.BiometricManager.Authenticators
+import android.hardware.biometrics.BiometricPrompt
+import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback
+import android.hardware.biometrics.BiometricPrompt.AuthenticationResult
+import android.os.CancellationSignal
+import android.util.Slog
+
+import com.android.internal.R
+
+/**
+ * Handles logic of unlocking an app with biometrics or device credentials.
+ *
+ * @hide
+ */
+internal class BiometricUnlocker(private val context: Context) {
+
+    private val biometricManager = context.getSystemService(BiometricManager::class.java)!!
+
+    // Set operation must be externally synchronized
+    var biometricsAllowed = false
+
+    /**
+     * Determine whether biometrics or device credentials can be used for
+     * unlocking operation.
+     */
+    fun canUnlock(): Boolean =
+        biometricManager.canAuthenticate(
+            Authenticators.BIOMETRIC_WEAK or
+                Authenticators.DEVICE_CREDENTIAL
+        ) == BiometricManager.BIOMETRIC_SUCCESS
+
+    /**
+     * Unlock an application. Should call this method only if
+     * [canUnlock] returned true.
+     *
+     * @param title the title of the dialog prompt.
+     * @param onSuccess the callback invoked on successfull authentication.
+     * @param onCancel the callback invoked when authentication is cancelled.
+     */
+    fun unlock(
+        packageLabel: String?,
+        onSuccess: () -> Unit,
+        onCancel: () -> Unit,
+    ) {
+        val callback = object : AuthenticationCallback() {
+            override fun onAuthenticationSucceeded(result: AuthenticationResult) {
+                logD {
+                    "onAuthenticationSucceeded"
+                }
+                onSuccess()
+            }
+
+            override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                Slog.i(TAG, "onAuthenticationError, errorCode = " +
+                    "$errorCode, errString = $errString")
+                if (errorCode == BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED) {
+                    onCancel()
+                }
+            }
+        }
+        showCredentialsPrompt(
+            context.getString(R.string.unlock_application, packageLabel),
+            callback
+        )
+    }
+
+    private fun showCredentialsPrompt(
+        title: String,
+        callback: AuthenticationCallback,
+    ) {
+        var authenticators = Authenticators.DEVICE_CREDENTIAL
+        if (biometricsAllowed) {
+            authenticators = authenticators or Authenticators.BIOMETRIC_WEAK
+        }
+        val prompt = BiometricPrompt.Builder(context)
+            .setTitle(title)
+            .setAllowedAuthenticators(authenticators)
+            .setAllowBackgroundAuthentication(true)
+            .setConfirmationRequired(false)
+            .build()
+        prompt.authenticateUser(
+            CancellationSignal(),
+            context.mainExecutor,
+            callback,
+            context.userId,
+        )
+    }
+}
\ No newline at end of file
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 400e0a985796f..c14ab547c9783 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1542,7 +1542,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();
@@ -4636,7 +4636,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);
         }
@@ -4656,6 +4656,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/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
index 2ecce0b466625..1ccfaadcefe93 100644
--- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
+++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
@@ -367,7 +367,7 @@ private ComponentName resolveActivity(Intent intent) {
         window.setDimAmount(0.6f);
         window.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS);
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-        window.setGravity(Gravity.BOTTOM | Gravity.CENTER);
+        window.setGravity(Gravity.CENTER);
         window.setCloseOnTouchOutside(true);
         final WindowManager.LayoutParams params = window.getAttributes();
 
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 21c34b2953172..a2699a9572652 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",
@@ -248,6 +249,7 @@ java_library_static {
         "android.adpf.sessionmanager_aidl-java",
         "uprobestats_flags_java_lib",
         "clipboard_flags_lib",
+        "vendor.aospa.biometrics.face",
     ],
     javac_shard_size: 50,
     javacflags: [
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index ff6cc5205eb39..68aaffd05a622 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -71,6 +71,7 @@
 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;
@@ -89,9 +90,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;
@@ -308,6 +312,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 +476,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(
@@ -800,6 +814,8 @@ private void processValuesLocked(boolean force) {
         shutdownIfNoPowerLocked();
         shutdownIfOverTempLocked();
 
+        mOemCharger = mHasOemCharger && isOemCharger();
+
         if (force || mHealthInfo.chargingPolicy != mLastChargingPolicy) {
             mLastChargingPolicy = mHealthInfo.chargingPolicy;
             mHandler.post(this::notifyChargingPolicyChanged);
@@ -1013,6 +1029,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 +1071,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,
@@ -1201,6 +1219,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);
@@ -1313,6 +1359,7 @@ private boolean rateLimitBatteryChangedBroadcast(boolean forceUpdate) {
                 || mPlugType != mLastBroadcastPlugType
                 || mHealthInfo.maxChargingVoltageMicrovolts != mLastBroadcastMaxChargingVoltage
                 || mInvalidCharger != mLastBroadcastInvalidCharger
+                || mOemCharger != mLastOemCharger
                 || mHealthInfo.batteryCycleCount != mLastBroadcastBatteryCycleCount
                 || mHealthInfo.chargingState != mLastBroadcastChargingState
                 || mHealthInfo.batteryCapacityLevel != mLastBroadcastBatteryCapacityLevel
@@ -1783,6 +1830,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;
@@ -1796,6 +1844,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 3ef273214355b..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);
@@ -578,8 +584,10 @@ private static void addAugmentedProtoToDropbox(
         } catch (FileNotFoundException ex) {
             Slog.e(TAG, "failed to open for write: " + tombstoneProtoWithHeaders, ex);
             throw ex;
-        } catch (IOException ex) {
-            Slog.e(TAG, "IO exception during write: " + tombstoneProtoWithHeaders, ex);
+        } catch (RuntimeException ex) {
+            // in the method ProtoOutputStream.flush(), it tries to catch IOException
+            // then re-throw RuntimeException, so better catch it here.
+            Slog.e(TAG, "failed to flush proto tombstone: " + tombstoneProtoWithHeaders, ex);
         } finally {
             // Remove the temporary file and unlock the lock.
             if (tombstoneProtoWithHeaders != null) {
@@ -639,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;
     }
 
@@ -1022,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/GameSpaceManagerService.java b/services/core/java/com/android/server/GameSpaceManagerService.java
new file mode 100644
index 0000000000000..c200d22c8fd4c
--- /dev/null
+++ b/services/core/java/com/android/server/GameSpaceManagerService.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2025 the AxionAOSP 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.server;
+
+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.PackageManager;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.widget.Toast;
+
+import com.android.internal.R;
+import com.android.server.SystemService;
+import com.android.server.UiThread;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class GameSpaceManagerService extends SystemService {
+
+    private static final String TAG = "GameSpaceManagerService";
+    private static final String GAME_LIST_SETTING = Settings.System.GAMESPACE_GAME_LIST;
+    private static final Set<String> VALID_MODES = Set.of("1", "2", "3");
+
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+    private final Handler mBackgroundHandler;
+    private final BroadcastReceiver mPackageChangeReceiver = new PackageChangeReceiver();
+    private final ContentObserver mGameListObserver;
+
+    public GameSpaceManagerService(Context context) {
+        super(context);
+        mContext = context;
+        mPackageManager = context.getPackageManager();
+
+        HandlerThread handlerThread = new HandlerThread("GameSpaceManagerThread");
+        handlerThread.start();
+        mBackgroundHandler = new Handler(handlerThread.getLooper());
+
+        mGameListObserver = new GameListObserver(mBackgroundHandler);
+    }
+
+    @Override
+    public void onStart() {
+        // No-op
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == SystemService.PHASE_BOOT_COMPLETED) {
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+            filter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED);
+            filter.addDataScheme("package");
+            mContext.registerReceiver(mPackageChangeReceiver, filter);
+
+            mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(GAME_LIST_SETTING), false,
+                mGameListObserver, UserHandle.USER_ALL);
+
+            sanitizeGameList();
+        }
+    }
+
+    private class PackageChangeReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String packageName = intent.getData().getSchemeSpecificPart();
+            if (packageName == null) return;
+
+            mBackgroundHandler.post(() -> {
+                if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
+                    handlePackageAdded(packageName);
+                } else if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(intent.getAction())) {
+                    handlePackageRemoved(packageName);
+                }
+            });
+        }
+    }
+
+    private void handlePackageAdded(String packageName) {
+        if (isGame(packageName)) {
+            addToGameSpace(packageName);
+        }
+    }
+
+    private void handlePackageRemoved(String packageName) {
+        removeFromGameSpace(packageName);
+    }
+
+    private boolean isGame(String packageName) {
+        try {
+            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
+            return appInfo != null && appInfo.category == ApplicationInfo.CATEGORY_GAME;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    private void addToGameSpace(String packageName) {
+        ContentResolver cr = mContext.getContentResolver();
+        String currentList = Settings.System.getStringForUser(cr, GAME_LIST_SETTING, UserHandle.USER_CURRENT);
+        Map<String, String> gameMap = new HashMap<>();
+
+        if (currentList != null && !currentList.isEmpty()) {
+            String[] entries = currentList.split(";");
+            for (String entry : entries) {
+                String[] parts = entry.split("=");
+                if (parts.length == 2 && isValidMode(parts[1])) {
+                    gameMap.put(parts[0], parts[1]);
+                }
+            }
+        }
+
+        if (!gameMap.containsKey(packageName)) {
+            gameMap.put(packageName, "2");
+            String updatedList = serializeGameMap(gameMap);
+            Settings.System.putStringForUser(cr, GAME_LIST_SETTING, updatedList, UserHandle.USER_CURRENT);
+            sendGameAddedNotification(packageName);
+        }
+    }
+
+    private void removeFromGameSpace(String packageName) {
+        ContentResolver cr = mContext.getContentResolver();
+        String currentList = Settings.System.getStringForUser(cr, GAME_LIST_SETTING, UserHandle.USER_CURRENT);
+        if (currentList == null || currentList.isEmpty()) return;
+
+        Map<String, String> gameMap = new HashMap<>();
+        String[] entries = currentList.split(";");
+        for (String entry : entries) {
+            String[] parts = entry.split("=");
+            if (parts.length == 2 && isValidMode(parts[1]) && !parts[0].equals(packageName)) {
+                gameMap.put(parts[0], parts[1]);
+            }
+        }
+
+        String updatedList = serializeGameMap(gameMap);
+        Settings.System.putStringForUser(cr, GAME_LIST_SETTING, updatedList, UserHandle.USER_CURRENT);
+    }
+
+    private boolean isValidMode(String modeStr) {
+        return VALID_MODES.contains(modeStr);
+    }
+
+    private void sanitizeGameList() {
+        ContentResolver cr = mContext.getContentResolver();
+        String currentList = Settings.System.getStringForUser(cr, GAME_LIST_SETTING, UserHandle.USER_CURRENT);
+        if (currentList == null || currentList.isEmpty()) return;
+
+        Map<String, String> gameMap = new HashMap<>();
+        String[] entries = currentList.split(";");
+        for (String entry : entries) {
+            int firstEquals = entry.indexOf('=');
+            if (firstEquals > 0 && firstEquals < entry.length() - 1) {
+                String key = entry.substring(0, firstEquals).trim();
+                String value = entry.substring(firstEquals + 1).split("[^0-9]", 2)[0].trim();
+                if (isValidMode(value)) {
+                    gameMap.put(key, value);
+                }
+            }
+        }
+
+        String sanitizedList = serializeGameMap(gameMap);
+        Settings.System.putStringForUser(cr, GAME_LIST_SETTING, sanitizedList, UserHandle.USER_CURRENT);
+    }
+
+    private String serializeGameMap(Map<String, String> gameMap) {
+        Set<String> result = new HashSet<>();
+        for (Map.Entry<String, String> entry : gameMap.entrySet()) {
+            result.add(entry.getKey() + "=" + entry.getValue());
+        }
+        return String.join(";", result);
+    }
+
+    private class GameListObserver extends ContentObserver {
+        public GameListObserver(Handler handler) {
+            super(handler);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            super.onChange(selfChange);
+            sanitizeGameList();
+        }
+    }
+
+    private void sendGameAddedNotification(String packageName) {
+        String appName;
+        try {
+            appName = mPackageManager.getApplicationLabel(
+                mPackageManager.getApplicationInfo(packageName, 0)).toString();
+        } catch (PackageManager.NameNotFoundException e) {
+            appName = packageName;
+        }
+        final String finalAppName = appName;
+
+        UiThread.getHandler().post(
+            () -> Toast.makeText(
+                mContext,
+                mContext.getString(R.string.gamespace_new_game_added, finalAppName),
+                Toast.LENGTH_LONG
+            ).show()
+        );
+    }
+}
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 3a4e3f4cba748..6fd23543586db 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2525,8 +2525,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);
@@ -2709,7 +2711,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);
diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java
index 32c7dde7a5555..e5352bd8c56fc 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);
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 3d6cbe56f07a9..5c86f9fe1b342 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -2811,6 +2811,7 @@ && idMatchRelaxed(r, subId, phoneId)) {
             }
             handleRemoveListLocked();
         }
+        broadcastRadioPowerStateChanged(state, phoneId, subId);
     }
 
     @Override
@@ -4130,6 +4131,12 @@ public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
      */
     public static final String ACTION_SIGNAL_STRENGTH_CHANGED = "android.intent.action.SIG_STR";
 
+    /**
+     * Broadcast Action: The radio power state has changed.
+     */
+    private static final String ACTION_RADIO_POWER_STATE_CHANGED =
+            "org.codeaurora.intent.action.RADIO_POWER_STATE";
+
     private void broadcastServiceStateChanged(ServiceState state, int phoneId, int subId) {
         try {
             mBatteryStats.notePhoneState(state.getState());
@@ -4252,6 +4259,19 @@ private BroadcastOptions createServiceStateBroadcastOptions(int subId, int phone
                 .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE);
     }
 
+    private void broadcastRadioPowerStateChanged(int state, int phoneId, int subId) {
+        Intent intent = new Intent(ACTION_RADIO_POWER_STATE_CHANGED);
+        intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+        // Pass the subscription along with the intent.
+        intent.putExtra(PHONE_CONSTANTS_SUBSCRIPTION_KEY, subId);
+        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);
+        intent.putExtra(PHONE_CONSTANTS_SLOT_KEY, phoneId);
+        intent.putExtra(SubscriptionManager.EXTRA_SLOT_INDEX, phoneId);
+        intent.putExtra(PHONE_CONSTANTS_STATE_KEY, state);
+        mContext.sendBroadcastAsUser(intent, UserHandle.ALL,
+                Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
+    }
+
     private void broadcastSignalStrengthChanged(SignalStrength signalStrength, int phoneId,
             int subId) {
         final long ident = Binder.clearCallingIdentity();
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index b3be0d0831ccc..f67a6094bab21 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -257,9 +257,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;
@@ -564,6 +566,17 @@ public final class ActiveServices {
     @EnabledAfter(targetSdkVersion = VERSION_CODES.TIRAMISU)
     static final long FGS_TYPE_CHECK_FOR_INSTANT_APPS = 261055255L;
 
+    // Whitelist of package names to bypass FGS type validation
+    static 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
+    ));
+
     final Runnable mLastAnrDumpClearer = new Runnable() {
         @Override public void run() {
             synchronized (mAm) {
@@ -2860,6 +2873,14 @@ private Pair<Integer, RuntimeException> validateForegroundServiceType(ServiceRec
         final ForegroundServiceTypePolicy policy = ForegroundServiceTypePolicy.getDefaultPolicy();
         final ForegroundServiceTypePolicyInfo policyInfo =
                 policy.getForegroundServiceTypePolicyInfo(type, defaultToType);
+
+        // 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);
@@ -5643,6 +5664,7 @@ final void performServiceRestartLocked(ServiceRecord r) {
             // ends up just being cached, so quickly killed, then restarted again and again.
             // Let's not let that happen.
             Slog.wtf(TAG, "Restarting service that is not needed: " + r);
+            mRestartingServices.remove(r);
             return;
         }
         try {
diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java
index e639fd49a1366..bc2cefd4b739a 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;
@@ -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);
@@ -2051,7 +2049,7 @@ private void updateEnableAutomaticSystemServerHeapDumps() {
         // Monitoring is on by default, so if the setting hasn't been set by the user,
         // monitoring should be on.
         final boolean enabled = Settings.Global.getInt(mResolver,
-                Settings.Global.ENABLE_AUTOMATIC_SYSTEM_SERVER_HEAP_DUMPS, 1) == 1;
+                Settings.Global.ENABLE_AUTOMATIC_SYSTEM_SERVER_HEAP_DUMPS, 0) == 1;
 
         // Setting the threshold to 0 stops the checking.
         final long threshold = enabled ? mSystemServerAutomaticHeapDumpPssThresholdBytes : 0;
@@ -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 297b3296a4cd3..8cd2e3e81c59e 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1617,6 +1617,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.
      */
@@ -2544,7 +2548,7 @@ public ActivityManagerService(Context systemContext, ActivityTaskManagerService
                     Process.THREAD_GROUP_SYSTEM);
             Process.setThreadGroupAndCpuset(
                     mOomAdjuster.mCachedAppOptimizer.mCachedAppOptimizerThread.getThreadId(),
-                    Process.THREAD_GROUP_SYSTEM);
+                    Process.THREAD_GROUP_BACKGROUND);
         } catch (Exception e) {
             Slog.w(TAG, "Setting background thread cpuset failed");
         }
@@ -5309,6 +5313,7 @@ public void performReceive(Intent intent, int resultCode,
                             // Defer the full Pss collection as the system is really busy now.
                             mHandler.postDelayed(() -> {
                                 synchronized (mProcLock) {
+                                    mOomAdjuster.mCachedAppOptimizer.compactAllSystem();
                                     mAppProfiler.requestPssAllProcsLPr(
                                             SystemClock.uptimeMillis(), true, false);
                                 }
@@ -7696,7 +7701,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;
         }
@@ -9382,9 +9387,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,
@@ -9395,8 +9403,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,
@@ -19681,4 +19687,90 @@ public void sendProfilingTrigger(int uid, @NonNull String packageName, int trigg
             }
         });
     }
+
+    @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) {
+                mOomAdjuster.mCachedAppOptimizer.compactAllSystem();
+
+                mProcessList.forEachLruProcessesLOSP(false, proc -> {
+                    if (proc == null || proc.getThread() == null) return;
+
+                    final int setAdj = proc.getSetAdj();
+                    final int state = proc.mState.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++;
+        }
+    }
+
+    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 2fbf05eb00615..d6d16804b6725 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -673,6 +673,11 @@ private void crashApplicationInner(ProcessRecord r, ApplicationErrorReport.Crash
                 return;
             }
 
+            // Add paste content for Pasty option
+            data.paste = "time: " + timeMillis + "\n" +
+            "msg: " + longMsg + "\n" +
+            "stacktrace: " + stackTrace;
+
             final Message msg = Message.obtain();
             msg.what = ActivityManagerService.SHOW_ERROR_UI_MSG;
 
diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index e1833e6f1708d..74798f018e135 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -273,7 +273,7 @@ public class CachedAppOptimizer {
     @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_4 = 5*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 =
@@ -549,7 +549,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;
@@ -791,10 +791,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);
     }
 
     /**
@@ -894,7 +893,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);
@@ -1542,10 +1541,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.mState.getSetAdj() <= ProcessList.PERCEPTIBLE_APP_ADJ) {
+            if (compactSource == CompactSource.APP
+                    && proc.mState.getSetAdj() <= ProcessList.PERCEPTIBLE_APP_ADJ) {
                 if (DEBUG_COMPACTION) {
                     Slog.d(TAG_AM,
                             "Skipping compaction as process " + name + " is "
diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index aa5c7fddb93f1..3fa80ce967027 100644
--- a/services/core/java/com/android/server/am/ContentProviderHelper.java
+++ b/services/core/java/com/android/server/am/ContentProviderHelper.java
@@ -1381,7 +1381,6 @@ 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
         SettingsToPropertiesMapper.start(mService.mContext.getContentResolver());
         mService.mOomAdjuster.initSettings();
 
diff --git a/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java b/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
index 4e28eed0c8850..54d8daacc438a 100644
--- a/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
+++ b/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
@@ -220,7 +220,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;
@@ -419,6 +419,7 @@ void dispatchUnfrozenEvent() {
 
     void init(long nowUptime) {
         mFreezeUnfreezeTime = nowUptime;
+        mLastCompactTime = nowUptime;
     }
 
     @GuardedBy("mProcLock")
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 934e94ac57aef..ed2a055da199d 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -949,7 +949,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 {
diff --git a/services/core/java/com/android/server/app/AppLockManagerServiceInternal.java b/services/core/java/com/android/server/app/AppLockManagerServiceInternal.java
new file mode 100644
index 0000000000000..106b72ff07eaf
--- /dev/null
+++ b/services/core/java/com/android/server/app/AppLockManagerServiceInternal.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (C) 2023 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.server.app;
+
+import android.content.Intent;
+
+import com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo;
+
+import java.util.Set;
+
+/**
+ * Internal class for system server to manage app lock.
+ *
+ * @hide
+ */
+public interface AppLockManagerServiceInternal {
+
+    /**
+     * Whether user has to unlock this application in order to
+     * open it.
+     *
+     * @param packageName the package name of the app to check.
+     * @param userId the user id given by the caller.
+     * @return true if user has to unlock, false otherwise.
+     */
+    boolean requireUnlock(String packageName, int userId);
+
+    /**
+     * Report that password for user has changed.
+     *
+     * @param userId the user for which password has changed.
+     */
+    void reportPasswordChanged(int userId);
+
+    /**
+     * Check whether notification content should be hidden for a package.
+     *
+     * @param packageName the package to check for.
+     * @param userId the user id given by the caller.
+     * @return true if notification should be hidden, false otherwise.
+     */
+    boolean shouldRedactNotification(String packageName, int userId);
+
+    /**
+     * Notify that the device is locked for current user.
+     */
+    void notifyDeviceLocked(boolean locked, int userId);
+
+    /**
+     * Whether to intercept the activity launch from a package. Used
+     * to show confirm credentials prompt.
+     *
+     * @param info [ActivityInterceptorInfo] of intercepted activity.
+     * @return [Intent] which will be fired. Return null if activity
+     *    shouldn't be intercepted.
+     */
+    Intent interceptActivity(ActivityInterceptorInfo info);
+
+    /**
+     * Get the list of applications hidden from launcher.
+     *
+     * @param userId the user id given of the caller.
+     * @return a hash set of package names.
+     */
+    Set<String> getHiddenPackages(int userId);
+}
diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java
index fa19beb2c7d75..fa34f328ee5e3 100644
--- a/services/core/java/com/android/server/app/GameManagerService.java
+++ b/services/core/java/com/android/server/app/GameManagerService.java
@@ -48,6 +48,7 @@
 import android.app.StatsManager;
 import android.app.UidObserver;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -60,6 +61,7 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
+import android.database.ContentObserver;
 import android.hardware.power.Mode;
 import android.net.Uri;
 import android.os.Binder;
@@ -81,6 +83,7 @@
 import android.os.UserManager;
 import android.provider.DeviceConfig;
 import android.provider.DeviceConfig.Properties;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.AtomicFile;
@@ -1593,6 +1596,10 @@ public void onReceive(Context context, Intent intent) {
         mGameDefaultFrameRateValue = (float) mSysProps.getInt(
                 PROPERTY_RO_SURFACEFLINGER_GAME_DEFAULT_FRAME_RATE, 60);
         Slog.v(TAG, "Game Default Frame Rate : " + mGameDefaultFrameRateValue);
+        
+        // Start to observe our Settings.Secure.GAME_OVERLAY
+        // after boot completed.
+        new SettingsObserver(mHandler);
     }
 
     private void sendUserMessage(int userId, int what, String eventForLog, int delayMillis) {
@@ -2364,4 +2371,44 @@ private void handleUidMovedOffTop(int uid) {
             }
         }
     }
+
+    class SettingsObserver extends ContentObserver {
+
+        private final ContentResolver mContentResolver;
+
+        SettingsObserver(Handler handler) {
+            super(handler);
+            mContentResolver = mContext.getContentResolver();
+            mContentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.GAME_OVERLAY), false, this,
+                    UserHandle.USER_ALL);
+            }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            synchronized (mDeviceConfigLock) {
+                String newValue = Settings.Secure.getStringForUser(mContentResolver,
+                        Settings.Secure.GAME_OVERLAY, UserHandle.USER_CURRENT);
+                if (newValue == null) return;
+                // We write key and value of the device_config property as a single string
+                // from our GameSpace.
+                // ';;' is the separator betweeen key and value.
+                // Example: com.libremobileos.game;;mode=2,downscaleFactor=0.7:mode=3,downscaleFactor=0.8
+                // So split the key and value from the string
+                // and set the device_config propery.
+                String[] parsedValues = newValue.split(";;");
+                // Value should contain both package name and config.
+                // Otherwise don't do anything.
+                if (parsedValues.length < 2) return;
+                // We don't need to care about any format and all.
+                // It will be handled by the GamePackageConfiguration while
+                // parsing the device_config property.
+                String packageName = parsedValues[0];
+                String configValue = parsedValues[1];
+                DeviceConfig.setProperty(DeviceConfig.NAMESPACE_GAME_OVERLAY,
+                        packageName, configValue, false);
+            }
+        }
+    }
+
 }
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index c749d45b5c0d9..3c3862d11d98f 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -5019,7 +5019,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 + ".");
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 45b0b076d08fd..7cd68f2aee5b2 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -63,6 +63,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;
@@ -6503,6 +6504,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;
@@ -6527,10 +6530,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) {
@@ -11774,6 +11798,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/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java
index e43d3b269e3f4..b5f6f3beb007c 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 c3685fa606d2e..475988809c3af 100644
--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
@@ -75,6 +75,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;
 
@@ -907,7 +908,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 6416ea1229364..49dc4104261b6 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -109,6 +109,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.
  */
@@ -342,7 +344,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 */,
@@ -351,7 +353,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 */,
@@ -368,7 +372,7 @@ public void updateContentObserver() {
                         false /* notifyForDescendants */,
                         this /* observer */,
                         UserHandle.USER_ALL);
-            } else {
+            } else if (!mUseLegacyFaceOnlySettings) {
                 mContentResolver.registerContentObserver(BIOMETRIC_KEYGUARD_ENABLED,
                         false /* notifyForDescendants */,
                         this /* observer */,
@@ -489,7 +493,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);
@@ -517,7 +522,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 a662838a7ceab..0730abcacf8d8 100644
--- a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
+++ b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
@@ -70,6 +70,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;
 
@@ -277,12 +280,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);
     }
 
     /**
@@ -312,6 +318,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();
@@ -353,8 +363,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..3a370f698bccd
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.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 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 */);
+    }
+
+    @LockoutTracker.LockoutMode
+    @Override
+    protected int handleFailedAttempt(int userId) {
+        @LockoutTracker.LockoutMode final int lockoutMode =
+                getLockoutTracker().getLockoutModeForUser(userId);
+        final PerformanceTracker performanceTracker =
+                PerformanceTracker.getInstanceForSensorId(getSensorId());
+        if (lockoutMode == LockoutTracker.LOCKOUT_PERMANENT) {
+            performanceTracker.incrementPermanentLockoutForUser(userId);
+        } else if (lockoutMode == LockoutTracker.LOCKOUT_TIMED) {
+            performanceTracker.incrementTimedLockoutForUser(userId);
+        }
+
+        return lockoutMode;
+    }
+
+    @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..73f99f168d1d2
--- /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 /* isMandatoryBiometrics */);
+        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..d1537ffeea4db
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java
@@ -0,0 +1,76 @@
+/*
+ * 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 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> {
+
+    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 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..1a9a91b972c2a
--- /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,
+                false /* isMandatoryBiometrics */);
+
+        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..0b8d3ffff6a7f
--- /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 /* isMandatoryBiometrics */);
+        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..78e291e2e66e2
--- /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,
+                false /* isMandatoryBiometrics */);
+        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/aidl/FingerprintProvider.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
index 45f49669a0542..3b178ec751023 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
@@ -137,6 +137,8 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
     @Nullable private IVirtualHal mVhal;
     @Nullable private String mHalInstanceNameCurrent;
 
+    private boolean mCleanup;
+
     private final class BiometricTaskStackListener extends TaskStackListener {
         @Override
         public void onTaskStackChanged() {
@@ -206,6 +208,9 @@ public FingerprintProvider(@NonNull Context context,
         mTestHalEnabled = testHalEnabled;
         mBiometricHandlerProvider = biometricHandlerProvider;
 
+        mCleanup = context.getResources().getBoolean(
+                org.lineageos.platform.internal.R.bool.config_cleanupUnusedFingerprints);
+
         initAuthenticationBroadcastReceiver();
         initFingerprintDanglingBroadcastReceiver();
         initSensors(resetLockoutRequiresHardwareAuthToken, props, gestureAvailabilityDispatcher);
@@ -674,6 +679,9 @@ public void scheduleInternalCleanup(int sensorId, int userId,
     @Override
     public void scheduleInternalCleanup(int sensorId, int userId,
             @Nullable ClientMonitorCallback callback, boolean favorHalEnrollments) {
+        if (!mCleanup) {
+            return;
+        }
         mHandler.post(() -> {
             final FingerprintInternalCleanupClient client =
                     new FingerprintInternalCleanupClient(mContext,
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 1c15779a8524b..52082284bac00 100644
--- a/services/core/java/com/android/server/camera/CameraServiceProxy.java
+++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java
@@ -1063,7 +1063,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 842e518b1b4e8..4e00072282ee9 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;
@@ -606,12 +593,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);
@@ -631,9 +622,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/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 2026dedd6264d..33a822377ce1d 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;
@@ -739,12 +741,14 @@ protected void updateState(DetailedState detailedState, String reason) {
                     mNetworkAgent.unregister();
                     mNetworkAgent = null;
                 }
+                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);
@@ -1716,6 +1720,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 1ef72fc657c2c..ed1b549390571 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/crdroid/AttestationService.java b/services/core/java/com/android/server/crdroid/AttestationService.java
new file mode 100644
index 0000000000000..20fcd05b80783
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/AttestationService.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (C) 2024 The LeafOS Project
+ * Copyright (C) 2024-2025 crDroid Android Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.android.server.crdroid;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.os.Environment;
+import android.os.SELinux;
+import android.provider.Settings;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.util.AtomicFile;
+import android.util.Log;
+
+import com.android.server.SystemService;
+import com.android.internal.util.crdroid.Utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public final class AttestationService extends SystemService {
+
+    private static final String TAG = AttestationService.class.getSimpleName();
+
+    private static final String API = "https://raw.githubusercontent.com/crdroidandroid/android_vendor_certification/refs/heads/15.0/gms_certified_props.json";
+    private static final String DATA_FILE = "gms_certified_props.json";
+    private static final long INITIAL_DELAY = 0; // Start immediately on boot
+    private static final long INTERVAL = 8; // Interval in hours
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private final Context mContext;
+    private final File mDataFile;
+    private final ScheduledExecutorService mScheduler;
+    private final ConnectivityManager mConnectivityManager;
+    private final FetchGmsCertifiedProps mFetchRunnable;
+
+    private boolean mPendingUpdate;
+
+    private final AtomicBoolean mFetchScheduledByNetwork = new AtomicBoolean(false);
+    private volatile long mLastSuccessFetchMs = 0L;
+    private static final long MIN_REFETCH_MS = TimeUnit.MINUTES.toMillis(5);
+
+    public AttestationService(Context context) {
+        super(context);
+        mContext = context;
+        mDataFile = new File(Environment.getDataSystemDirectory(), DATA_FILE);
+        mFetchRunnable = new FetchGmsCertifiedProps();
+        mScheduler = Executors.newSingleThreadScheduledExecutor();
+        mConnectivityManager =
+                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+        registerNetworkCallback();
+    }
+
+    @Override
+    public void onStart() {}
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (Utils.isPackageInstalled(mContext, "com.google.android.gms")
+                && phase == PHASE_BOOT_COMPLETED) {
+            Log.i(TAG, "Scheduling the service");
+            mScheduler.scheduleAtFixedRate(
+                    mFetchRunnable, INITIAL_DELAY, INTERVAL, TimeUnit.HOURS);
+        }
+    }
+
+    private String readFromFile(File file) {
+        StringBuilder content = new StringBuilder();
+
+        if (file.exists()) {
+            try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+                String line;
+
+                while ((line = reader.readLine()) != null) {
+                    content.append(line);
+                }
+            } catch (IOException e) {
+                Log.e(TAG, "Error reading from file", e);
+            }
+        }
+        return content.toString();
+    }
+
+    private void writeToFile(File file, String data) {
+        AtomicFile aFile = new AtomicFile(file);
+        FileOutputStream fos = null;
+        try {
+            fos = aFile.startWrite();
+            fos.write(data.getBytes(StandardCharsets.UTF_8));
+            aFile.finishWrite(fos);
+            try {
+                Os.chmod(file.getAbsolutePath(), 0644);
+            } catch (ErrnoException ignored) {}
+            SELinux.restorecon(file);
+        } catch (IOException e) {
+            if (fos != null) {
+                aFile.failWrite(fos);
+            }
+            Log.e(TAG, "Error writing to file", e);
+        }
+    }
+
+    private String fetchProps() {
+        HttpURLConnection urlConnection = null;
+        try {
+            URL url = new URI(API).toURL();
+            urlConnection = (HttpURLConnection) url.openConnection();
+            urlConnection.setConnectTimeout(10000);
+            urlConnection.setReadTimeout(10000);
+            urlConnection.setRequestProperty("User-Agent", "AttestationService/1.0");
+
+            int code = urlConnection.getResponseCode();
+            if (code != HttpURLConnection.HTTP_OK) {
+                Log.e(TAG, "Bad HTTP status: " + code);
+                return null;
+            }
+
+            try (BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(urlConnection.getInputStream(), StandardCharsets.UTF_8))) {
+                StringBuilder response = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) response.append(line);
+                return response.toString();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error making an API request", e);
+            return null;
+        } finally {
+            if (urlConnection != null) urlConnection.disconnect();
+        }
+    }
+
+    private void dlog(String message) {
+        if (DEBUG) Log.d(TAG, message);
+    }
+
+    private boolean isInternetConnected() {
+        Network network = mConnectivityManager.getActiveNetwork();
+        if (network != null) {
+            NetworkCapabilities capabilities = mConnectivityManager.getNetworkCapabilities(network);
+            return capabilities != null && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+        }
+        return false;
+    }
+
+    private void registerNetworkCallback() {
+        mConnectivityManager.registerDefaultNetworkCallback(new ConnectivityManager.NetworkCallback() {
+            @Override
+            public void onAvailable(Network network) {
+                Log.i(TAG, "Internet is available, resuming update");
+                if (!mPendingUpdate) return;
+                long now = System.currentTimeMillis();
+                if (now - mLastSuccessFetchMs < MIN_REFETCH_MS) return;
+                if (mFetchScheduledByNetwork.compareAndSet(false, true)) {
+                    mScheduler.schedule(() -> {
+                        try {
+                            mFetchRunnable.run();
+                        } finally {
+                            mFetchScheduledByNetwork.set(false);
+                        }
+                    }, 0, TimeUnit.SECONDS);
+                }
+            }
+        });
+    }
+
+    private class FetchGmsCertifiedProps implements Runnable {
+        @Override
+        public void run() {
+            if (Settings.Secure.getInt(mContext.getContentResolver(),
+                    Settings.Secure.PI_ENABLE_SPOOF, 1) != 1) {
+                mPendingUpdate = false;
+                return;
+            }
+
+            try {
+                dlog("FetchGmsCertifiedProps started");
+
+                if (!isInternetConnected()) {
+                    Log.e(TAG, "Internet is unavailable, deferring update");
+                    mPendingUpdate = true;
+                    return;
+                }
+                mPendingUpdate = false;
+
+                String savedProps = readFromFile(mDataFile);
+                String props = fetchProps();
+                if (props != null) {
+                    try {
+                        new JSONObject(props);
+                    } catch (JSONException je) {
+                        Log.e(TAG, "Fetched props are not valid JSON, keeping existing file", je);
+                        return;
+                    }
+                }
+                if (props != null && !savedProps.equals(props)) {
+                    dlog("Found new props");
+                    writeToFile(mDataFile, props);
+                    mLastSuccessFetchMs = System.currentTimeMillis();
+                    dlog("FetchGmsCertifiedProps completed");
+                } else {
+                    dlog("No change in props");
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Error in FetchGmsCertifiedProps", e);
+            }
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java b/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java
new file mode 100644
index 0000000000000..8d8d18f188afe
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 The PixelExperience Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.server.crdroid;
+
+import android.content.Context;
+import com.android.server.SystemService;
+
+import com.android.internal.util.crdroid.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/crdroid/VbmetaHashService.java b/services/core/java/com/android/server/crdroid/VbmetaHashService.java
new file mode 100644
index 0000000000000..4464e737bbfad
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/VbmetaHashService.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package com.android.server.crdroid;
+
+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.crdroid.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/crdroid/vbmeta/ASN1Attestation.java b/services/core/java/com/android/server/crdroid/vbmeta/ASN1Attestation.java
new file mode 100644
index 0000000000000..537d8659ea19b
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/ASN1Attestation.java
@@ -0,0 +1,65 @@
+package com.android.server.crdroid.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/crdroid/vbmeta/ASN1Utils.java b/services/core/java/com/android/server/crdroid/vbmeta/ASN1Utils.java
new file mode 100644
index 0000000000000..2b1a446cee3cb
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/ASN1Utils.java
@@ -0,0 +1,131 @@
+package com.android.server.crdroid.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/crdroid/vbmeta/Attestation.java b/services/core/java/com/android/server/crdroid/vbmeta/Attestation.java
new file mode 100644
index 0000000000000..af37b58159a79
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/Attestation.java
@@ -0,0 +1,178 @@
+package com.android.server.crdroid.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/crdroid/vbmeta/AttestationResult.java b/services/core/java/com/android/server/crdroid/vbmeta/AttestationResult.java
new file mode 100644
index 0000000000000..5f00b4f399372
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/AttestationResult.java
@@ -0,0 +1,63 @@
+package com.android.server.crdroid.vbmeta;
+
+import static com.android.server.crdroid.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/crdroid/vbmeta/AuthorizationList.java b/services/core/java/com/android/server/crdroid/vbmeta/AuthorizationList.java
new file mode 100644
index 0000000000000..c0fef8bcbd7ea
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/AuthorizationList.java
@@ -0,0 +1,368 @@
+package com.android.server.crdroid.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/crdroid/vbmeta/CertificateInfo.java b/services/core/java/com/android/server/crdroid/vbmeta/CertificateInfo.java
new file mode 100644
index 0000000000000..f7622ace6b797
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/CertificateInfo.java
@@ -0,0 +1,244 @@
+package com.android.server.crdroid.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/crdroid/vbmeta/Entry.java b/services/core/java/com/android/server/crdroid/vbmeta/Entry.java
new file mode 100644
index 0000000000000..9819e6beaf5f7
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/Entry.java
@@ -0,0 +1,88 @@
+package com.android.server.crdroid.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/crdroid/vbmeta/RootOfTrust.java b/services/core/java/com/android/server/crdroid/vbmeta/RootOfTrust.java
new file mode 100644
index 0000000000000..ca6fd3fe86634
--- /dev/null
+++ b/services/core/java/com/android/server/crdroid/vbmeta/RootOfTrust.java
@@ -0,0 +1,104 @@
+package com.android.server.crdroid.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/display/AutoAODService.java b/services/core/java/com/android/server/display/AutoAODService.java
new file mode 100644
index 0000000000000..f30ddc1b7d052
--- /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(Looper.getMainLooper());
+    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(mHandler);
+        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 25a2f60b85b2d..0aad29b41a9ad 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:
@@ -706,8 +706,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 1c340bcfbfd25..39bbec3ee1f37 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -203,6 +203,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;
@@ -413,7 +415,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;
@@ -440,6 +451,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);
+            }
         }
     };
 
@@ -559,6 +577,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) {
@@ -2385,6 +2405,7 @@ private void registerAdditionalDisplayAdapters() {
             if (shouldRegisterNonEssentialDisplayAdaptersLocked()) {
                 registerOverlayDisplayAdapterLocked();
                 registerWifiDisplayAdapterLocked();
+                registerFreeformDisplayAdapterLocked();
             }
         }
     }
@@ -2405,6 +2426,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
@@ -5493,7 +5521,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)
@@ -6365,6 +6397,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 96c20faed2e4c..ddcdb99839490 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;
@@ -477,6 +478,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;
 
@@ -1003,9 +1010,49 @@ 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 USE_COLOR_FADE_ON_ANIMATION ? ScreenStateAnimator.MODE_WARM_UP
+                            : 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) {
             mColorFadeOnAnimator = ObjectAnimator.ofFloat(
@@ -2381,7 +2428,7 @@ private void animateScreenStateChange(
             // Skip the screen off animation and add a black surface to hide the
             // contents of the screen.
             mPowerState.prepareColorFade(mContext,
-                    mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP);
+                    getScreenAnimationModeForDisplayState(Display.STATE_ON));
             if (mColorFadeOffAnimator != null) {
                 mColorFadeOffAnimator.end();
             }
@@ -2414,8 +2461,7 @@ private void animateScreenStateChange(
                 if (mPowerState.getColorFadeLevel() == 1.0f) {
                     mPowerState.dismissColorFade();
                 } else if (mPowerState.prepareColorFade(mContext,
-                        mColorFadeFadesConfig
-                                ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP)) {
+                        getScreenAnimationModeForDisplayState(Display.STATE_ON))) {
                     mColorFadeOnAnimator.start();
                 } else {
                     mColorFadeOnAnimator.end();
@@ -2500,8 +2546,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();
@@ -3308,9 +3353,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..57c19f4519484
--- /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.ScreenCapture;
+
+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 ScreenCapture.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(
+            ScreenCapture.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 ScreenCapture.ScreenshotHardwareBuffer captureScreen() {
+        ScreenCapture.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/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/mode/DisplayModeDirector.java b/services/core/java/com/android/server/display/mode/DisplayModeDirector.java
index 0b158b1ee320b..dede21f087de0 100644
--- a/services/core/java/com/android/server/display/mode/DisplayModeDirector.java
+++ b/services/core/java/com/android/server/display/mode/DisplayModeDirector.java
@@ -284,6 +284,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();
         }
     }
diff --git a/services/core/java/com/android/server/input/KeyGestureController.java b/services/core/java/com/android/server/input/KeyGestureController.java
index f05776f836a20..3ac533940e365 100644
--- a/services/core/java/com/android/server/input/KeyGestureController.java
+++ b/services/core/java/com/android/server/input/KeyGestureController.java
@@ -1172,10 +1172,16 @@ 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;
-
         }
         return true;
     }
@@ -1701,8 +1707,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 5b57aaa56d531..e0c0f26597e8a 100644
--- a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java
+++ b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java
@@ -246,6 +246,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 b9560b0c49dc1..2ad84f222c321 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -505,6 +505,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
@@ -520,6 +523,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;
@@ -530,6 +535,8 @@ private void onChangeInternal(@NonNull Uri uri, @UserIdInt int userId) {
                     updateTouchSensitivity();
                 } else if (touchHoveringUri.equals(uri)) {
                     updateTouchHovering();
+                } else if (navBarUri.equals(uri)) {
+                    onUpdateResourceOverlay(userId);
                 }
             }
         }
@@ -1244,7 +1251,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);
@@ -5251,10 +5260,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) {
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/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index eabc43e17c4bb..7e60c4efde63e 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -142,6 +142,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.internal.widget.VerifyCredentialResponse;
+import com.android.server.app.AppLockManagerServiceInternal;
 import com.android.server.LocalServices;
 import com.android.server.ServiceThread;
 import com.android.server.SystemService;
@@ -2671,6 +2672,7 @@ private void notifyPasswordChanged(LockscreenCredential newCredential, @UserIdIn
         mHandler.post(() -> {
             mInjector.getDevicePolicyManager().reportPasswordChanged(newMetrics, userId);
             LocalServices.getService(WindowManagerInternal.class).reportPasswordChanged(userId);
+            LocalServices.getService(AppLockManagerServiceInternal.class).reportPasswordChanged(userId);
         });
     }
 
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/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index a1089b38131e9..c23c750201614 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -45,6 +45,7 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManagerInternal;
+import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.media.AudioPlaybackConfiguration;
 import android.media.AudioSystem;
@@ -64,6 +65,7 @@
 import android.media.session.MediaSession;
 import android.media.session.MediaSessionManager;
 import android.media.session.PlaybackState;
+import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
@@ -1253,10 +1255,16 @@ final class FullUserRecord implements MediaSessionStack.OnMediaButtonSessionChan
         private IOnMediaKeyListener mOnMediaKeyListener;
         private int mOnMediaKeyListenerUid;
 
+        private boolean mAdaptivePlaybackEnabled;
+
         FullUserRecord(int fullUserId) {
             mFullUserId = fullUserId;
             mContentResolver = mContext.createContextAsUser(UserHandle.of(mFullUserId), 0)
                     .getContentResolver();
+            SettingsObserver settingsObserver = new SettingsObserver();
+            settingsObserver.observe();
+            mAdaptivePlaybackEnabled = Settings.System.getIntForUser(mContentResolver,
+                    Settings.System.ADAPTIVE_PLAYBACK_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
             mPriorityStack = new MediaSessionStack(mAudioPlayerStateMonitor, this);
             // Restore the remembered media button receiver before the boot.
             String mediaButtonReceiverInfo = Settings.Secure.getString(mContentResolver,
@@ -1455,6 +1463,28 @@ public void binderDied() {
                 }
             }
         }
+
+        final class SettingsObserver extends ContentObserver {
+            private final Uri ADAPTIVE_PLAYBACK_ENABLED_URI =
+                    Settings.System.getUriFor(Settings.System.ADAPTIVE_PLAYBACK_ENABLED);
+
+            public SettingsObserver() {
+                super(null);
+            }
+
+            private void observe() {
+                mContentResolver.registerContentObserver(ADAPTIVE_PLAYBACK_ENABLED_URI, false,
+                        this);
+            }
+
+            @Override
+            public void onChange(boolean selfChange, @Nullable Uri uri) {
+                if (ADAPTIVE_PLAYBACK_ENABLED_URI.equals(uri)) {
+                    mAdaptivePlaybackEnabled = Settings.System.getIntForUser(mContentResolver,
+                            Settings.System.ADAPTIVE_PLAYBACK_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+                }
+            }
+        }
     }
 
     final class SessionsListenerRecord implements IBinder.DeathRecipient {
@@ -2566,7 +2596,9 @@ private void dispatchAdjustVolumeLocked(String packageName, String opPackageName
                             + ". flags=" + flags + ", preferSuggestedStream="
                             + preferSuggestedStream + ", session=" + session);
                 }
-                if (musicOnly && !AudioSystem.isStreamActive(AudioManager.STREAM_MUSIC, 0)) {
+                if (musicOnly && !mCurrentFullUserRecord.mAdaptivePlaybackEnabled
+                        && direction != AudioManager.ADJUST_RAISE
+                        && !AudioSystem.isStreamActive(AudioManager.STREAM_MUSIC, 0)) {
                     if (DEBUG_KEY_EVENT) {
                         Log.d(TAG, "Nothing is playing on the music stream. Skipping volume event,"
                                 + " flags=" + flags);
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/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index c75bcfed0d1b2..c9cbfe0feb997 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(
@@ -3461,10 +3461,10 @@ private void setUidPolicyUncheckedUL(int uid, int oldPolicy, int policy, boolean
         if (!isUidValidForAllowlistRulesUL(uid)) {
             notifyApp = false;
         } else {
-            final boolean wasDenied = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
-            final boolean isDenied = policy == POLICY_REJECT_METERED_BACKGROUND;
-            final boolean wasAllowed = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
-            final boolean isAllowed = policy == POLICY_ALLOW_METERED_BACKGROUND;
+            final boolean wasDenied = (oldPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+            final boolean isDenied = (policy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+            final boolean wasAllowed = (oldPolicy & POLICY_ALLOW_METERED_BACKGROUND) != 0;
+            final boolean isAllowed = (policy & POLICY_ALLOW_METERED_BACKGROUND) != 0;
             final boolean wasBlocked = wasDenied || (mRestrictBackground && !wasAllowed);
             final boolean isBlocked = isDenied || (mRestrictBackground && !isAllowed);
             if ((wasAllowed && (!isAllowed || isDenied))
@@ -3874,7 +3874,7 @@ private int getRestrictBackgroundStatusInternal(int uid) {
             } finally {
                 Binder.restoreCallingIdentity(token);
             }
-            if (policy == POLICY_REJECT_METERED_BACKGROUND) {
+            if ((policy & POLICY_REJECT_METERED_BACKGROUND) != 0) {
                 // App is restricted.
                 return RESTRICT_BACKGROUND_STATUS_ENABLED;
             }
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/BubbleExtractor.java b/services/core/java/com/android/server/notification/BubbleExtractor.java
index 3d6f9cfed697b..36b037419a008 100644
--- a/services/core/java/com/android/server/notification/BubbleExtractor.java
+++ b/services/core/java/com/android/server/notification/BubbleExtractor.java
@@ -96,7 +96,8 @@ public RankingReconsideration process(NotificationRecord record) {
         NotificationChannel recordChannel = record.getChannel();
         if (!userEnabledBubbles
                 || appPreference == BUBBLE_PREFERENCE_NONE
-                || !notifCanPresentAsBubble) {
+                || !notifCanPresentAsBubble
+                || record.getSbn().getIsContentSecure()) {
             record.setAllowBubble(false);
             if (!notifCanPresentAsBubble) {
                 // clear out bubble metadata since it can't be used
@@ -154,10 +155,9 @@ public void setActivityManager(ActivityManager manager) {
      */
     @VisibleForTesting
     boolean canPresentAsBubble(NotificationRecord r) {
-        if (!mSupportsBubble) {
+        if (!mSupportsBubble || r.isBubbleUpSuppressedByAppLock()) {
             return false;
         }
-
         Notification notification = r.getNotification();
         Notification.BubbleMetadata metadata = notification.getBubbleMetadata();
         String pkg = r.getSbn().getPackageName();
diff --git a/services/core/java/com/android/server/notification/NotificationAttentionHelper.java b/services/core/java/com/android/server/notification/NotificationAttentionHelper.java
index f8e0f1749a65c..bb3f041fb4103 100644
--- a/services/core/java/com/android/server/notification/NotificationAttentionHelper.java
+++ b/services/core/java/com/android/server/notification/NotificationAttentionHelper.java
@@ -211,6 +211,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,
@@ -380,6 +382,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,
@@ -485,7 +490,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();
@@ -1811,6 +1817,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);
         }
@@ -1830,6 +1838,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/NotificationManagerInternal.java b/services/core/java/com/android/server/notification/NotificationManagerInternal.java
index 695bf612ccc35..8918839f2c894 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerInternal.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerInternal.java
@@ -78,6 +78,9 @@ void cancelNotification(String pkg, String basePkg, int callingUid, int callingP
      */
     void setDeviceEffectsApplier(DeviceEffectsApplier applier);
 
+    void updateSecureNotifications(String pkg, boolean isContentSecure,
+        boolean isBubbleUpSuppressed, int userId);
+
     // Backup/restore interface
     byte[] getBackupPayload(int user, BackupRestoreEventLogger logger);
 
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 216673b8d6f5d..7f2431a4816e8 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -67,6 +67,7 @@
 import static android.app.NotificationManager.ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED;
 import static android.app.NotificationManager.ACTION_NOTIFICATION_POLICY_CHANGED;
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL;
+import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
 import static android.app.NotificationManager.EXTRA_AUTOMATIC_ZEN_RULE_ID;
 import static android.app.NotificationManager.EXTRA_AUTOMATIC_ZEN_RULE_STATUS;
 import static android.app.NotificationManager.EXTRA_NOTIFICATION_POLICY;
@@ -390,6 +391,7 @@
 import com.android.server.IoThread;
 import com.android.server.LocalServices;
 import com.android.server.SystemService;
+import com.android.server.app.AppLockManagerServiceInternal;
 import com.android.server.bitmapoffload.BitmapOffloadInternal;
 import com.android.server.job.JobSchedulerInternal;
 import com.android.server.lights.LightsManager;
@@ -827,6 +829,8 @@ public class NotificationManagerService extends SystemService {
 
     private BitmapOffloadInternal mBitmapOffloader;
 
+    private AppLockManagerServiceInternal mAppLockManagerService = null;
+
     static class Archive {
         final SparseArray<Boolean> mEnabled;
         final int mBufferSize;
@@ -3460,6 +3464,7 @@ void onBootPhase(int phase, Looper mainLooper) {
             }
         } else if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) {
             mSnoozeHelper.scheduleRepostsForPersistedNotifications(System.currentTimeMillis());
+            mAppLockManagerService = LocalServices.getService(AppLockManagerServiceInternal.class);
         } else if (phase == SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY) {
             mPreferencesHelper.updateFixedImportance(mUm.getUsers());
             mPreferencesHelper.migrateNotificationPermissions(mUm.getUsers());
@@ -4455,8 +4460,8 @@ public boolean areBubblesEnabled(UserHandle user) {
         public int getBubblePreferenceForPackage(String pkg, int uid) {
             enforceSystemOrSystemUIOrSamePackage(pkg,
                     "Caller not system or systemui or same package");
-
-            if (UserHandle.getCallingUserId() != UserHandle.getUserId(uid)) {
+            final int userId = UserHandle.getUserId(uid);
+            if (UserHandle.getCallingUserId() != userId) {
                 getContext().enforceCallingPermission(
                         android.Manifest.permission.INTERACT_ACROSS_USERS,
                         "getBubblePreferenceForPackage for uid " + uid);
@@ -5653,7 +5658,8 @@ private StatusBarNotification sanitizeSbn(String pkg, int userId,
                             sbn.getOpPkg(),
                             sbn.getId(), sbn.getTag(), sbn.getUid(), sbn.getInitialPid(),
                             notification,
-                            sbn.getUser(), sbn.getOverrideGroupKey(), sbn.getPostTime());
+                            sbn.getUser(), sbn.getOverrideGroupKey(),
+                            sbn.getPostTime(), sbn.getIsContentSecure());
                 }
             }
             return null;
@@ -7863,6 +7869,8 @@ NotificationRecord createAutoGroupSummary(int userId, String pkg, String trigger
                             0, appIntent, PendingIntent.FLAG_IMMUTABLE, null,
                             pkg, appInfo.uid);
                 }
+                final boolean isContentSecure = mAppLockManagerService != null &&
+                    mAppLockManagerService.shouldRedactNotification(pkg, userId);
                 final StatusBarNotification summarySbn =
                         new StatusBarNotification(adjustedSbn.getPackageName(),
                                 adjustedSbn.getOpPkg(),
@@ -7870,7 +7878,7 @@ NotificationRecord createAutoGroupSummary(int userId, String pkg, String trigger
                                 groupKey, adjustedSbn.getUid(),
                                 adjustedSbn.getInitialPid(), summaryNotification,
                                 adjustedSbn.getUser(), groupKey,
-                                System.currentTimeMillis());
+                                System.currentTimeMillis(), isContentSecure);
                 summaryRecord = new NotificationRecord(getContext(), summarySbn,
                         notificationRecord.getChannel());
                 summaryRecord.setImportanceFixed(isPermissionFixed);
@@ -7882,6 +7890,9 @@ NotificationRecord createAutoGroupSummary(int userId, String pkg, String trigger
                 } else {
                     summaries.put(pkg, summarySbn.getKey());
                 }
+                summaryRecord.setBubbleUpSuppressedByAppLock(
+                    mAppLockManagerService != null &&
+                    mAppLockManagerService.requireUnlock(pkg, userId));
             }
             if (summaryRecord != null && checkDisqualifyingFeatures(userId, uid,
                     summaryRecord.getSbn().getId(), summaryRecord.getSbn().getTag(), summaryRecord,
@@ -8428,6 +8439,32 @@ public void onDisplayRemoveSystemDecorations(int displayId) {
                 }
             }
         }
+
+        public void updateSecureNotifications(String pkg, boolean isContentSecure,
+                boolean isBubbleUpSuppressed, int userId) {
+            mHandler.post(() -> updateSecureNotificationsInternal(pkg, isContentSecure,
+                isBubbleUpSuppressed, userId));
+        }
+
+        private void updateSecureNotificationsInternal(String pkg, boolean isContentSecure,
+                boolean isBubbleUpSuppressed, int userId) {
+            synchronized (mNotificationLock) {
+                for (int i = 0; i < mNotificationList.size(); i++) {
+                    final NotificationRecord nr = mNotificationList.get(i);
+                    final StatusBarNotification sbn = nr.getSbn();
+                    if (UserHandle.getUserId(sbn.getUid()) == userId
+                            && sbn.getPackageName().equals(pkg)) {
+                        if (sbn.getIsContentSecure() != isContentSecure ||
+                                nr.isBubbleUpSuppressedByAppLock() != isBubbleUpSuppressed) {
+                            sbn.setIsContentSecure(isContentSecure);
+                            nr.setBubbleUpSuppressedByAppLock(isBubbleUpSuppressed);
+                            mListeners.notifyPostedLocked(nr, nr);
+                        }
+                    }
+                }
+            }
+            mRankingHandler.requestSort();
+        }
     };
 
     private static boolean isBigPictureWithBitmapOrIcon(Notification n) {
@@ -8680,9 +8717,11 @@ private boolean enqueueNotificationInternal(final String pkg, final String opPkg
 
         mUsageStats.registerEnqueuedByApp(pkg);
 
+        final boolean isContentSecure = mAppLockManagerService != null &&
+            mAppLockManagerService.shouldRedactNotification(pkg, userId);
         final StatusBarNotification n = new StatusBarNotification(
                 pkg, opPkg, id, tag, notificationUid, callingPid, notification,
-                user, null, System.currentTimeMillis());
+                user, null, System.currentTimeMillis(), isContentSecure);
 
         // setup local book-keeping
         String channelId = notification.getChannelId();
@@ -8724,6 +8763,8 @@ private boolean enqueueNotificationInternal(final String pkg, final String opPkg
         r.setPostSilently(postSilently);
         r.setFlagBubbleRemoved(false);
         r.setPkgAllowedAsConvo(mMsgPkgsAllowedAsConvos.contains(pkg));
+        r.setBubbleUpSuppressedByAppLock(mAppLockManagerService != null &&
+            mAppLockManagerService.requireUnlock(pkg, userId));
         boolean isImportanceFixed = mPermissionHelper.isPermissionFixed(pkg, userId);
         r.setImportanceFixed(isImportanceFixed);
         if (notification.isFgsOrUij()) {
@@ -10830,7 +10871,8 @@ void handleRankingSort() {
                         r.isConversation(),
                         r.getProposedImportance(),
                         r.hasSensitiveContent(),
-                        r.getSummarization());
+                        r.getSummarization(),
+                        r.isBubbleUpSuppressedByAppLock());
                 extractorDataBefore.put(r.getKey(), extractorData);
                 mRankingHelper.extractSignals(r);
             }
diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java
index d5bdd1bd95f7b..62f7eb58419c8 100644
--- a/services/core/java/com/android/server/notification/NotificationRecord.java
+++ b/services/core/java/com/android/server/notification/NotificationRecord.java
@@ -219,6 +219,8 @@ public final class NotificationRecord {
     // lifetime extended.
     private boolean mCanceledAfterLifetimeExtension = false;
 
+    private boolean mIsBubbleUpSuppressedByAppLock = false;
+
     // type of the bundle if the notification was classified
     private @Adjustment.Types int mBundleType = Adjustment.TYPE_OTHER;
 
@@ -1792,6 +1794,14 @@ private KeyguardManager getKeyguardManager() {
         return mKeyguardManager;
     }
 
+    public void setBubbleUpSuppressedByAppLock(boolean suppressed) {
+        mIsBubbleUpSuppressedByAppLock = suppressed;
+    }
+
+    public boolean isBubbleUpSuppressedByAppLock() {
+        return mIsBubbleUpSuppressedByAppLock;
+    }
+
     @VisibleForTesting
     static final class Light {
         public final int color;
diff --git a/services/core/java/com/android/server/notification/NotificationRecordExtractorData.java b/services/core/java/com/android/server/notification/NotificationRecordExtractorData.java
index 9315ddc0d5b05..ae9a8474c234f 100644
--- a/services/core/java/com/android/server/notification/NotificationRecordExtractorData.java
+++ b/services/core/java/com/android/server/notification/NotificationRecordExtractorData.java
@@ -41,6 +41,7 @@ public final class NotificationRecordExtractorData {
     private final ArrayList<Notification.Action> mSystemSmartActions;
     private final ArrayList<CharSequence> mSmartReplies;
     private final int mImportance;
+    private final boolean mIsBubbleUpSuppressedByAppLock;
 
     // These fields may not trigger a reranking but diffs here may be logged.
     private final float mRankingScore;
@@ -56,7 +57,8 @@ public final class NotificationRecordExtractorData {
             ArrayList<Notification.Action> systemSmartActions,
             ArrayList<CharSequence> smartReplies, int importance, float rankingScore,
             boolean isConversation, int proposedImportance, boolean sensitiveContent,
-            String summarization) {
+            String summarization,
+            boolean isBubbleUpSuppressedByAppLock) {
         mPosition = position;
         mVisibility = visibility;
         mShowBadge = showBadge;
@@ -76,6 +78,7 @@ public final class NotificationRecordExtractorData {
         mProposedImportance = proposedImportance;
         mSensitiveContent = sensitiveContent;
         mSummarization = summarization;
+        mIsBubbleUpSuppressedByAppLock = isBubbleUpSuppressedByAppLock;
     }
 
     // Returns whether the provided NotificationRecord differs from the cached data in any way.
@@ -97,7 +100,8 @@ boolean hasDiffForRankingLocked(NotificationRecord r, int newPosition) {
                 || mImportance != r.getImportance()
                 || mProposedImportance != r.getProposedImportance()
                 || mSensitiveContent != r.hasSensitiveContent()
-                || !Objects.equals(mSummarization, r.getSummarization());
+                || !Objects.equals(mSummarization, r.getSummarization())
+                || mIsBubbleUpSuppressedByAppLock != r.isBubbleUpSuppressedByAppLock();
     }
 
     // Returns whether the NotificationRecord has a change from this data for which we should
@@ -122,6 +126,7 @@ boolean hasDiffForLoggingLocked(NotificationRecord r, int newPosition) {
                 || mIsConversation != r.isConversation()
                 || mProposedImportance != r.getProposedImportance()
                 || mSensitiveContent != r.hasSensitiveContent()
-                || !Objects.equals(mSummarization, r.getSummarization());
+                || !Objects.equals(mSummarization, r.getSummarization())
+                || mIsBubbleUpSuppressedByAppLock != r.isBubbleUpSuppressedByAppLock();
     }
 }
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..068c971c0402a 100644
--- a/services/core/java/com/android/server/pm/AppsFilterBase.java
+++ b/services/core/java/com/android/server/pm/AppsFilterBase.java
@@ -433,11 +433,13 @@ protected boolean shouldFilterApplicationInternal(Computer snapshot, int calling
             if (callingSetting instanceof PackageStateInternal) {
                 final PackageStateInternal packageState = (PackageStateInternal) callingSetting;
                 if (packageState.hasSharedUser()) {
-                    callingPkgSetting = null;
                     final SharedUserApi sharedUserApi =
                             snapshot.getSharedUser(packageState.getSharedUserAppId());
                     if (sharedUserApi != null) {
                         callingSharedPkgSettings.addAll(sharedUserApi.getPackageStates());
+                        callingPkgSetting = null;
+                    } else {
+                        callingPkgSetting = packageState;
                     }
                 } else {
                     callingPkgSetting = packageState;
diff --git a/services/core/java/com/android/server/pm/AppsFilterImpl.java b/services/core/java/com/android/server/pm/AppsFilterImpl.java
index befbf15e77938..e09404d823279 100644
--- a/services/core/java/com/android/server/pm/AppsFilterImpl.java
+++ b/services/core/java/com/android/server/pm/AppsFilterImpl.java
@@ -54,6 +54,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;
@@ -114,7 +115,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
@@ -124,7 +125,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
@@ -625,10 +626,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);
@@ -638,9 +639,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());
                 }
             }
         }
@@ -652,10 +656,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());
@@ -664,9 +668,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());
                 }
             }
         }
@@ -1155,8 +1162,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);
                         }
                     }
@@ -1166,8 +1177,12 @@ private void removePackageInternal(Computer snapshot, PackageStateInternal setti
                 for (ParsedUsesPermission usesPermission : setting.getPkg().getUsesPermissions()) {
                     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 266ecf311d0f0..cbb549cd1da29 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;
@@ -150,6 +151,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;
@@ -431,6 +433,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;
@@ -1490,23 +1496,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) {
@@ -2784,6 +2789,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());
@@ -5203,6 +5218,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();
     }
 
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 381d797fa9015..d01905ce4ed6e 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -1645,7 +1645,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();
@@ -2916,8 +2916,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 a875ce7b63dd3..0ba2f04e92865 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -127,6 +127,7 @@
 import com.android.internal.util.SizedInputStream;
 import com.android.server.LocalServices;
 import com.android.server.SystemService;
+import com.android.server.app.AppLockManagerServiceInternal;
 import com.android.server.pm.pkg.AndroidPackage;
 import com.android.server.pm.pkg.ArchiveState;
 import com.android.server.pm.pkg.PackageStateInternal;
@@ -257,6 +258,8 @@ static class LauncherAppsImpl extends ILauncherApps.Stub {
         private final RemoteCallbackList<IDumpCallback> mDumpCallbacks =
                 new RemoteCallbackList<>();
 
+        private final AppLockManagerServiceInternal mAppLockManagerInternal;
+
         public LauncherAppsImpl(Context context) {
             mContext = context;
             mIPM = AppGlobals.getPackageManager();
@@ -281,6 +284,7 @@ public LauncherAppsImpl(Context context) {
             mCallbackHandler = BackgroundThread.getHandler();
             mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
             mInternal = new LocalService();
+            mAppLockManagerInternal = getAppLockInternal();
             registerSettingsObserver();
         }
 
@@ -313,6 +317,11 @@ private int getCallingUserId() {
             return UserHandle.getUserId(injectBinderCallingUid());
         }
 
+        private AppLockManagerServiceInternal getAppLockInternal() {
+            if (mAppLockManagerInternal != null) return mAppLockManagerInternal;
+            return LocalServices.getService(AppLockManagerServiceInternal.class);
+        }
+
         /*
          * @see android.content.pm.ILauncherApps#addOnAppsChangedListener
          */
@@ -1004,6 +1013,10 @@ private List<ApplicationInfo> getApplicationInfoForArchivedApp(
 
         private List<LauncherActivityInfoInternal> queryIntentLauncherActivities(
                 Intent intent, int callingUid, UserHandle user) {
+            final Set<String> hiddenApps =
+                    getAppLockInternal() != null
+                            ? getAppLockInternal().getHiddenPackages(user.getIdentifier())
+                            : Collections.emptySet();
             final List<ResolveInfo> apps = mPackageManagerInternal.queryIntentActivities(intent,
                     intent.resolveTypeIfNeeded(mContext.getContentResolver()),
                     PackageManager.MATCH_DIRECT_BOOT_AWARE
@@ -1018,6 +1031,10 @@ private List<LauncherActivityInfoInternal> queryIntentLauncherActivities(
                     // should not happen
                     continue;
                 }
+                if (hiddenApps.contains(packageName)) {
+                    if (DEBUG) Slog.d(TAG, "Skipping package " + packageName);
+                    continue;
+                }
                 final IncrementalStatesInfo incrementalStatesInfo =
                         mPackageManagerInternal.getIncrementalStatesInfo(packageName, callingUid,
                                 user.getIdentifier());
diff --git a/services/core/java/com/android/server/pm/PackageHandler.java b/services/core/java/com/android/server/pm/PackageHandler.java
index 7b1eb58d25f47..0f821d3649b71 100644
--- a/services/core/java/com/android/server/pm/PackageHandler.java
+++ b/services/core/java/com/android/server/pm/PackageHandler.java
@@ -80,15 +80,14 @@ void doHandleMessage(Message msg) {
                 break;
             }
             case POST_INSTALL: {
-                if (DEBUG_INSTALL) Log.v(TAG, "Handling post-install for " + msg.arg1);
-
                 final InstallRequest request;
-                final int token;
-                final boolean didRestore;
+                final int token = msg.arg1;
+                final boolean didRestore = (msg.arg2 != 0);
+
+                if (DEBUG_INSTALL) Log.v(TAG, "Handling post-install for " + token);
+
                 synchronized (mPm.mRunningInstalls) {
-                    request= mPm.mRunningInstalls.get(msg.arg1);
-                    token = msg.arg1;
-                    didRestore = (msg.arg2 != 0);
+                    request= mPm.mRunningInstalls.get(token);
                     mPm.mRunningInstalls.delete(token);
                 }
 
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ddcec001736a2..729b7d06b4e7d 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2307,7 +2307,7 @@ public Set<String> getInstallConstraintsAllowlist() {
             }
 
             mCacheDir = PackageManagerServiceUtils.preparePackageParserCache(
-                    mIsEngBuild, mIsUserDebugBuild, mIncrementalVersion);
+                    mIsEngBuild, mIsUserDebugBuild, mIncrementalVersion, mIsUpgrade);
 
             mInitialNonStoppedSystemPackages = mInjector.getSystemConfig()
                     .getInitialNonStoppedSystemPackages();
@@ -6994,16 +6994,6 @@ public void setDeviceAndProfileOwnerPackages(
                 SparseArray<String> profileOwnerPackages) {
             mProtectedPackages.setDeviceAndProfileOwnerPackages(
                     deviceOwnerUserId, deviceOwnerPackage, profileOwnerPackages);
-            final ArraySet<Integer> usersWithPoOrDo = new ArraySet<>();
-            if (deviceOwnerPackage != null) {
-                usersWithPoOrDo.add(deviceOwnerUserId);
-            }
-            final int sz = profileOwnerPackages.size();
-            for (int i = 0; i < sz; i++) {
-                if (profileOwnerPackages.valueAt(i) != null) {
-                    removeAllNonSystemPackageSuspensions(profileOwnerPackages.keyAt(i));
-                }
-            }
         }
 
         @Override
diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index d9d935a200581..bfd7fdbaad59c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
@@ -1326,7 +1326,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;
@@ -1357,7 +1357,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());
@@ -1382,7 +1382,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/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index e37e897182082..d2e2b2bf4eb20 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -333,7 +333,6 @@ public boolean isGranted(@NonNull String permission, @NonNull PackageInfo pkg,
                 return mContext.getPackageManager().getPackageInfo(pkg,
                         DEFAULT_PACKAGE_INFO_QUERY_FLAGS);
             } catch (NameNotFoundException e) {
-                Slog.e(TAG, "Package not found: " + pkg);
                 return null;
             }
         }
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/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index f96fb4fa6011e..51697c24499ac 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -86,6 +86,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;
@@ -188,6 +189,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;
@@ -241,6 +244,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;
@@ -256,6 +260,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;
@@ -267,6 +272,7 @@
 
 import dalvik.system.PathClassLoader;
 
+import lineageos.hardware.LineageHardwareManager;
 import lineageos.providers.LineageSettings;
 
 import org.lineageos.internal.buttons.LineageButtons;
@@ -296,6 +302,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;
@@ -335,6 +342,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
@@ -416,6 +424,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 = 10 * 60 * 1000L; // 10 minutes
+    private long lastGcTime = 0L;
+
     /**
      * Keyguard stuff
      */
@@ -668,12 +682,17 @@ public void onDrawn() {
 
     boolean mMenuPressed;
     boolean mAssistPressed;
-    boolean mAppSwitchLongPressed;
     Intent mHomeIntent;
     Intent mCarDockIntent;
     Intent mDeskDockIntent;
     Intent mVrHeadsetHomeIntent;
 
+    // User defined hw key config
+    boolean mHardwareKeysDisable = false;
+    boolean mSwapCapacitiveKeys = false;
+    ANBIHandler mANBIHandler;
+    private boolean mANBIEnabled;
+
     // Tracks user-customisable behavior for certain key events
     private Action mBackLongPressAction;
     private Action mHomeLongPressAction;
@@ -684,7 +703,10 @@ public void onDrawn() {
     private Action mAssistLongPressAction;
     private Action mAppSwitchPressAction;
     private Action mAppSwitchLongPressAction;
+    private Action mAppSwitchDoubleTapAction;
+    private Action mCornerLongSwipeAction;
     private Action mEdgeLongSwipeAction;
+    private Action mThreeFingersSwipeAction;
 
     // support for activating the lock screen while the screen is on
     private HashSet<Integer> mAllowLockscreenWhenOnDisplays = new HashSet<>();
@@ -758,6 +780,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 =
@@ -812,9 +836,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) {
@@ -1032,9 +1087,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);
@@ -1059,6 +1123,18 @@ void observe() {
             resolver.registerContentObserver(LineageSettings.System.getUriFor(
                     LineageSettings.System.VOLUME_ANSWER_CALL), 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.HARDWARE_KEYS_DISABLE), false, 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);
             updateSettings();
         }
 
@@ -1685,6 +1761,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;
         }
     }
 
@@ -1703,7 +1785,10 @@ private void powerVeryLongPress() {
     }
 
     private void backLongPress() {
-        if (hasLongPressOnBackBehavior()) {
+        if (unpinActivity()) {
+            mBackKeyHandled = true;
+            performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Back - Long Press");
+        } else if (hasLongPressOnBackBehavior()) {
             mBackKeyHandled = true;
 
             long now = SystemClock.uptimeMillis();
@@ -1716,6 +1801,47 @@ private void backLongPress() {
         }
     }
 
+    private void appSwitchPress(int count) {
+        if (count == 1 && mAppSwitchPressAction != Action.NOTHING && !keyguardOn()) {
+            if (mAppSwitchPressAction != 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(mAppSwitchPressAction, event);
+        } else if (count == 2 && mAppSwitchDoubleTapAction != Action.NOTHING && !keyguardOn()) {
+            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);
+        }
+    }
+
+    private void appSwitchLongPress() {
+        if (!keyguardOn() && mAppSwitchLongPressAction != Action.NOTHING) {
+            if (mAppSwitchLongPressAction != 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);
+
+            performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
+                    "Recents - Long Press");
+            performKeyAction(mAppSwitchLongPressAction, event);
+        }
+    }
+
     private void sleepPress() {
         if (mShortPressOnSleepBehavior == SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME) {
             launchHomeFromHotKey(DEFAULT_DISPLAY, false /* awakenDreams */,
@@ -1767,6 +1893,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 &&
@@ -2012,10 +2142,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.
@@ -2217,7 +2351,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);
@@ -2240,6 +2374,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;
         }
@@ -2489,6 +2644,9 @@ 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 =
@@ -2530,9 +2688,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);
@@ -2898,6 +3056,40 @@ void onKeyGesture(@NonNull SingleKeyGestureEvent event) {
         }
     }
 
+    /**
+     * Rule for single back key gesture.
+     */
+    private final class AppSwitchKeyRule extends SingleKeyGestureDetector.SingleKeyRule {
+        AppSwitchKeyRule() {
+            super(KeyEvent.KEYCODE_APP_SWITCH);
+        }
+
+        @Override
+        boolean supportLongPress() {
+            return mAppSwitchLongPressAction != Action.NOTHING;
+        }
+
+        @Override
+        int getMaxMultiPressCount() {
+            return mAppSwitchDoubleTapAction != Action.NOTHING ? 2 : 1;
+        }
+
+        @Override
+        void onKeyGesture(@NonNull SingleKeyGestureEvent event) {
+            if (event.getAction() != ACTION_COMPLETE) {
+                return;
+            }
+            switch (event.getType()) {
+                case SINGLE_KEY_GESTURE_TYPE_PRESS:
+                    appSwitchPress(event.getPressCount());
+                    break;
+                case SINGLE_KEY_GESTURE_TYPE_LONG_PRESS:
+                    appSwitchLongPress();
+                    break;
+            }
+        }
+    }
+
     /**
      * Rule for single stem primary key gesture.
      */
@@ -3113,19 +3305,25 @@ private void initSingleKeyGestureRules(Looper looper) {
         mSingleKeyGestureDetector.addRule(new PowerKeyRule());
         mSingleKeyGestureDetector.addRule(new StylusTailButtonRule());
         mSingleKeyGestureDetector.addRule(new BackKeyRule());
+        mSingleKeyGestureDetector.addRule(new AppSwitchKeyRule());
     }
 
     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();
 
         // Initialize all assignments to sane defaults.
+        mCornerLongSwipeAction = Action.SEARCH;
+
         mEdgeLongSwipeAction = Action.NOTHING;
 
         mMenuPressAction = Action.MENU;
@@ -3142,28 +3340,18 @@ private void updateKeyAssignments() {
         mAppSwitchPressAction = Action.APP_SWITCH;
         mAppSwitchLongPressAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior));
+        mAppSwitchDoubleTapAction = Action.LAST_APP;
 
         mBackLongPressAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_longPressOnBackBehavior));
-        if (mBackLongPressAction.ordinal() > Action.SLEEP.ordinal()) {
-            mBackLongPressAction = Action.NOTHING;
-        }
-
         mBackLongPressAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_BACK_LONG_PRESS_ACTION,
                 mBackLongPressAction);
 
         mHomeLongPressAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_longPressOnHomeBehavior));
-        if (mHomeLongPressAction.ordinal() > Action.SLEEP.ordinal()) {
-            mHomeLongPressAction = Action.NOTHING;
-        }
-
         mHomeDoubleTapAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_doubleTapOnHomeBehavior));
-        if (mHomeDoubleTapAction.ordinal() > Action.SLEEP.ordinal()) {
-            mHomeDoubleTapAction = Action.NOTHING;
-        }
 
         mHomeLongPressAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_HOME_LONG_PRESS_ACTION,
@@ -3188,19 +3376,44 @@ private void updateKeyAssignments() {
                     LineageSettings.System.KEY_ASSIST_LONG_PRESS_ACTION,
                     mAssistLongPressAction);
         }
-        if (hasAppSwitch) {
-            mAppSwitchPressAction = Action.fromSettings(resolver,
-                    LineageSettings.System.KEY_APP_SWITCH_ACTION,
-                    mAppSwitchPressAction);
-            mAppSwitchLongPressAction = Action.fromSettings(resolver,
-                    LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION,
-                    mAppSwitchLongPressAction);
-        }
+        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
+            }
+        }
+
         mShortPressOnWindowBehavior = SHORT_PRESS_WINDOW_NOTHING;
         if (mPackageManager.hasSystemFeature(FEATURE_PICTURE_IN_PICTURE)) {
             mShortPressOnWindowBehavior = SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE;
@@ -3304,6 +3517,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
@@ -3377,6 +3615,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;
@@ -3812,40 +4053,6 @@ private boolean interceptSystemKeysAndShortcuts(IBinder focusedToken, KeyEvent e
                     }
                 }
 
-                return true;
-            case KeyEvent.KEYCODE_APP_SWITCH:
-                if (!keyguardOn) {
-                    if (down) {
-                        if (mAppSwitchPressAction == Action.APP_SWITCH
-                                || mAppSwitchLongPressAction == Action.APP_SWITCH) {
-                            preloadRecentApps();
-                        }
-                        if (repeatCount == 0) {
-                            mAppSwitchLongPressed = false;
-                        } else if (longPress) {
-                            if (!keyguardOn && mAppSwitchLongPressAction != Action.NOTHING) {
-                                if (mAppSwitchLongPressAction != Action.APP_SWITCH) {
-                                    cancelPreloadRecentApps();
-                                }
-                                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
-                                        "Recents - Long Press");
-                                performKeyAction(mAppSwitchLongPressAction, event);
-                                mAppSwitchLongPressed = true;
-                            }
-                        }
-                    } else {
-                        if (mAppSwitchLongPressed) {
-                            mAppSwitchLongPressed = false;
-                        } else {
-                            if (mAppSwitchPressAction != Action.APP_SWITCH) {
-                                cancelPreloadRecentApps();
-                            }
-                            if (!canceled) {
-                                performKeyAction(mAppSwitchPressAction, event);
-                            }
-                        }
-                    }
-                }
                 return true;
             case KeyEvent.KEYCODE_VOLUME_UP:
             case KeyEvent.KEYCODE_VOLUME_DOWN:
@@ -3891,7 +4098,6 @@ private boolean interceptSystemKeysAndShortcuts(IBinder focusedToken, KeyEvent e
     @SuppressLint("MissingPermission")
     private void initKeyGestures() {
         List<Integer> supportedGestures = new ArrayList<>(List.of(
-                KeyGestureEvent.KEY_GESTURE_TYPE_APP_SWITCH,
                 KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT,
                 KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT,
                 KeyGestureEvent.KEY_GESTURE_TYPE_HOME,
@@ -4285,6 +4491,20 @@ private boolean dispatchKeyToKeyHandlers(KeyEvent event) {
         return false;
     }
 
+    private boolean unpinActivity() {
+        if (!hasNavigationBar()) {
+            try {
+                if (ActivityTaskManager.getService().isInLockTaskMode()) {
+                    ActivityTaskManager.getService().stopSystemLockTaskMode();
+                    return true;
+                }
+            } catch (RemoteException e) {
+                // ignore
+            }
+        }
+        return false;
+    }
+
     // TODO(b/117479243): handle it in InputPolicy
     /** {@inheritDoc} */
     @Override
@@ -4895,11 +5115,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
@@ -5041,6 +5292,12 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                     // focus before processing the back event.
                     mWindowManagerInternal.moveFocusToAdjacentEmbeddedActivityIfNeeded();
                     mBackKeyHandled = false;
+
+                    // Don't pass repeated events to app if user has custom long press action
+                    // set up in settings
+                    if (event.getRepeatCount() > 0 && hasLongPressOnBackBehavior()) {
+                        result &= ~ACTION_PASS_TO_USER;
+                    }
                 } else {
                     if (!hasLongPressOnBackBehavior()) {
                         mBackKeyHandled |= backKeyPress();
@@ -5053,6 +5310,19 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                 break;
             }
 
+            case KeyEvent.KEYCODE_APP_SWITCH: {
+                if (!keyguardOn()) {
+                    if (down) {
+                        if (mAppSwitchPressAction == Action.APP_SWITCH
+                                || mAppSwitchLongPressAction == Action.APP_SWITCH
+                                || mAppSwitchDoubleTapAction == Action.APP_SWITCH) {
+                            preloadRecentApps();
+                        }
+                    }
+                }
+                break;
+            }
+
             case KeyEvent.KEYCODE_VOLUME_DOWN:
             case KeyEvent.KEYCODE_VOLUME_UP:
             case KeyEvent.KEYCODE_VOLUME_MUTE: {
@@ -5144,6 +5414,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) {
@@ -5193,6 +5480,7 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                         }
                         isWakeKey = true;
                         startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF);
+                        performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Camera key - Launch Camera");
                     }
                 }
                 break;
@@ -5964,6 +6252,11 @@ public void startedGoingToSleep(int displayGroupId,
         if (mKeyguardDelegate != null) {
             mKeyguardDelegate.onStartedGoingToSleep(pmSleepReason);
         }
+        if (mPocketManager != null) {
+            mPocketManager.onInteractiveChanged(false);
+        }
+
+        mHandler.removeCallbacks(mMemoryOpt);
     }
 
     // Called on the PowerManager's Notifier thread.
@@ -6003,6 +6296,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.
@@ -6019,6 +6315,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);
+
         mIsGoingToSleepDefaultDisplay = false;
         mDefaultDisplayPolicy.setAwake(true);
 
@@ -6037,6 +6339,10 @@ public void startedWakingUp(int displayGroupId, @WakeReason int pmWakeReason) {
         }
 
         mPowerButtonLaunchGestureTriggered = false;
+
+        if (mPocketManager != null) {
+            mPocketManager.onInteractiveChanged(true);
+        }
     }
 
     // Called on the PowerManager's Notifier thread.
@@ -6060,6 +6366,27 @@ 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();
+                lastGcTime = currentTime;
+                Log.v("GcOpt", "performing garbage collection for system_server");
+            }
+        }
+    };
+
     private boolean shouldWakeUpWithHomeIntent() {
         if (mWakeUpToLastStateTimeout <= 0) {
             return false;
@@ -6330,6 +6657,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) {
@@ -6488,6 +6881,12 @@ 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);
@@ -6500,6 +6899,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();
@@ -7581,4 +7998,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/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index 5b55075e81d3c..d9d53d9cc2bfb 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;
@@ -256,8 +254,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);
@@ -960,7 +956,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");
         }
@@ -968,7 +964,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);
     }
 
@@ -1190,7 +1187,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);
             }
 
@@ -1219,18 +1217,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();
     }
 
@@ -1554,7 +1563,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 5f7dbcc50aa4d..04f10ac476a37 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -735,6 +735,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;
 
@@ -1223,6 +1226,9 @@ interface PowerPropertiesWrapper {
     private static native boolean nativeSetPowerMode(int mode, boolean enabled);
     private static native boolean nativeForceSuspend();
 
+    // overrule and disable brightness for buttons
+    private boolean mHardwareKeysDisable = false;
+
     // Whether proximity check on wake is enabled by default
     private boolean mProximityWakeEnabledByDefaultConfig;
 
@@ -1569,6 +1575,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);
@@ -1595,6 +1604,9 @@ private void systemReady() {
         resolver.registerContentObserver(LineageSettings.Secure.getUriFor(
                 LineageSettings.Secure.KEYBOARD_BRIGHTNESS),
                 false, mSettingsObserver, UserHandle.USER_ALL);
+        resolver.registerContentObserver(Settings.System.getUriFor(
+                Settings.System.HARDWARE_KEYS_DISABLE),
+                false, mSettingsObserver, UserHandle.USER_ALL);
 
         // Register for broadcasts from other components of the system.
         IntentFilter filter = new IntentFilter();
@@ -1707,7 +1719,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,
@@ -1742,6 +1756,10 @@ private void updateSettingsLocked() {
                 LineageSettings.Secure.KEYBOARD_BRIGHTNESS, mKeyboardBrightnessDefault,
                 UserHandle.USER_CURRENT);
 
+        mHardwareKeysDisable = Settings.System.getIntForUser(resolver,
+                Settings.System.HARDWARE_KEYS_DISABLE, 0,
+                UserHandle.USER_CURRENT) != 0;
+
         mDirty |= DIRTY_SETTINGS;
     }
 
@@ -2853,7 +2871,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);
@@ -2917,6 +2935,11 @@ && getGlobalWakefulnessLocked() == WAKEFULNESS_DREAMING
             return false;
         }
 
+        // On Always On Charging, SystemUI shows the charging indicator
+        if (mAlwaysOnChargingEnabled && mIsPowered && getGlobalWakefulnessLocked() == WAKEFULNESS_DOZING) {
+            return false;
+        }
+
         // Otherwise wake up!
         return true;
     }
@@ -3204,15 +3227,17 @@ private void updateUserActivitySummaryLocked(long now, int dirty) {
                         if (wakefulness == WAKEFULNESS_AWAKE) {
                             if (mButtonsLight != null) {
                                 float buttonBrightness = BRIGHTNESS_OFF_FLOAT;
-                                if (isValidBrightness(
-                                        mButtonBrightnessOverrideFromWindowManager)) {
-                                    if (mButtonBrightnessOverrideFromWindowManager >
-                                            PowerManager.BRIGHTNESS_MIN) {
-                                        buttonBrightness =
-                                                mButtonBrightnessOverrideFromWindowManager;
+                                if (!mHardwareKeysDisable) {
+                                    if (isValidBrightness(
+                                            mButtonBrightnessOverrideFromWindowManager)) {
+                                        if (mButtonBrightnessOverrideFromWindowManager >
+                                                PowerManager.BRIGHTNESS_MIN) {
+                                            buttonBrightness =
+                                                    mButtonBrightnessOverrideFromWindowManager;
+                                        }
+                                    } else if (isValidButtonBrightness(mButtonBrightness)) {
+                                        buttonBrightness = mButtonBrightness;
                                     }
-                                } else if (isValidButtonBrightness(mButtonBrightness)) {
-                                    buttonBrightness = mButtonBrightness;
                                 }
 
                                 if (!mButtonLightOnKeypressOnly) {
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/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
index 2286a6c711c77..7a6fa10625228 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];
                 }
             }
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/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 7f1c4511d254a..9b06a84d937d2 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -1023,6 +1023,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() {
@@ -1979,6 +1990,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();
@@ -2783,6 +2812,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/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index c0e76f6c65d2c..055814ba70290 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -90,6 +90,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.server.LocalServices;
 import com.android.server.SystemService;
+import com.android.server.app.AppLockManagerServiceInternal;
 import com.android.server.locksettings.LockSettingsInternal;
 import com.android.server.locksettings.LockSettingsStateListener;
 import com.android.server.pm.UserManagerInternal;
@@ -285,6 +286,8 @@ public void onAuthenticationFailed(int userId) {
     private ServiceWatcher mSignificantPlaceServiceWatcher;
     private volatile boolean mIsInSignificantPlace = false;
 
+    private AppLockManagerServiceInternal mAppLockManagerService = null;
+
     /**
      * A class for providing dependencies to {@link TrustManagerService} in both production and test
      * cases.
@@ -1083,7 +1086,15 @@ private void refreshDeviceLockedForUser(int userId, int unlockedUser) {
             }
 
             setDeviceLockedForUser(id, deviceLocked);
+            getAppLockManagerService().notifyDeviceLocked(deviceLocked, id);
+        }
+    }
+
+    private AppLockManagerServiceInternal getAppLockManagerService() {
+        if (mAppLockManagerService == null) {
+            mAppLockManagerService = LocalServices.getService(AppLockManagerServiceInternal.class);
         }
+        return mAppLockManagerService;
     }
 
     private void setDeviceLockedForUser(@UserIdInt int userId, boolean locked) {
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 46b37c286869b..d52a3093190bd 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1080,17 +1080,21 @@ private void appendConnectorWithCondition(Predicate<Display> tester) {
         }
 
         void forEachDisplayConnector(Consumer<DisplayConnector> action) {
-            for (int i = mDisplayConnector.size() - 1; i >= 0; i--) {
-                final DisplayConnector connector = mDisplayConnector.valueAt(i);
-                action.accept(connector);
+            synchronized (mLock) {
+                for (int i = mDisplayConnector.size() - 1; i >= 0; i--) {
+                    final DisplayConnector connector = mDisplayConnector.valueAt(i);
+                    action.accept(connector);
+                }
             }
         }
 
         int getConnectedEngineSize() {
             int engineSize = 0;
-            for (int i = mDisplayConnector.size() - 1; i >= 0; i--) {
-                final DisplayConnector connector = mDisplayConnector.valueAt(i);
-                if (connector.mEngine != null) engineSize++;
+            synchronized (mLock) {
+                for (int i = mDisplayConnector.size() - 1; i >= 0; i--) {
+                    final DisplayConnector connector = mDisplayConnector.valueAt(i);
+                    if (connector.mEngine != null) engineSize++;
+                }
             }
             return engineSize;
         }
diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java
index 9e8dc2690a9d5..cfe352a0157e8 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;
@@ -113,7 +114,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;
             }
@@ -182,6 +183,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;
@@ -208,12 +218,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() {
@@ -691,7 +708,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 86dcb484e6839..b7fdea75660c8 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -9714,4 +9714,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/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
index a19f4388a7c8e..7805d8949c106 100644
--- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
+++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
@@ -72,6 +72,7 @@
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.server.LocalServices;
 import com.android.server.am.ActivityManagerService;
+import com.android.server.app.AppLockManagerServiceInternal;
 import com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptResult;
 
 /**
@@ -255,6 +256,9 @@ boolean intercept(Intent intent, ResolveInfo rInfo, ActivityInfo aInfo, String r
             // intent is not in the correct format.
             return true;
         }
+        if (interceptLockedAppIfNeeded()) {
+            return true;
+        }
 
         final SparseArray<ActivityInterceptorCallback> callbacks =
                 mService.getActivityInterceptorCallbacks();
@@ -642,4 +646,49 @@ private ActivityInterceptorCallback.ActivityInterceptorInfo getInterceptorInfo(
                 .build();
     }
 
+    private AppLockManagerServiceInternal getAppLockManagerService() {
+        return mService.getAppLockManagerService();
+    }
+
+    private boolean interceptLockedAppIfNeeded() {
+        if (getAppLockManagerService() == null) return false;
+        final Intent interceptingIntent = getAppLockManagerService().interceptActivity(getInterceptorInfo(null));
+        if (interceptingIntent == null) {
+            return false;
+        }
+        mIntent = interceptingIntent;
+        mCallingPid = mRealCallingPid;
+        mCallingUid = mRealCallingUid;
+        mResolvedType = null;
+        final TaskFragment taskFragment = getLaunchTaskFragment();
+        // If we are intercepting and there was a task, convert it into an extra for the
+        // ConfirmCredentials intent and unassign it, as otherwise the task will move to
+        // front even if ConfirmCredentials is cancelled.
+        if (mInTask != null) {
+            mIntent.putExtra(EXTRA_TASK_ID, mInTask.mTaskId);
+            mInTask = null;
+        } else if (taskFragment != null) {
+            // If the original intent is started to an embedded TaskFragment, append its parent task
+            // id to extra. It is to embed back the original intent to the TaskFragment with the
+            // same task.
+            final Task parentTask = taskFragment.getTask();
+            if (parentTask != null) {
+                mIntent.putExtra(EXTRA_TASK_ID, parentTask.mTaskId);
+            }
+        }
+        if (mActivityOptions == null) {
+            mActivityOptions = ActivityOptions.makeBasic();
+        }
+
+        final UserInfo parent = mUserManager.getProfileParent(mUserId);
+        if (parent != null) {
+            mRInfo = mSupervisor.resolveIntent(mIntent, mResolvedType, parent.id, 0,
+                    mRealCallingUid, mRealCallingPid);
+        } else {
+            mRInfo = mSupervisor.resolveIntent(mIntent, mResolvedType, mUserId, 0,
+                    mRealCallingUid, mRealCallingPid);
+        }
+        mAInfo = mSupervisor.resolveActivity(mIntent, mRInfo, mStartFlags, null /*profilerInfo*/);
+        return true;
+    }
 }
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java
index 21b730e135854..70a5522157cb0 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java
@@ -803,4 +803,6 @@ public abstract void unregisterCompatScaleProvider(
 
     /** Returns whether assist data is allowed. */
     public abstract boolean isAssistDataAllowed();
+
+    public abstract boolean isVisibleActivity(IBinder activityToken);
 }
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index fdb7369d7a96d..ea610cb0e7756 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -199,6 +199,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;
@@ -264,6 +265,7 @@
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.FastPrintWriter;
 import com.android.internal.util.FrameworkStatsLog;
+import com.android.internal.util.crdroid.cutout.CutoutFullscreenController;
 import com.android.internal.util.function.pooled.PooledLambda;
 import com.android.server.LocalManagerRegistry;
 import com.android.server.LocalServices;
@@ -280,6 +282,7 @@
 import com.android.server.am.PendingIntentController;
 import com.android.server.am.PendingIntentRecord;
 import com.android.server.am.UserState;
+import com.android.server.app.AppLockManagerServiceInternal;
 import com.android.server.firewall.IntentFirewall;
 import com.android.server.grammaticalinflection.GrammaticalInflectionManagerInternal;
 import com.android.server.pm.UserManagerInternal;
@@ -813,6 +816,10 @@ static final class UpdateConfigurationResult {
     // 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);
@@ -866,6 +873,8 @@ public void run() {
         }
     };
 
+    private AppLockManagerServiceInternal mAppLockManagerService = null;
+
     @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
     public ActivityTaskManagerService(Context context) {
         mContext = context;
@@ -916,6 +925,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) {
@@ -4194,6 +4209,15 @@ public TaskSnapshot takeTaskSnapshot(int taskId, boolean updateCache) {
                     Slog.w(TAG, "takeTaskSnapshot: taskId=" + taskId + " not found or not visible");
                     return null;
                 }
+                final Task rootTask = task.getRootTask();
+                final String packageName =
+                    rootTask != null && rootTask.realActivity != null
+                        ? rootTask.realActivity.getPackageName()
+                        : null;
+                if (packageName != null && getAppLockManagerService().requireUnlock(
+                        packageName, task.mUserId)) {
+                    return null;
+                }
                 // Note that if updateCache is true, ActivityRecord#shouldUseAppThemeSnapshot will
                 // be used to decide whether the task is allowed to be captured because that may
                 // be retrieved by recents. While if updateCache is false, the real snapshot will
@@ -5717,6 +5741,13 @@ ActivityRecord.WindowStyle getWindowStyle(String packageName, int theme, int use
         return mWindowStyleCache.get(packageName, theme, userId);
     }
 
+    AppLockManagerServiceInternal getAppLockManagerService() {
+        if (mAppLockManagerService == null) {
+            mAppLockManagerService = LocalServices.getService(AppLockManagerServiceInternal.class);
+        }
+        return mAppLockManagerService;
+    }
+
     AppWarnings getAppWarningsLocked() {
         return mAppWarnings;
     }
@@ -6606,6 +6637,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);
         }
@@ -7693,6 +7727,14 @@ public void unregisterCompatScaleProvider(
         public boolean isAssistDataAllowed() {
             return ActivityTaskManagerService.this.isAssistDataAllowed();
         }
+
+        @Override
+        public boolean isVisibleActivity(IBinder activityToken) {
+            synchronized (mGlobalLock) {
+                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(activityToken);
+                return r != null && r.isInterestingToUserLocked();
+            }
+        }
     }
 
     /** Cache the return value for {@link #isPip2ExperimentEnabled()} */
@@ -7723,4 +7765,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 6c5ddef76f39d..4629e185f47e6 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
@@ -2893,11 +2893,19 @@ int startActivityFromRecents(int callingPid, int callingUid, int taskId,
                             "startActivityFromRecents");
                 }
 
+                final Task rootTask = task.getRootTask();
+                final String packageName =
+                    rootTask != null && rootTask.realActivity != null
+                        ? rootTask.realActivity.getPackageName()
+                        : null;
+                final boolean needAppUnlock = packageName != null
+                        && mService.getAppLockManagerService()
+                                .requireUnlock(packageName, task.mUserId);
                 // If the user must confirm credentials (e.g. when first launching a work
                 // app and the Work Challenge is present) let startActivityInPackage handle
                 // the intercepting.
                 if (!mService.mAmInternal.shouldConfirmCredentials(task.mUserId)
-                        && task.getRootActivity() != null) {
+                        && task.getRootActivity() != null && !needAppUnlock) {
                     final ActivityRecord targetActivity = task.getTopNonFinishingActivity();
 
                     mRootWindowContainer.startPowerModeLaunchIfNeeded(
@@ -2954,6 +2962,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/AlertWindowNotification.java b/services/core/java/com/android/server/wm/AlertWindowNotification.java
index c589feae56ca2..51c93a6293b44 100644
--- a/services/core/java/com/android/server/wm/AlertWindowNotification.java
+++ b/services/core/java/com/android/server/wm/AlertWindowNotification.java
@@ -24,6 +24,7 @@
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.provider.Settings.ACTION_MANAGE_APP_OVERLAY_PERMISSION;
 
+import android.annotation.UserIdInt;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
@@ -37,6 +38,7 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.UserHandle;
 
 import com.android.internal.R;
 import com.android.internal.util.ImageUtils;
@@ -53,11 +55,14 @@ class AlertWindowNotification {
     private String mNotificationTag;
     private final NotificationManager mNotificationManager;
     private final String mPackageName;
+    private final @UserIdInt int mUserId;
     private boolean mPosted;
 
-    AlertWindowNotification(WindowManagerService service, String packageName) {
+    AlertWindowNotification(WindowManagerService service, String packageName,
+            @UserIdInt int userId) {
         mService = service;
         mPackageName = packageName;
+        mUserId = userId;
         mNotificationManager =
                 (NotificationManager) mService.mContext.getSystemService(NOTIFICATION_SERVICE);
         mNotificationTag = CHANNEL_PREFIX + mPackageName;
@@ -100,7 +105,7 @@ private void onPostNotification() {
 
         final Context context = mService.mContext;
         final PackageManager pm = context.getPackageManager();
-        final ApplicationInfo aInfo = getApplicationInfo(pm, mPackageName);
+        final ApplicationInfo aInfo = getApplicationInfoAsUser(pm, mPackageName, mUserId);
         final String appName = (aInfo != null)
                 ? pm.getApplicationLabel(aInfo).toString() : mPackageName;
 
@@ -138,6 +143,7 @@ private PendingIntent getContentIntent(Context context, String packageName) {
         final Intent intent = new Intent(ACTION_MANAGE_APP_OVERLAY_PERMISSION,
                 Uri.fromParts("package", packageName, null));
         intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+        intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.of(mUserId));
         // Calls into activity manager...
         return PendingIntent.getActivity(context, mRequestCode, intent,
                 FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);
@@ -168,9 +174,10 @@ private void createNotificationChannel(Context context, String appName) {
     }
 
 
-    private ApplicationInfo getApplicationInfo(PackageManager pm, String packageName) {
+    private ApplicationInfo getApplicationInfoAsUser(PackageManager pm, String packageName,
+            @UserIdInt int userId) {
         try {
-            return pm.getApplicationInfo(packageName, 0);
+            return pm.getApplicationInfoAsUser(packageName, 0, userId);
         } catch (PackageManager.NameNotFoundException e) {
             return null;
         }
diff --git a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java
index 47c6ce183cefc..491583d3423d0 100644
--- a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java
+++ b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java
@@ -326,6 +326,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/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
index 70f075658df45..25adf74fd207c 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();
@@ -656,4 +662,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..03639449c3df1 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;
             }
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index a12b783bea474..6f6f5d3d9f718 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_WALLPAPER;
 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_CONFIG;
 import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT;
@@ -561,6 +562,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();
@@ -794,6 +797,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
@@ -1183,6 +1188,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(),
@@ -2110,7 +2116,9 @@ void continueUpdateOrientationForDiffOrienLaunchingApp() {
             return;
         }
         // The orientation of display is not changed.
-        clearFixedRotationLaunchingApp();
+        if (!mTransitionController.isCollecting(this)) {
+            clearFixedRotationLaunchingApp();
+        }
     }
 
     /**
@@ -4339,6 +4347,11 @@ InsetsControlTarget getImeControlTarget() {
         return imePolicy;
     }
 
+    boolean forceDesktopMode() {
+        return ("VNC".equals(mDisplay.getName()) || mWmService.mForceDesktopModeOnExternalDisplays)
+            && !isDefaultDisplay && !isFreeformDisplay && !isPrivate();
+    }
+
     /** @see WindowManagerInternal#onToggleImeRequested */
     void onShowImeRequested() {
         if (mInputMethodWindow == null) {
@@ -5197,6 +5210,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);
+        }
     }
 
     /**
@@ -5736,7 +5756,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 44df355d6756a..e5177aeacc1c4 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -86,9 +86,11 @@
 import android.app.LoadedApk;
 import android.app.ResourcesManager;
 import android.app.WindowConfiguration;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
@@ -137,6 +139,7 @@
 import com.android.internal.policy.ScreenDecorationsUtils;
 import com.android.internal.protolog.ProtoLog;
 import com.android.internal.statusbar.LetterboxDetails;
+import com.android.internal.util.crdroid.Utils;
 import com.android.internal.util.function.TriFunction;
 import com.android.internal.view.AppearanceRegion;
 import com.android.internal.widget.PointerLocationView;
@@ -149,6 +152,8 @@
 import com.android.server.wallpaper.WallpaperManagerInternal;
 import com.android.wm.shell.Flags;
 
+import lineageos.providers.LineageSettings;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -241,6 +246,7 @@ StatusBarManagerInternal getStatusBarManagerInternal() {
 
     private volatile boolean mHasStatusBar;
     private volatile boolean mHasNavigationBar;
+    private volatile boolean mTaskBarEnabled;
     // Can the navigation bar ever move to the side?
     private volatile boolean mNavigationBarCanMove;
     private volatile boolean mNavigationBarAlwaysShowOnSideGesture;
@@ -381,6 +387,8 @@ StatusBarManagerInternal getStatusBarManagerInternal() {
 
     private RefreshRatePolicy mRefreshRatePolicy;
 
+    private SettingsObserver mSettingsObserver;
+
     /**
      * If true, attach the navigation bar to the current transition app.
      * The value is read from config_attachNavBarToAppDuringTransition and could be overlaid by RRO
@@ -418,6 +426,27 @@ public void handleMessage(Message msg) {
         }
     }
 
+    private class SettingsObserver extends ContentObserver {
+        public SettingsObserver(Handler handler) {
+            super(handler);
+
+            ContentResolver resolver = mContext.getContentResolver();
+            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();
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            updateSettings();
+        }
+    }
+
     DisplayPolicy(WindowManagerService service, DisplayContent displayContent) {
         mService = service;
         mContext = displayContent.isDefaultDisplay ? service.mContext
@@ -662,16 +691,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();
@@ -718,6 +741,21 @@ void systemReady() {
         }
     }
 
+    public void updateSettings() {
+        ContentResolver resolver = mContext.getContentResolver();
+
+        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() {
         return mDisplayContent.getDisplayId();
     }
@@ -1848,6 +1886,12 @@ void onOverlayChanged() {
      */
     public void onConfigurationChanged() {
         final Resources res = getCurrentUserResources();
+
+        final InsetsPolicy policy = mDisplayContent.getInsetsPolicy();
+        if (policy != null) {
+            policy.updateLockedStatus();
+        }
+
         mNavBarOpacityMode = res.getInteger(R.integer.config_navBarOpacityMode);
         mLeftGestureInset = mGestureNavigationSettingsObserver.getLeftSensitivity(res);
         mRightGestureInset = mGestureNavigationSettingsObserver.getRightSensitivity(res);
@@ -1857,10 +1901,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;
         }
@@ -2465,7 +2511,7 @@ void requestTransientBars(WindowState swipeTarget, boolean isGestureOnSystemBar)
         if (controlTarget.canShowTransient()) {
             // Show transient bars if they are hidden; restore position if they are visible.
             mDisplayContent.getInsetsPolicy().showTransient(SHOW_TYPES_FOR_SWIPE,
-                    isGestureOnSystemBar);
+                    isGestureOnSystemBar, swipeTarget == mStatusBar);
             controlTarget.showInsets(restorePositionTypes, null /* statsToken */);
         } else {
             // Restore visibilities and positions of system bars.
@@ -3364,4 +3410,8 @@ private static boolean intersectsAnyInsets(Rect bounds, InsetsState insetsState,
     boolean shouldAttachNavBarToAppDuringTransition() {
         return mShouldAttachNavBarToAppDuringTransition && mNavigationBar != null;
     }
+
+    public Context getUiContext() {
+        return mUiContext;
+    }
 }
diff --git a/services/core/java/com/android/server/wm/InputConsumerImpl.java b/services/core/java/com/android/server/wm/InputConsumerImpl.java
index a288cc752d3df..f34cf76faf0bb 100644
--- a/services/core/java/com/android/server/wm/InputConsumerImpl.java
+++ b/services/core/java/com/android/server/wm/InputConsumerImpl.java
@@ -32,6 +32,7 @@
 import android.view.WindowManager;
 
 import java.io.PrintWriter;
+import java.util.NoSuchElementException;
 
 class InputConsumerImpl implements IBinder.DeathRecipient {
     final WindowManagerService mService;
@@ -101,8 +102,11 @@ void unlinkFromDeathRecipient() {
         if (mToken == null) {
             return;
         }
-
-        mToken.unlinkToDeath(this, 0);
+        try {
+            mToken.unlinkToDeath(this, 0);
+        } catch (NoSuchElementException e) {
+            // unlinkToDeath called on unlinked Binder.
+        }
     }
 
     void layout(SurfaceControl.Transaction t, int dw, int dh) {
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/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java
index 80f8f51bd9266..9ce4ebbb17e08 100644
--- a/services/core/java/com/android/server/wm/InsetsPolicy.java
+++ b/services/core/java/com/android/server/wm/InsetsPolicy.java
@@ -36,6 +36,9 @@
 import android.content.res.Resources;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.SparseArray;
 import android.view.InsetsController;
 import android.view.InsetsFrameProvider;
@@ -51,6 +54,7 @@
 import android.view.WindowManager;
 import android.view.inputmethod.ImeTracker;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
 
 import com.android.internal.R;
 import com.android.internal.annotations.VisibleForTesting;
@@ -129,6 +133,10 @@ class InsetsPolicy {
 
     private final boolean mHideNavBarForKeyboard;
 
+    private long mLastSwipeTime;
+    private long mLastUnlockedTime;
+    private boolean mLockedGesture = false;
+
     InsetsPolicy(InsetsStateController stateController, DisplayContent displayContent) {
         mStateController = stateController;
         mDisplayContent = displayContent;
@@ -216,8 +224,13 @@ boolean hasHiddenSources(@InsetsType int types) {
     }
 
     void showTransient(@InsetsType int types, boolean isGestureOnSystemBar) {
+        showTransient(types, isGestureOnSystemBar, false);
+    }
+
+    void showTransient(@InsetsType int types, boolean isGestureOnSystemBar, boolean swipeOnStatusBar) {
         @InsetsType int showingTransientTypes = mShowingTransientTypes;
         final InsetsState rawState = mStateController.getRawInsetsState();
+        final boolean isGestureLocked = isGestureLocked(!swipeOnStatusBar);
         for (int i = rawState.sourceSize() - 1; i >= 0; i--) {
             final InsetsSource source = rawState.sourceAt(i);
             if (source.isVisible()) {
@@ -227,8 +240,17 @@ void showTransient(@InsetsType int types, boolean isGestureOnSystemBar) {
             if ((source.getType() & types) == 0) {
                 continue;
             }
+            if (isGestureLocked && (
+                    ((type & Type.statusBars()) != 0 && !swipeOnStatusBar) ||
+                    ((type & Type.navigationBars()) != 0)
+                    )) {
+                continue;
+            }
             showingTransientTypes |= type;
         }
+        if (isGestureLocked && !swipeOnStatusBar) {
+            warnGestureLocked();
+        }
         if (mShowingTransientTypes != showingTransientTypes) {
             mShowingTransientTypes = showingTransientTypes;
             mHidingTransientTypes &= ~showingTransientTypes;
@@ -1095,4 +1117,34 @@ public IBinder getWindowToken() {
             return null;
         }
     }
+
+    void updateLockedStatus() {
+        mLastSwipeTime = 0L;
+        mLastUnlockedTime = 0L;
+        mLockedGesture = Settings.System.getIntForUser(mPolicy.getContext().getContentResolver(),
+                Settings.System.LOCK_GESTURE_STATUS, 0, UserHandle.USER_CURRENT) == 1;
+    }
+
+    void warnGestureLocked() {
+        Toast.makeText(mPolicy.getUiContext(), R.string.gesture_locked_warning, Toast.LENGTH_SHORT).show();
+    }
+
+    boolean isGestureLocked(boolean updateSwipeTime) {
+        if (!mLockedGesture) {
+            return false;
+        }
+        final long now = SystemClock.uptimeMillis();
+        if (now - mLastUnlockedTime <= 3500) {
+            mLastUnlockedTime = now;
+            return false;
+        }
+        if (now - mLastSwipeTime > 2500) {
+            if (updateSwipeTime) {
+                mLastSwipeTime = now;
+            }
+            return true;
+        }
+        mLastUnlockedTime = now;
+        return false;
+    }
 }
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 8430c109c1251..a02179060ecd6 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -286,7 +286,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/Session.java b/services/core/java/com/android/server/wm/Session.java
index 5b36a9b089bdb..1c69365f5c4bd 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -814,7 +814,8 @@ void onWindowSurfaceVisibilityChanged(WindowState window, boolean visible) {
             if (mAlertWindows.isEmpty()) {
                 cancelAlertWindowNotification();
             } else if (mAlertWindowNotification == null && !isSatellitePointingUiPackage()) {
-                mAlertWindowNotification = new AlertWindowNotification(mService, mPackageName);
+                mAlertWindowNotification = new AlertWindowNotification(mService, mPackageName,
+                        UserHandle.getUserId(mUid));
                 if (mShowingAlertWindowNotificationAllowed) {
                     mAlertWindowNotification.post();
                 }
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index 1a120806e09f7..9e8c574d9e390 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -628,18 +628,23 @@ void reparent(WindowContainer newParent, int position) {
 
         // The display object before reparenting as that might lead to old parent getting removed
         // from the display if it no longer has any child.
-        final DisplayContent prevDc = oldParent.getDisplayContent();
+        final DisplayContent prevDc = oldParent != null ? oldParent.getDisplayContent() : null;
         final DisplayContent dc = newParent.getDisplayContent();
+        final boolean dcChanged = prevDc != dc;
 
         mReparenting = true;
-        oldParent.removeChild(this);
+        if (oldParent != null) {
+            oldParent.removeChild(this);
+        }
         newParent.addChild(this, position);
         mReparenting = false;
 
         // Relayout display(s)
         dc.setLayoutNeeded();
-        if (prevDc != dc) {
+        if (dcChanged) {
             onDisplayChanged(dc);
+        }
+        if(dcChanged && prevDc != null) {
             prevDc.setLayoutNeeded();
         }
 
diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java
index 835c6509bee01..6787ca9434a35 100644
--- a/services/core/java/com/android/server/wm/WindowManagerInternal.java
+++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java
@@ -438,6 +438,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.
      */
@@ -1175,4 +1183,12 @@ public abstract void removeBlockScreenCaptureForApps(
      * to this UID will be excluded from the screenshot.
      */
     public abstract ScreenshotHardwareBuffer takeContextualSearchScreenshot(int uid);
+
+    /**
+     * 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 5ba6403b3b7ab..fbe23fed999e8 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -782,6 +782,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;
@@ -5651,6 +5654,15 @@ void notifyHardKeyboardStatusChange() {
         }
     }
 
+    void notifyDisplaySecureContentChange(int displayId, boolean hasSecureWindowOnScreen) {
+        synchronized (mGlobalLock) {
+            mDisplaySecureContentListeners.forEach((listener) -> {
+                listener.onDisplayHasSecureWindowOnScreenChanged(
+                        displayId, hasSecureWindowOnScreen);
+            });
+        }
+    }
+
     // -------------------------------------------------------------
     // Input Events and Focus Management
     // -------------------------------------------------------------
@@ -8943,6 +8955,20 @@ public ScreenshotHardwareBuffer takeContextualSearchScreenshot(int uid) {
                 }
             });
         }
+
+        @Override
+        public void registerDisplaySecureContentListener(DisplaySecureContentListener listener) {
+            synchronized (mGlobalLock) {
+                mDisplaySecureContentListeners.add(listener);
+            }
+        }
+
+        @Override
+        public void unregisterDisplaySecureContentListener(DisplaySecureContentListener listener) {
+            synchronized (mGlobalLock) {
+                mDisplaySecureContentListeners.remove(listener);
+            }
+        }
     }
 
     private final class ImeTargetVisibilityPolicyImpl extends ImeTargetVisibilityPolicy {
diff --git a/services/core/java/com/android/server/wm/WindowOrientationListener.java b/services/core/java/com/android/server/wm/WindowOrientationListener.java
index d26616edfb44c..d22d962a44444 100644
--- a/services/core/java/com/android/server/wm/WindowOrientationListener.java
+++ b/services/core/java/com/android/server/wm/WindowOrientationListener.java
@@ -459,22 +459,22 @@ final class AccelSensorJudge extends OrientationJudge {
         // the low-pass filter already suppresses most of the noise so we're really just
         // looking for quick confirmation that the last few samples are in agreement as to
         // the desired orientation.
-        private static final long PROPOSAL_SETTLE_TIME_NANOS = 40 * NANOS_PER_MS;
+        private static final long PROPOSAL_SETTLE_TIME_NANOS = 25 * NANOS_PER_MS;
 
         // The minimum amount of time that must have elapsed since the device last exited
         // the flat state (time since it was picked up) before the proposed rotation
         // can change.
-        private static final long PROPOSAL_MIN_TIME_SINCE_FLAT_ENDED_NANOS = 500 * NANOS_PER_MS;
+        private static final long PROPOSAL_MIN_TIME_SINCE_FLAT_ENDED_NANOS = 250 * NANOS_PER_MS;
 
         // The minimum amount of time that must have elapsed since the device stopped
         // swinging (time since device appeared to be in the process of being put down
         // or put away into a pocket) before the proposed rotation can change.
-        private static final long PROPOSAL_MIN_TIME_SINCE_SWING_ENDED_NANOS = 300 * NANOS_PER_MS;
+        private static final long PROPOSAL_MIN_TIME_SINCE_SWING_ENDED_NANOS = 150 * NANOS_PER_MS;
 
         // The minimum amount of time that must have elapsed since the device stopped
         // undergoing external acceleration before the proposed rotation can change.
         private static final long PROPOSAL_MIN_TIME_SINCE_ACCELERATION_ENDED_NANOS =
-                500 * NANOS_PER_MS;
+                250 * NANOS_PER_MS;
 
         // If the tilt angle remains greater than the specified angle for a minimum of
         // the specified time, then the device is deemed to be lying flat
@@ -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 96a704fcf0de8..29a403138c76a 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -1413,6 +1413,10 @@ void updateProcessInfo(boolean updateServiceConnectionActivities, boolean activi
         // Posting on handler so WM lock isn't held when we call into AM.
         final Message m = PooledLambda.obtainMessage(WindowProcessListener::updateProcessInfo,
                 mListener, updateServiceConnectionActivities, activityChange, updateOomAdj);
+        if (!updateServiceConnectionActivities && activityChange && updateOomAdj && addPendingTopUid) {
+            mAtm.mUiHandler.sendMessageAtFrontOfQueue(m);
+            return;
+        }
         mAtm.mH.sendMessage(m);
     }
 
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 99e4ea59c4acd..47afd00a8655d 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -69,7 +69,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_wm_TaskFpsCallbackController.cpp",
@@ -94,12 +93,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 f616ef56d8a4a..e743913a57b56 100644
--- a/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp
+++ b/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp
@@ -83,6 +83,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
@@ -326,12 +328,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;
     }
@@ -437,6 +443,7 @@ static void compactProcess(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;
@@ -465,6 +472,7 @@ static void com_android_server_am_CachedAppOptimizer_compactSystem(JNIEnv *, job
 
         compactProcess(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_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp
index 35d8219651d74..c12f205f7d835 100644
--- a/services/core/jni/com_android_server_lights_LightsService.cpp
+++ b/services/core/jni/com_android_server_lights_LightsService.cpp
@@ -112,7 +112,7 @@ static void processReturn(
         case Status::SUCCESS:
             break;
         case Status::LIGHT_NOT_SUPPORTED:
-            ALOGE("Light requested not available on this device. %d", type);
+            ALOGV("Light requested not available on this device. %d", type);
             break;
         case Status::BRIGHTNESS_NOT_SUPPORTED:
             ALOGE("Brightness parameter not supported on this device: %d",
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/com_android_server_power_stats_CpuPowerStatsCollector.cpp b/services/core/jni/com_android_server_power_stats_CpuPowerStatsCollector.cpp
index cac13ebef410a..1991317ecab5f 100644
--- a/services/core/jni/com_android_server_power_stats_CpuPowerStatsCollector.cpp
+++ b/services/core/jni/com_android_server_power_stats_CpuPowerStatsCollector.cpp
@@ -113,7 +113,7 @@ static jlong nativeReadCpuStats(JNIEnv *env, [[maybe_unused]] jobject zis, jobje
 static int flatten(JNIEnv *env, const std::vector<std::vector<uint64_t>> &times,
                    jlongArray outArray) {
     ScopedLongArrayRW scopedOutArray(env, outArray);
-    const uint8_t scalingStepCount = scopedOutArray.size();
+    const uint32_t scalingStepCount = scopedOutArray.size();
     uint64_t *out = reinterpret_cast<uint64_t *>(scopedOutArray.get());
     uint32_t scalingStep = 0;
     for (const auto &subVec : times) {
@@ -136,9 +136,9 @@ static int combineByBracket(JNIEnv *env, const std::vector<std::vector<uint64_t>
                             jlongArray outBrackets) {
     ScopedLongArrayRW scopedOutBrackets(env, outBrackets);
     uint64_t *brackets = reinterpret_cast<uint64_t *>(scopedOutBrackets.get());
-    const uint8_t statsSize = scopedOutBrackets.size();
+    const uint32_t statsSize = scopedOutBrackets.size();
     memset(brackets, 0, statsSize * sizeof(uint64_t));
-    const uint8_t scalingStepCount = scopedScalingStepToPowerBracketMap.size();
+    const uint32_t scalingStepCount = scopedScalingStepToPowerBracketMap.size();
 
     uint32_t scalingStep = 0;
     for (const auto &subVec : times) {
diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index 50c06b943804d..5c1e8f3cdc343 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);
@@ -125,7 +124,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/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 06b14126cdcc9..079d47622fd08 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -126,6 +126,7 @@
 import com.android.server.alarm.AlarmManagerService;
 import com.android.server.am.ActivityManagerService;
 import com.android.server.ambientcontext.AmbientContextManagerService;
+import com.android.server.app.AppLockManagerService;
 import com.android.server.app.GameManagerService;
 import com.android.server.appbinding.AppBindingService;
 import com.android.server.appfunctions.AppFunctionManagerService;
@@ -167,11 +168,16 @@
 import com.android.server.coverage.CoverageService;
 import com.android.server.cpu.CpuMonitorService;
 import com.android.server.crashrecovery.CrashRecoveryAdaptor;
+import com.android.server.crdroid.AttestationService;
+import com.android.server.crdroid.CustomDeviceConfigService;
+import com.android.server.crdroid.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.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;
@@ -233,6 +239,8 @@
 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;
@@ -511,6 +519,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";
@@ -992,7 +1002,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()) {
@@ -1866,7 +1876,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
@@ -2217,8 +2230,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(
@@ -2238,7 +2252,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(
@@ -2246,7 +2260,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(
@@ -2254,7 +2268,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(
@@ -2804,6 +2818,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.
@@ -2834,6 +2852,11 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             }
             t.traceEnd();
 
+            // LauncherAppsService uses AppLockManagerService.
+            t.traceBegin("AppLockManagerService");
+            mSystemServiceManager.startService(AppLockManagerService.Lifecycle.class);
+            t.traceEnd();
+
             // LauncherAppsService uses ShortcutService.
             t.traceBegin("StartShortcutServiceLifecycle");
             mSystemServiceManager.startService(ShortcutService.Lifecycle.class);
@@ -2847,6 +2870,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();
@@ -2861,6 +2898,31 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 mSystemServiceManager.startService(BackgroundInstallControlService.class);
                 t.traceEnd();
             }
+
+            // AttestationService
+            t.traceBegin("AttestationService");
+            mSystemServiceManager.startService(AttestationService.class);
+            t.traceEnd();
+
+            // VbmetaHashService
+            t.traceBegin("VbmetaHashService");
+            mSystemServiceManager.startService(VbmetaHashService.class);
+            t.traceEnd();
+
+            t.traceBegin("GameSpaceManagerService");
+            mSystemServiceManager.startService(GameSpaceManagerService.class);
+            t.traceEnd();
+
+            if (context.getResources().getBoolean(R.bool.config_dozeAlwaysOnDisplayAvailable)) {
+                t.traceBegin("AutoAODService");
+                mSystemServiceManager.startService(AutoAODService.class);
+                t.traceEnd();
+            }
+
+            // CustomDeviceConfigService
+            t.traceBegin("StartCustomDeviceConfigService");
+            mSystemServiceManager.startService(CustomDeviceConfigService.class);
+            t.traceEnd();
         }
 
         t.traceBegin("StartMediaProjectionManager");
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/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/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 70df989b6947b..219b7c27ab044 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.crdroid.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) {
@@ -1114,7 +1116,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.
@@ -2768,7 +2770,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 f001232ea93e9..599125d12aa66 100644
--- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
+++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
@@ -454,7 +454,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 406db8810538f..a2412acd897ed 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -10935,7 +10935,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);
@@ -10968,9 +10968,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, "");
@@ -11170,8 +11170,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 35dd8b240e131..c3bedd5a8462a 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -366,6 +366,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
@@ -454,6 +456,7 @@ protected void copyFrom(ServiceState s) {
         mOperatorAlphaShortRaw = s.mOperatorAlphaShortRaw;
         mIsDataRoamingFromRegistration = s.mIsDataRoamingFromRegistration;
         mIsIwlanPreferred = s.mIsIwlanPreferred;
+        mForceLteCA = (s.mForceLteCA != null) ? Boolean.valueOf(s.mForceLteCA) : null;
     }
 
     /**
@@ -489,6 +492,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) {
@@ -517,6 +522,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() {
@@ -994,7 +1000,8 @@ public int hashCode() {
                     mOperatorAlphaLongRaw,
                     mOperatorAlphaShortRaw,
                     mIsDataRoamingFromRegistration,
-                    mIsIwlanPreferred);
+                    mIsIwlanPreferred,
+                    mForceLteCA);
         }
     }
 
@@ -1025,7 +1032,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);
         }
     }
 
@@ -1209,6 +1217,7 @@ public String toString() {
                     .append(", mIsDataRoamingFromRegistration=")
                     .append(mIsDataRoamingFromRegistration)
                     .append(", mIsIwlanPreferred=").append(mIsIwlanPreferred)
+                    .append(", mForceLteCA=").append(mForceLteCA)
                     .append(", mIsUsingNonTerrestrialNetwork=")
                     .append(isUsingNonTerrestrialNetwork())
                     .append("}").toString();
@@ -1260,6 +1269,7 @@ private void init() {
         mOperatorAlphaShortRaw = null;
         mIsDataRoamingFromRegistration = false;
         mIsIwlanPreferred = false;
+        mForceLteCA = null;
     }
 
     public void setStateOutOfService() {
@@ -1488,6 +1498,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);
@@ -1535,15 +1546,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;
     }
 
@@ -2192,6 +2218,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 acdc6605467b9..9b6b8d7c0361d 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2968,6 +2968,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 ffc048b9b9b93..cbdc97be11243 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -10438,7 +10438,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);
@@ -14787,7 +14788,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);
@@ -15542,7 +15544,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) {
@@ -15555,7 +15556,7 @@ public Map<Integer, List<EmergencyNumber>> getEmergencyNumberList() {
             Log.e(TAG, "getEmergencyNumberList RemoteException", ex);
             ex.rethrowAsRuntimeException();
         }
-        return emergencyNumberList;
+        return Collections.emptyMap();
     }
 
     /**
@@ -16436,7 +16437,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);
@@ -19539,7 +19541,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 09ead31a36703..9db7e63beb710 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -140,6 +140,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.
      *