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

Commit a9b979c7 authored by Allen Su's avatar Allen Su Committed by Android (Google) Code Review
Browse files

Merge "Implement B&R for locale notification" into main

parents 0e5688a4 00c40d85

src/com/android/settings/backup/SettingsBackupHelper.java

+6 −0
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 


package com.android.settings.backup;



import static com.android.settings.localepicker.LocaleNotificationDataManager.LOCALE_NOTIFICATION;



import android.app.backup.BackupAgentHelper;

import android.app.backup.BackupDataInputStream;

import android.app.backup.BackupDataOutput;

import android.app.backup.BackupHelper;

import android.app.backup.SharedPreferencesBackupHelper;

import android.os.ParcelFileDescriptor;



import com.android.settings.fuelgauge.BatteryBackupHelper;
@@ -33,12 +36,15 @@ import java.io.IOException; 
 * Backup agent for Settings APK

 */

public class SettingsBackupHelper extends BackupAgentHelper {

    private static final String PREF_LOCALE_NOTIFICATION = "localeNotificationSharedPref";



    @Override

    public void onCreate() {

        super.onCreate();

        addHelper("no-op", new NoOpHelper());

        addHelper(BatteryBackupHelper.TAG, new BatteryBackupHelper(this));

        addHelper(PREF_LOCALE_NOTIFICATION,

                new SharedPreferencesBackupHelper(this, LOCALE_NOTIFICATION));

    }



    @Override

src/com/android/settings/localepicker/LocaleNotificationDataManager.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import java.util.Map; 
 * information.

 */

public class LocaleNotificationDataManager {

    private static final String LOCALE_NOTIFICATION = "locale_notification";

    public static final String LOCALE_NOTIFICATION = "locale_notification";

    private Context mContext;



    /**