diff options
| author | Chandan Nath <nathch@google.com> | 2019-03-12 10:52:53 +0000 |
|---|---|---|
| committer | Chandan Nath <nathch@google.com> | 2019-03-12 11:01:26 +0000 |
| commit | 4d626f63ec09b03ad9f633cb9ddf0cdc9beeefcd (patch) | |
| tree | d2d0cace3f48c910d40b6634bc495e5f262462b8 /src/com/android/settings/SettingsActivity.java | |
| parent | ece6d94b57ceb0df92bc5880a01f0d98c7f1e820 (diff) | |
| download | packages_apps_Settings-4d626f63ec09b03ad9f633cb9ddf0cdc9beeefcd.tar.gz packages_apps_Settings-4d626f63ec09b03ad9f633cb9ddf0cdc9beeefcd.tar.bz2 packages_apps_Settings-4d626f63ec09b03ad9f633cb9ddf0cdc9beeefcd.zip | |
[Multi-user] Show Backup only if Backup is activated
This almost reverts the change to SettingsActivity#doUpdateTilesList in ag/6140694
except that instead of setting enabled to true, we set it to whether
backup is activated for this user.
Bug: 124114084
Test: 1a) Set up secondary user
1b) See that there is no Backup option in Settings Homepage - System
1c) adb shell bmgr --user 10 activate true
1d) Backup option is now present
1e) adb shell bmgr --user 10 activate false
1f) Backup option isnt there again
Change-Id: I3f17aabee92bedc91386444c2f0aede696d0fd13
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 541ca3a66a..001e65be8b 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -50,6 +50,8 @@ import androidx.preference.PreferenceManager; import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; +import com.android.settings.backup.BackupSettingsHelper; +import com.android.settings.backup.UserBackupSettingsActivity; import com.android.settings.core.OnActivityResultListener; import com.android.settings.core.SettingsBaseActivity; import com.android.settings.core.SubSettingLauncher; @@ -630,6 +632,12 @@ public class SettingsActivity extends SettingsBaseActivity showDev, isAdmin) || somethingChanged; + // Enable/disable backup settings depending on whether backup is activated for the user. + boolean isBackupActive = new BackupSettingsHelper(this).isBackupServiceActive(); + somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, + UserBackupSettingsActivity.class.getName()), isBackupActive, isAdmin) + || somethingChanged; + somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, Settings.WifiDisplaySettingsActivity.class.getName()), WifiDisplaySettings.isAvailable(this), isAdmin) |