config: Update PIF to latest caiman_beta

Signed-off-by: MOVZX <movzx@yahoo.com>

build/soong/Android.bp

@@ -23,7 +23,7 @@ lineage_generator {
     // The headers make command
     cmd: "if [ -n \"$(TARGET_KERNEL_PLATFORM_TARGET)\" ]; then " +
          "    pushd $(KERNEL_PATH); " +
-         "    ./tools/bazel --output_user_root=$(KERNEL_BUILD_OUT_PREFIX)$(genDir)/bazel-out run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) //$(TARGET_KERNEL_SOURCE):$(TARGET_KERNEL_PLATFORM_TARGET)_uapi_headers_dist -- --destdir=$(KERNEL_BUILD_OUT_PREFIX)$(genDir); " +
+         "    ./tools/bazel --output_user_root=$(KERNEL_BUILD_OUT_PREFIX)$(genDir)/bazel-out --output_root=$(KERNEL_BUILD_OUT_PREFIX)$(genDir)/bazel-out run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) //$(TARGET_KERNEL_SOURCE):$(TARGET_KERNEL_PLATFORM_TARGET)_uapi_headers_dist -- --destdir=$(KERNEL_BUILD_OUT_PREFIX)$(genDir); " +
          "    popd; " +
          "    gzip -d $(KERNEL_BUILD_OUT_PREFIX)$(genDir)/kernel-uapi-headers.tar.gz; " +
          "    tar -xf $(KERNEL_BUILD_OUT_PREFIX)$(genDir)/kernel-uapi-headers.tar -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir); " +

build/soong/generator/generator.go

@@ -151,8 +151,8 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 				tool := ctx.OtherModuleName(module)
 				var path android.OptionalPath
 
-				if t, ok := android.OtherModuleProvider(ctx, module, android.HostToolProviderInfoProvider); ok {
-					if !android.OtherModulePointerProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled {
+				if t, ok := module.(HostToolProvider); ok {
+					if !t.(android.Module).Enabled(ctx) {
 						if ctx.Config().AllowMissingDependencies() {
 							ctx.AddMissingDependencies([]string{tool})
 						} else {
@@ -160,7 +160,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 						}
 						break
 					}
-					path = t.HostToolPath
+					path = t.HostToolPath()
 				} else {
 					ctx.ModuleErrorf("%q is not a host tool provider", tool)
 					break
@@ -188,7 +188,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 		return
 	}
 
-	toolFiles := android.PathsForModuleSrc(ctx, g.properties.Tool_files)
+	toolFiles := ctx.ExpandSources(g.properties.Tool_files, nil)
 	for _, tool := range toolFiles {
 		g.implicitDeps = append(g.implicitDeps, tool)
 		if _, exists := tools[tool.Rel()]; !exists {

build/tasks/kernel.mk

@@ -721,9 +721,8 @@ KERNEL_PATH := $(abspath $(BUILD_TOP)/../kernel-$(TARGET_KERNEL_VERSION))
 $(TARGET_PREBUILT_INT_KERNEL): $(DEPMOD) $(KERNEL_MODULES_PARTITION_FILE_LIST) $(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST)
 	@echo "Building $(BOARD_KERNEL_IMAGE_NAME)"
 	@mkdir -p $(KERNEL_OUT)
-	@rm -rf $(KERNEL_PATH)/out
 	$(hide) cd $(KERNEL_PATH) && python3 .repo/repo/repo manifest -o - -r > $(abspath $(KERNEL_OUT))/manifest.xml
-	$(hide) cd $(KERNEL_PATH) && ./tools/bazel --output_user_root=$(abspath $(KERNEL_OUT)/bazel-out) run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) --repo_manifest $(abspath $(KERNEL_PATH)):$(abspath $(KERNEL_OUT)/manifest.xml) --config=stamp //$(KERNEL_SRC):$(TARGET_KERNEL_PLATFORM_TARGET)_dist -- --destdir=$(abspath $(KERNEL_OUT))
+	$(hide) cd $(KERNEL_PATH) && ./tools/bazel --output_user_root=$(abspath $(KERNEL_OUT)/bazel-out) --output_root=$(abspath $(KERNEL_OUT)/bazel-out) run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) --repo_manifest $(abspath $(KERNEL_PATH)):$(abspath $(KERNEL_OUT)/manifest.xml) --config=stamp //$(KERNEL_SRC):$(TARGET_KERNEL_PLATFORM_TARGET)_dist -- --destdir=$(abspath $(KERNEL_OUT))
 	$(if $(BOOT_KERNEL_MODULES),\
 		$(call build-image-kernel-modules-lineage,$(addprefix $(KERNEL_OUT)/,$(BOOT_KERNEL_MODULES)),$(KERNEL_VENDOR_RAMDISK_MODULES_OUT),,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(KERNEL_VENDOR_RAMDISK_KERNEL_MODULES_LOAD),,,)\
 	)

config/common.mk

@@ -12,7 +12,7 @@ endif
 # Pixel additions
 ifeq ($(WITH_GMS),true)
 $(call inherit-product, vendor/google/overlays/ThemeIcons/config.mk)
-#$(call inherit-product, vendor/pixel-framework/config.mk)
+$(call inherit-product, vendor/pixel-framework/config.mk)
 $(call inherit-product, vendor/pixel-style/config/common.mk)
 
 # Don't dexpreopt prebuilts. (For GMS).
@@ -219,11 +219,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     nano_recovery
 
+# LMO packages
+PRODUCT_PACKAGES += \
+    LMOFreeform \
+    LMOFreeformSidebar \
+    LMOSystemUIClock
+
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/bin/curl \
     system/bin/getcap \
-    system/bin/setcap \
-    system/%/libzstd.so
+    system/bin/setcap
 
 # Filesystems tools
 PRODUCT_PACKAGES += \
@@ -292,10 +297,6 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
 endif
 endif
 
-# SurfaceFlinger
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.surface_flinger.supports_background_blur=1
-
 # SystemUI
 PRODUCT_DEXPREOPT_SPEED_APPS += \
     Launcher3QuickStep \

config/common_mobile_full.mk

@@ -5,8 +5,8 @@ PRODUCT_SIZE := full
 
 # Apps
 PRODUCT_PACKAGES += \
-    Profiles
-#    Seedvault
+    Profiles \
+    Seedvault
 
 ifeq ($(WITH_GMS),false)
 PRODUCT_PACKAGES += \
@@ -16,10 +16,10 @@ PRODUCT_PACKAGES += \
     Twelve
 endif
 
-#ifneq ($(PRODUCT_NO_CAMERA),true)
-#PRODUCT_PACKAGES += \
-#    Aperture
-#endif
+ifneq ($(PRODUCT_NO_CAMERA),true)
+PRODUCT_PACKAGES += \
+    Aperture
+endif
 
 ifeq ($(WITH_GMS),false)
 ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)

config/evolution.mk

@@ -2,24 +2,24 @@
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.sys.pihooks_MANUFACTURER?=Google \
     persist.sys.pihooks_BRAND?=google \
-    persist.sys.pihooks_PRODUCT?=frankel_beta \
-    persist.sys.pihooks_DEVICE?=frankel \
-    persist.sys.pihooks_ID?=BP41.250916.015.A1 \
-    persist.sys.pihooks_RELEASE?=12 \
-    persist.sys.pihooks_SECURITY_PATCH?=2025-10-05 \
+    persist.sys.pihooks_PRODUCT?=caiman_beta \
+    persist.sys.pihooks_DEVICE?=caiman \
+    persist.sys.pihooks_ID?=CP11.251114.006 \
+    persist.sys.pihooks_RELEASE?=16 \
+    persist.sys.pihooks_SECURITY_PATCH?=2025-12-05 \
     persist.sys.pihooks_DEVICE_INITIAL_SDK_INT?=21 \
     persist.sys.pihooks_SDK_INT?=32
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildFingerprint=google/frankel_beta/frankel:16/BP41.250916.015.A1/14394230:user/release-keys \
-    PihooksGmsFp="google/frankel_beta/frankel:16/BP41.250916.015.A1/14394230:user/release-keys" \
-    PihooksGmsModel="Pixel 10"
+    BuildFingerprint=google/caiman_beta/caiman:16/CP11.251114.006/14560987:user/release-keys \
+    PihooksGmsFp="google/caiman_beta/caiman:16/CP11.251114.006/14560987:user/release-keys" \
+    PihooksGmsModel="Pixel 9"
 
 # Evolution X packages
 PRODUCT_PACKAGES += \
     EvoEgg \
-    GameSpace
-#    OmniStyle
+    GameSpace \
+    OmniStyle
 #    OmniJaws \
 
 PRODUCT_PACKAGES += \
@@ -30,12 +30,6 @@ PRODUCT_PACKAGES += \
     UpdaterVanillaOverlay
 endif
 
-# LMO packages
-PRODUCT_PACKAGES += \
-    LMOFreeform \
-    LMOFreeformSidebar
-#    LMOSystemUIClock
-
 # BtHelper
 PRODUCT_PACKAGES += \
     BtHelper
@@ -71,6 +65,20 @@ PRODUCT_PACKAGES += \
     ColumbusService
 endif
 
+# Enable blur
+TARGET_ENABLE_BLUR ?= true
+ifeq ($(TARGET_ENABLE_BLUR),true)
+PRODUCT_SYSTEM_PROPERTIES += \
+    ro.custom.blur.enable=true \
+    persist.sysui.disableBlur=false \
+    ro.surface_flinger.supports_background_blur=1
+else
+PRODUCT_SYSTEM_PROPERTIES += \
+    ro.custom.blur.enable=false \
+    persist.sysui.disableBlur=true \
+    ro.surface_flinger.supports_background_blur=0
+endif
+
 # Use a generic profile based boot image by default
 PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true
 PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := frameworks/base/boot/boot-image-profile.txt

config/version.mk

@@ -2,7 +2,7 @@ PRODUCT_VERSION_MAJOR = 16
 PRODUCT_VERSION_MINOR = 0
 
 # Increase EVO Version with each major release.
-EVO_VERSION_BASE := 11.5
+EVO_VERSION_BASE := 11.4.2
 EVO_BUILD_TYPE ?= Unofficial
 
 ifeq ($(EVO_BUILD_TYPE),Official)

overlay/common/frameworks/base/core/res/res/values/config.xml

@@ -104,7 +104,7 @@
     <bool name="config_useRoundIcon">true</bool>
 
     <!-- Whether or not we should show the option to show battery percentage -->
-    <bool name="config_battery_percentage_setting_available">true</bool>
+    <bool name="config_battery_percentage_setting_available">false</bool>
 
     <!-- Flag indicating whether we should enable the adaptive sleep.-->
     <bool name="config_adaptive_sleep_available">true</bool>
@@ -449,7 +449,7 @@
     <string name="config_rawContactsLocalAccountType" translatable="false">com.android.contacts</string>
 
     <!-- Name of the font family to use in the default lockscreen clock -->
-    <string name="config_clockFontFamily" translatable="false">google-sans-clock</string>
+    <string name="config_clockFontFamily" translatable="false">google-sans-flex-clock</string>
 
     <!-- Name of a font family to use for body text. -->
     <string name="config_bodyFontFamily" translatable="false">google-sans-text</string>
@@ -529,10 +529,4 @@
 
     <!-- If supported, are dreams enabled? (by default) -->
     <bool name="config_dreamsEnabledByDefault">false</bool>
-
-    <!-- AOD wallpaper -->
-    <bool name="config_dozeSupportsAodWallpaper">true</bool>
-
-    <!-- Whether the developer option for desktop mode is supported on the current device  -->
-    <bool name="config_isDesktopModeDevOptionSupported">true</bool>
 </resources>

overlay/no-rro/frameworks/base/core/res/res/values/config.xml

@@ -33,9 +33,4 @@
     <string name="config_defaultContextualSearchKey">omni.entry_point</string>
     <string name="config_defaultContextualSearchLegacyEnabled">omni.enable_vis</string>
     <string name="config_defaultContextualSearchPackageName" translatable="false">com.google.android.googlequicksearchbox</string>
-
-    <!-- Whether device supports double tap to sleep. This will allow the user to enable/disable
-         double tap gestures in non-action areas in the lock screen and launcher workspace to go to
-         sleep. -->
-    <bool name="config_supportDoubleTapSleep">true</bool>
 </resources>

prebuilt/common/etc/lineage-component-overrides.xml

@@ -20,20 +20,6 @@
         <component class=".systemupdate.SystemUpdateSettingsContentProvider" enabled="false" />
     </component-override>
 
-    <component-override package="com.google.android.as">
-        <component class="com.google.intelligence.sense.ambientmusic.history.HistoryContentProvider" enabled="false" />
-        <component class="com.google.intelligence.sense.ambientmusic.history.HistoryActivity" enabled="false" />
-        <component class="com.google.intelligence.sense.ambientmusic.history.AddShortcutActivity" enabled="false" />
-        <component class="com.google.intelligence.sense.ambientmusic.AmbientMusicSetupWizardActivity" enabled="false" />
-        <component class="com.google.intelligence.sense.ambientmusic.AmbientMusicSettingsActivity" enabled="false" />
-        <component class="com.google.intelligence.sense.ambientmusic.AmbientMusicNotificationsSettingsActivity" enabled="false" />
-        <component class="com.google.intelligence.sense.ambientmusic.DefaultMusicPlayerSettingActivity" enabled="false" />
-    </component-override>
-
-    <component-override package="com.google.android.dialer">
-        <component class=".rtt.settings.impl.gateway.RttSettingsDeepLink" enabled="false" />
-    </component-override>
-
     <component-override package="com.google.android.googlequicksearchbox">
         <component class=".OneSearchAimActivity" enabled="true" />
     </component-override>
@@ -41,9 +27,9 @@
     <component-override package="com.google.android.gms">
         <component class=".chimera.GmsIntentOperationService$GmsExternalReceiver" enabled="false" />
         <component class=".stats.service.DropBoxEntryAddedReceiver" enabled="false" />
-        <component class=".update.control.NotificationControl" enabled="false" />
         <component class=".update.OtaSuggestionActivity" enabled="false" />
         <component class=".update.OtaSuggestionSummaryProvider" enabled="false" />
+        <component class=".update.control.NotificationControl" enabled="false" />
         <component class=".update.phone.PopupDialog" enabled="false" />
         <component class=".update.SystemUpdateActivity" enabled="false" />
         <component class=".update.SystemUpdateV2Activity" enabled="false" />
@@ -60,6 +46,10 @@
         <component class=".update.OtaUpdateActivity" enabled="false" />
     </component-override>
 
+    <component-override package="com.google.android.dialer">
+        <component class=".rtt.settings.impl.gateway.RttSettingsDeepLink" enabled="false" />
+    </component-override>
+
     <component-override package="com.google.android.as">
         <component class="com.google.intelligence.sense.ambientmusic.history.HistoryContentProvider" enabled="false" />
         <component class="com.google.intelligence.sense.ambientmusic.history.HistoryActivity" enabled="false" />

release/aconfig/bp2a/Android.bp

@@ -0,0 +1,32 @@
+//
+// 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.
+
+aconfig_value_set {
+    name: "aconfig_value_set-lineage-bp2a",
+    values: [
+        "aconfig-values-bp2a-android.app-all",
+        "aconfig-values-bp2a-android.media.codec-all",
+        "aconfig-values-bp2a-android.media.tv.flags-all",
+        "aconfig-values-bp2a-android.security-all",
+        "aconfig-values-bp2a-com.android.launcher3-all",
+        "aconfig-values-bp2a-com.android.settings.connectivity-all",
+        "aconfig-values-bp2a-com.android.settings.flags-all",
+        "aconfig-values-bp2a-com.android.settingslib.flags-all",
+        "aconfig-values-bp2a-com.android.settingslib.widget.theme.flags-all",
+        "aconfig-values-bp2a-com.android.systemui-all",
+        "aconfig-values-bp2a-com.android.systemui.shared-all",
+        "aconfig-values-bp2a-com.android.wallpaper-all",
+    ],
+}

release/aconfig/bp2a/android.app/Android.bp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 aconfig_values {
-  name: "aconfig-values-bp3a-android.app-all",
+  name: "aconfig-values-bp2a-android.app-all",
   package: "android.app",
   srcs: [
     "*.textproto",

release/aconfig/bp2a/android.media.codec/Android.bp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-bp3a-android.media.codec-all",
+  name: "aconfig-values-bp2a-android.media.codec-all",
   package: "android.media.codec",
   srcs: [
     "*_flag_values.textproto",

release/aconfig/bp2a/android.media.tv.flags/Android.bp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-bp3a-android.media.tv.flags-all",
+  name: "aconfig-values-bp2a-android.media.tv.flags-all",
   package: "android.media.tv.flags",
   srcs: [
     "*_flag_values.textproto",

release/aconfig/bp2a/android.security/Android.bp

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-bp3a-android.security-all",
+  name: "aconfig-values-bp2a-android.security-all",
   package: "android.security",
   srcs: [
     "*_flag_values.textproto",
   ]
-}
+}

release/aconfig/bp2a/com.android.launcher3/Android.bp

@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+  name: "aconfig-values-bp2a-com.android.launcher3-all",
+  package: "com.android.launcher3",
+  srcs: [
+    "*.textproto",
+  ]
+}

release/aconfig/bp2a/com.android.settings.connectivity/Android.bp

@@ -1,21 +1,22 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-bp3a-com.android.providers.media.flags-all",
-    package: "com.android.providers.media.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
+//
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+    name: "aconfig-values-bp2a-com.android.settings.connectivity-all",
+    package: "com.android.settings.connectivity",
+    srcs: [
+        "*.textproto",
+    ],
+}

release/aconfig/bp2a/com.android.settings.connectivity/settings_wifi_multiuser_declarations.textproto

@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.connectivity"
+  name: "wifi_multiuser"
+  state: ENABLED
+  permission: READ_ONLY
+}

release/aconfig/bp2a/com.android.settings.flags/Android.bp

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 aconfig_values {
-    name: "aconfig-values-bp3a-com.android.settings.flags-all",
+    name: "aconfig-values-bp2a-com.android.settings.flags-all",
     package: "com.android.settings.flags",
     srcs: [
         "*.textproto",

release/aconfig/bp2a/com.android.settingslib.flags/Android.bp

@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+  name: "aconfig-values-bp2a-com.android.settingslib.flags-all",
+  package: "com.android.settingslib.flags",
+  srcs: [
+    "*.textproto",
+  ]
+}

release/aconfig/bp2a/com.android.settingslib.widget.theme.flags/Android.bp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-bp3a-com.android.settingslib.widget.theme.flags-all",
+  name: "aconfig-values-bp2a-com.android.settingslib.widget.theme.flags-all",
   package: "com.android.settingslib.widget.theme.flags",
   srcs: [
     "*.textproto",

release/aconfig/bp2a/com.android.systemui.shared/Android.bp

@@ -1,5 +1,5 @@
 //
-// Copyright 2025 Google Inc. All rights reserved.
+// Copyright 2024 Google Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 aconfig_values {
-    name: "aconfig-values-bp3a-com.android.systemui.shared-all",
+    name: "aconfig-values-bp2a-com.android.systemui.shared-all",
     package: "com.android.systemui.shared",
     srcs: [
         "*.textproto",

release/aconfig/bp2a/com.android.systemui/Android.bp

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 aconfig_values {
-    name: "aconfig-values-bp3a-com.android.systemui-all",
+    name: "aconfig-values-bp2a-com.android.systemui-all",
     package: "com.android.systemui",
     srcs: [
         "*.textproto",

release/aconfig/bp2a/com.android.systemui/notification_animated_actions_treatment.textproto

@@ -1,6 +1,6 @@
 flag_value {
   package: "com.android.systemui"
-  name: "clock_modernization"
+  name: "notification_animated_actions_treatment"
   state: ENABLED
   permission: READ_ONLY
 }

release/aconfig/bp2a/com.android.systemui/notification_background_tint_optimization.textproto

@@ -1,6 +1,6 @@
 flag_value {
   package: "com.android.systemui"
-  name: "communal_responsive_grid"
+  name: "notification_background_tint_optimization"
   state: ENABLED
   permission: READ_ONLY
 }

release/aconfig/bp2a/com.android.systemui/notification_shade_blur.textproto

@@ -1,6 +1,6 @@
 flag_value {
   package: "com.android.systemui"
-  name: "double_tap_to_sleep"
+  name: "notification_shade_blur"
   state: ENABLED
   permission: READ_ONLY
 }

release/aconfig/bp2a/com.android.systemui/notifications_redesign_footer_view.textproto

@@ -1,6 +1,6 @@
 flag_value {
   package: "com.android.systemui"
-  name: "app_clips_backlinks"
+  name: "notifications_redesign_footer_view"
   state: ENABLED
   permission: READ_ONLY
 }

release/aconfig/bp2a/com.android.systemui/notifications_redesign_guts.textproto

@@ -1,6 +1,6 @@
 flag_value {
   package: "com.android.systemui"
-  name: "communal_standalone_support"
+  name: "notifications_redesign_guts"
   state: ENABLED
   permission: READ_ONLY
 }

release/aconfig/bp2a/com.android.wallpaper/Android.bp

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 aconfig_values {
-    name: "aconfig-values-bp3a-com.android.wallpaper-all",
+    name: "aconfig-values-bp2a-com.android.wallpaper-all",
     package: "com.android.wallpaper",
     srcs: [
         "*.textproto",

release/aconfig/bp3a/Android.bp

@@ -1,34 +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.
-
-aconfig_value_set {
-    name: "aconfig_value_set-lineage-bp3a",
-    values: [
-        "aconfig-values-bp3a-android.app-all",
-        "aconfig-values-bp3a-android.hardware.biometrics-all",
-        "aconfig-values-bp3a-android.media.codec-all",
-        "aconfig-values-bp3a-android.media.tv.flags-all",
-        "aconfig-values-bp3a-android.security-all",
-        "aconfig-values-bp3a-com.android.launcher3-all",
-        "aconfig-values-bp3a-com.android.providers.media.flags-all",
-        "aconfig-values-bp3a-com.android.server.display.feature.flags-all",
-        "aconfig-values-bp3a-com.android.settings.flags-all",
-        "aconfig-values-bp3a-com.android.settingslib.flags-all",
-        "aconfig-values-bp3a-com.android.settingslib.widget.theme.flags-all",
-        "aconfig-values-bp3a-com.android.systemui-all",
-        "aconfig-values-bp3a-com.android.systemui.shared-all",
-        "aconfig-values-bp3a-com.android.wallpaper-all",
-    ],
-}

release/aconfig/bp3a/android.hardware.biometrics/screen_off_unlock_udfps_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "screen_off_unlock_udfps"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.launcher3/Android.bp

@@ -1,22 +0,0 @@
-//
-// Copyright 2025 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-bp3a-com.android.launcher3-all",
-    package: "com.android.launcher3",
-    srcs: [
-        "*.textproto",
-    ],
-}

release/aconfig/bp3a/com.android.launcher3/enable_launcher_icon_shapes_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_launcher_icon_shapes"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.providers.media.flags/cloud_media_provider_search_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "cloud_media_provider_search"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.providers.media.flags/cloud_provider_albums_as_category_api_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "cloud_provider_albums_as_category_api"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.providers.media.flags/enable_photopicker_search_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_photopicker_search"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.providers.media.flags/enable_picker_highlight_search_results_apis_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_picker_highlight_search_results_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.providers.media.flags/fetch_cloud_albums_as_categories_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "fetch_cloud_albums_as_categories"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.server.display.feature.flags/Android.bp

@@ -1,22 +0,0 @@
-//
-// Copyright 2025 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-bp3a-com.android.server.display.feature.flags-all",
-    package: "com.android.server.display.feature.flags",
-    srcs: [
-        "*.textproto",
-    ],
-}

release/aconfig/bp3a/com.android.server.display.feature.flags/hdr_brightness_setting.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "hdr_brightness_setting"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.settings.flags/catalyst_firmware_version_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_firmware_version"
-  state: DISABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.settings.flags/enroll_layout_truncate_improvement_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enroll_layout_truncate_improvement"
-  state: DISABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.settingslib.flags/Android.bp

@@ -1,22 +0,0 @@
-//
-// Copyright 2025 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-bp3a-com.android.settingslib.flags-all",
-    package: "com.android.settingslib.flags",
-    srcs: [
-        "*.textproto",
-    ],
-}

release/aconfig/bp3a/com.android.settingslib.flags/new_status_bar_icons.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "new_status_bar_icons"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.systemui.shared/enable_launcher_icon_shapes.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "enable_launcher_icon_shapes"
-  state: ENABLED
-  permission: READ_ONLY
-}

release/aconfig/bp3a/com.android.systemui.shared/extendible_theme_manager.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "extendible_theme_manager"
-  state: ENABLED
-  permission: READ_ONLY
-}