Add a screen to show OEM backup settings.
Moves the backup settings logic to BackupSettingsHelper and BackupSettingsActivity: - If the manufacturer provides the intent and the label for their backup settings in the config.xml, a new intermediate fragment is shown for Backup settings to let the user pick either standard backup settings or OEM provided backup settings. - If config.xml doesn't contain the intent, BackupSettingsActivity is used as a trampoline activity to launch backup settings provided by the backup transport of the default backup settings activity, i.e. PrivacySettingsActivity. Bug: 34700410 Bug: 33655074 Bug: 33654991 Test: make RunSettingsRoboTests Change-Id: I78e340fbf926b2a9dc2c4e3942f9337c3c7a933c
This commit is contained in:
30
res/xml/backup_settings.xml
Normal file
30
res/xml/backup_settings.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ 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
|
||||
-->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
|
||||
android:title="@string/privacy_settings_title">
|
||||
|
||||
<!-- Backup settings provided by the backup transport or the default settings -->
|
||||
<Preference
|
||||
android:key="backup_settings" />
|
||||
|
||||
<!-- Backup settings provided by the manufacturer -->
|
||||
<Preference
|
||||
android:key="manufacturer_backup" />
|
||||
|
||||
</PreferenceScreen>
|
Reference in New Issue
Block a user