From 44c25ed47aad680ae465f5c5ac4817dd56c5165d Mon Sep 17 00:00:00 2001 From: danielwbhuang Date: Wed, 24 Jul 2024 18:02:10 +0800 Subject: [PATCH] Add accessibility appearance related B&R function for Onboarding Add entrance for B&R accessibility appearance related settings. Flag: com.android.settings.flags.accessibility_appearance_settings_backup_enabled Bug: 349941894 Bug: 328585994 Test: manual, need to open aconfig flag. Change-Id: I9617da947201def01f2cfd7f20ce3d11d65f882d --- .../settings/backup/SettingsBackupHelper.java | 15 +++++++++++++-- .../onboarding/OnboardingFeatureProvider.kt | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java index 556ab725c28..73760a42a44 100644 --- a/src/com/android/settings/backup/SettingsBackupHelper.java +++ b/src/com/android/settings/backup/SettingsBackupHelper.java @@ -28,19 +28,30 @@ import com.android.settingslib.datastore.BackupRestoreStorageManager; /** Backup agent for Settings APK */ public class SettingsBackupHelper extends BackupAgentHelper { public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup"; + public static final String ACCESSIBILITY_APPEARANCE_BACKUP_HELPER = + "AccessibilityAppearanceSettingsBackup"; @Override public void onCreate() { super.onCreate(); BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this); + OnboardingFeatureProvider onboardingFeatureProvider = + FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider(); + if (Flags.enableSoundBackup()) { - OnboardingFeatureProvider onboardingFeatureProvider = - FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider(); if (onboardingFeatureProvider != null) { addHelper(SOUND_BACKUP_HELPER, onboardingFeatureProvider. getSoundBackupHelper(this, this.getBackupRestoreEventLogger())); } } + + if (Flags.accessibilityAppearanceSettingsBackupEnabled()) { + if (onboardingFeatureProvider != null) { + addHelper(ACCESSIBILITY_APPEARANCE_BACKUP_HELPER, + onboardingFeatureProvider.getAccessibilityAppearanceBackupHelper( + this, this.getBackupRestoreEventLogger())); + } + } } @Override diff --git a/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt b/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt index f76e29a8353..58afb25b92d 100644 --- a/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt +++ b/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt @@ -39,4 +39,12 @@ interface OnboardingFeatureProvider { * @param logger To log B&R stats. */ fun getSoundBackupHelper(context: Context, logger: BackupRestoreEventLogger): BackupHelper + + /** + * Return a BackupHelper for backup accessibility appearance related settings. + * + * @param context App context + * @param logger To log B&R stats. + */ + fun getAccessibilityAppearanceBackupHelper(context: Context, logger: BackupRestoreEventLogger): BackupHelper } \ No newline at end of file