Merge "Suppress failing Settings Robolectric tests"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0de7a4e..a854eef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1373,11 +1373,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="-2">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.personal" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.PrivacySettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2029,15 +2024,6 @@
</activity>
<receiver
- android:name=".bluetooth.BluetoothDiscoveryReceiver">
- <intent-filter>
- <action android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" />
- <action android:name="android.bluetooth.adapter.action.DISCOVERY_FINISHED" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </receiver>
-
- <receiver
android:name=".bluetooth.DockEventReceiver">
<intent-filter>
<action android:name="android.intent.action.DOCK_EVENT" />
@@ -3007,10 +2993,9 @@
android:resource="@string/gesture_preference_summary" />
</activity>
- <activity android:name="BackupSettingsActivity"
+ <activity android:name=".backup.BackupSettingsActivity"
android:label="@string/privacy_settings_title"
android:icon="@drawable/ic_settings_backup"
- android:theme="@android:style/Theme.NoDisplay"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
@@ -3268,21 +3253,8 @@
android:value="true" />
</activity-alias>
- <activity-alias android:name="PrivacyDashboardAlias"
- android:targetActivity="Settings$PrivacySettingsActivity">
- <intent-filter android:priority="60">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.system" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.PrivacySettings" />
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity-alias>
-
<activity-alias android:name="BackupResetDashboardAlias"
- android:targetActivity=".BackupSettingsActivity">
+ android:targetActivity=".backup.BackupSettingsActivity">
<intent-filter android:priority="60">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 8b79eaf..29d7b53 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -129,14 +129,25 @@
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="beginning|middle|end">
- <Button android:id="@+id/action_button"
- android:layout_width="match_parent"
- android:layout_gravity="start"
- android:gravity="start|center_vertical"
- android:maxLines="2"
- style="?android:attr/buttonBarButtonStyle"
- android:textAllCaps="false"
- android:layout_height="wrap_content" />
+ <LinearLayout
+ android:id="@+id/restricted_action"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+ <Button android:id="@+id/action_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:gravity="start|center_vertical"
+ android:maxLines="2"
+ style="?android:attr/buttonBarButtonStyle"
+ android:clickable="false"
+ android:focusable="false"
+ android:textAllCaps="false"
+ />
+ <include layout="@layout/restricted_icon" />
+ </LinearLayout>
<Button android:id="@+id/cancel_button"
android:layout_width="match_parent"
android:layout_gravity="end"
diff --git a/res/values/config.xml b/res/values/config.xml
index 75d8697..fae38fc 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -45,9 +45,12 @@
<string name="config_wallpaper_picker_package" translatable="false">com.android.settings</string>
<string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string>
- <!-- Backup settings to launch -->
+ <!-- Manufacturer backup settings to launch -->
<string name="config_backup_settings_intent" translatable="false"></string>
+ <!-- Manufacturer backup settings label -->
+ <string name="config_backup_settings_label" translatable="true"></string>
+
<!-- Double twist sensor name and vendor used by gesture setting -->
<string name="gesture_double_twist_sensor_name" translatable="false"></string>
<string name="gesture_double_twist_sensor_vendor" translatable="false"></string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2879002..22d8031 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6370,6 +6370,9 @@
<!-- [CHAR LIMIT=NONE] App notification settings: channels title -->
<string name="notification_channels">Channels</string>
+ <!-- [CHAR LIMIT=NONE] App notification settings: no channels -->
+ <string name="no_channels">This app has not posted any notifications</string>
+
<!-- [CHAR LIMIT=60] App notification settings: Text to display for deleted channels -->
<string name="deleted_channel_name"><xliff:g id="channel_name" example="Promotions">%1$s</xliff:g> (deleted)</string>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 7d51fa8..c68e456 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -23,7 +23,6 @@
android:key="block"
android:title="@string/app_notification_block_title"
android:summary="@string/app_notification_block_summary"
- android:order="1"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
@@ -32,13 +31,11 @@
android:key="badge"
android:title="@string/notification_badge_title"
android:summary="@string/notification_badge_summary"
- android:order="2"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<PreferenceCategory
android:key="channels"
- android:title="@string/notification_channels"
- android:order="3" />
+ android:title="@string/notification_channels" />
</PreferenceScreen>
diff --git a/res/xml/backup_settings.xml b/res/xml/backup_settings.xml
new file mode 100644
index 0000000..30792bc
--- /dev/null
+++ b/res/xml/backup_settings.xml
@@ -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>
diff --git a/src/com/android/settings/BackupSettingsActivity.java b/src/com/android/settings/BackupSettingsActivity.java
deleted file mode 100644
index a4cc4b7..0000000
--- a/src/com/android/settings/BackupSettingsActivity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.app.backup.BackupManager;
-import android.app.backup.IBackupManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.net.URISyntaxException;
-
-/**
- * A trampoline activity used to launch the configured Backup activity.
- * This activity used the theme NoDisplay to minimize the flicker that might be seen for the launch-
- * finsih transition.
- */
-public class BackupSettingsActivity extends Activity {
- private static final String TAG = "BackupSettingsActivity";
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- String backup = getResources().getString(R.string.config_backup_settings_intent);
- if (!TextUtils.isEmpty(backup)) {
- try {
- Intent intent = Intent.parseUri(backup, 0);
- if (intent.resolveActivity(getPackageManager()) != null) {
- // use startActivityForResult to let the activity check the caller signature
- IBackupManager bmgr = IBackupManager.Stub.asInterface(
- ServiceManager.getService(Context.BACKUP_SERVICE));
- boolean backupOkay;
- try {
- backupOkay = bmgr.isBackupServiceActive(UserHandle.myUserId());
- } catch (Exception e) {
- // things go wrong talking to the backup system => ignore and
- // pass the default 'false' as the "backup is a thing?" state.
- backupOkay = false;
- }
- intent.putExtra(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE, backupOkay);
- startActivityForResult(intent, -1);
- } else {
- Log.e(TAG, "Backup component not found!");
- }
- } catch (URISyntaxException e) {
- Log.e(TAG, "Invalid backup component URI!", e);
- }
- }
- finish();
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index d6a072c..fb2f29f 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -61,8 +61,10 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.R;
import com.android.settings.users.UserDialogs;
-
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
@@ -345,13 +347,26 @@
});
mActionButton = (Button) findViewById(R.id.action_button);
- mActionButton.setFilterTouchesWhenObscured(true);
- mActionButton.setOnClickListener(new View.OnClickListener() {
+
+ final View restrictedAction = findViewById(R.id.restricted_action);
+ restrictedAction.setFilterTouchesWhenObscured(true);
+ restrictedAction.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
if (mAdding) {
addAndFinish();
} else if (isManagedProfile(mDeviceAdmin)
&& mDeviceAdmin.getComponent().equals(mDPM.getProfileOwner())) {
+ if (hasBaseCantRemoveProfileRestriction()) {
+ // If DISALLOW_REMOVE_MANAGED_PROFILE is set by the system, there's no
+ // point showing a dialog saying it's disabled by an admin.
+ return;
+ }
+ EnforcedAdmin enforcedAdmin = getAdminEnforcingCantRemoveProfile();
+ if (enforcedAdmin != null) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(DeviceAdminAdd.this,
+ enforcedAdmin);
+ return;
+ }
final int userId = UserHandle.myUserId();
UserDialogs.createRemoveDialog(DeviceAdminAdd.this, userId,
new DialogInterface.OnClickListener() {
@@ -522,6 +537,7 @@
}
void updateInterface() {
+ findViewById(R.id.restricted_icon).setVisibility(View.GONE);
mAdminIcon.setImageDrawable(mDeviceAdmin.loadIcon(getPackageManager()));
mAdminName.setText(mDeviceAdmin.loadLabel(getPackageManager()));
try {
@@ -551,6 +567,13 @@
// Profile owner in a managed profile, user can remove profile to disable admin.
mAdminWarning.setText(R.string.admin_profile_owner_message);
mActionButton.setText(R.string.remove_managed_profile_label);
+
+ final EnforcedAdmin admin = getAdminEnforcingCantRemoveProfile();
+ final boolean hasBaseRestriction = hasBaseCantRemoveProfileRestriction();
+ if (admin != null && !hasBaseRestriction) {
+ findViewById(R.id.restricted_icon).setVisibility(View.VISIBLE);
+ }
+ mActionButton.setEnabled(admin == null && !hasBaseRestriction);
} else if (isProfileOwner || mDeviceAdmin.getComponent().equals(
mDPM.getDeviceOwnerComponentOnCallingUser())) {
// Profile owner in a user or device owner, user can't disable admin.
@@ -601,6 +624,22 @@
}
}
+ private EnforcedAdmin getAdminEnforcingCantRemoveProfile() {
+ // Removing a managed profile is disallowed if DISALLOW_REMOVE_MANAGED_PROFILE
+ // is set in the parent rather than the user itself.
+ return RestrictedLockUtils.checkIfRestrictionEnforced(this,
+ UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, getParentUserId());
+ }
+
+ private boolean hasBaseCantRemoveProfileRestriction() {
+ return RestrictedLockUtils.hasBaseUserRestriction(this,
+ UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, getParentUserId());
+ }
+
+ private int getParentUserId() {
+ return UserManager.get(this).getProfileParent(UserHandle.myUserId()).id;
+ }
+
private void addDeviceAdminPolicies(boolean showDescription) {
if (!mAdminPoliciesInitialized) {
boolean isAdminUser = UserManager.get(this).isAdminUser();
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index c01e4c4..c2060ce 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -54,6 +54,7 @@
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
+import com.android.settings.backup.BackupSettingsActivity;
import com.android.settings.core.gateway.SettingsGateway;
import com.android.settings.core.instrumentation.SharedPreferencesLogger;
import com.android.settings.dashboard.DashboardContainerFragment;
@@ -965,29 +966,11 @@
}
}
- String backupIntent = getResources().getString(R.string.config_backup_settings_intent);
- boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
+ // Enable/disable backup settings depending on whether the user is admin.
setTileEnabled(new ComponentName(packageName,
- Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin);
+ BackupSettingsActivity.class.getName()), true, isAdmin);
setTileEnabled(new ComponentName(packageName,
- "com.android.settings.PrivacyDashboardAlias"),
- useDefaultBackup, isAdmin);
-
- boolean hasBackupActivity = false;
- if (!useDefaultBackup) {
- try {
- Intent intent = Intent.parseUri(backupIntent, 0);
- hasBackupActivity = !getPackageManager().queryIntentActivities(intent, 0).isEmpty();
- } catch (URISyntaxException e) {
- Log.e(LOG_TAG, "Invalid backup intent URI!", e);
- }
- }
-
- // Enable/disable BackupSettingsActivity and its alias.
- setTileEnabled(new ComponentName(packageName,
- BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin);
- setTileEnabled(new ComponentName(packageName,
- "com.android.settings.BackupResetDashboardAlias"), hasBackupActivity, isAdmin);
+ "com.android.settings.BackupResetDashboardAlias"), true, isAdmin);
setTileEnabled(new ComponentName(packageName,
Settings.EnterprisePrivacySettingsActivity.class.getName()),
diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
new file mode 100644
index 0000000..b195384
--- /dev/null
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -0,0 +1,56 @@
+/*
+ * 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
+ */
+
+package com.android.settings.backup;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+
+/**
+ * The activity used to launch the configured Backup activity or the preference screen
+ * if the manufacturer provided their backup settings.
+ */
+public class BackupSettingsActivity extends Activity {
+ private static final String TAG = "BackupSettingsActivity";
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ BackupSettingsHelper backupHelper = new BackupSettingsHelper(this);
+
+ if (!backupHelper.isBackupProvidedByManufacturer()) {
+ // If manufacturer specific backup settings are not provided then launch
+ // the backup settings provided by backup transport or the default one directly.
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG,
+ "No manufacturer settings found, launching the backup settings directly");
+ }
+ // use startActivityForResult to let the activity check the caller signature
+ startActivityForResult(backupHelper.getIntentForBackupSettings(), 1);
+ finish();
+ } else {
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Manufacturer provided backup settings, showing the preference screen");
+ }
+ getFragmentManager().beginTransaction()
+ .replace(android.R.id.content, new BackupSettingsFragment())
+ .commit();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java
new file mode 100644
index 0000000..dcc1608
--- /dev/null
+++ b/src/com/android/settings/backup/BackupSettingsFragment.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ */
+
+package com.android.settings.backup;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
+
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Fragment showing the items to launch different backup settings screens.
+ */
+public class BackupSettingsFragment extends DashboardFragment {
+ private static final String TAG = "BackupSettings";
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ }
+
+ /**
+ * Get the tag string for logging.
+ */
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ /**
+ * Get the res id for static preference xml for this fragment.
+ */
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.backup_settings;
+ }
+
+ /**
+ * Get a list of {@link PreferenceController} for this fragment.
+ */
+ @Override
+ protected List<PreferenceController> getPreferenceControllers(Context context) {
+ final List<PreferenceController> controllers = new ArrayList<>();
+ controllers.add(new BackupSettingsPreferenceController(context));
+ return controllers;
+ }
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.backup_settings;
+ return Arrays.asList(sir);
+ }
+ };
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.BACKUP_SETTINGS;
+ }
+}
diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java
new file mode 100644
index 0000000..b0d6cf8
--- /dev/null
+++ b/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -0,0 +1,237 @@
+/*
+ * 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
+ */
+
+package com.android.settings.backup;
+
+
+import android.app.backup.BackupManager;
+import android.app.backup.IBackupManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.util.Log;
+
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.Settings.PrivacySettingsActivity;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
+import java.net.URISyntaxException;
+
+/**
+ * Helper class for {@link BackupSettingsActivity} that interacts with {@link IBackupManager}.
+ */
+public class BackupSettingsHelper {
+ private static final String TAG = "BackupSettingsHelper";
+
+ private IBackupManager mBackupManager = IBackupManager.Stub.asInterface(
+ ServiceManager.getService(Context.BACKUP_SERVICE));
+
+ private Context mContext;
+
+ public BackupSettingsHelper(Context context) {
+ mContext = context;
+ }
+
+ /**
+ * Returns an intent to launch backup settings from backup transport if the intent was provided
+ * by the transport. Otherwise returns the intent to launch the default backup settings screen.
+ *
+ * @return Intent for launching backup settings
+ */
+ public Intent getIntentForBackupSettings() {
+ Intent intent;
+ if (isIntentProvidedByTransport()) {
+ intent = getIntentForBackupSettingsFromTransport();
+ } else {
+ Log.e(TAG, "Backup transport has not provided an intent"
+ + " or the component for the intent is not found!");
+ intent = getIntentForDefaultBackupSettings();
+ }
+ return intent;
+ }
+
+ /**
+ * Returns a label for the settings item that will point to the backup settings provided by
+ * the transport. If no label was provided by transport, returns the default string.
+ *
+ * @return Label for the backup settings item.
+ */
+ public String getLabelForBackupSettings() {
+ String label = getLabelFromBackupTransport();
+ if (label == null || label.isEmpty()) {
+ label = mContext.getString(R.string.privacy_settings_title);
+ }
+ return label;
+ }
+
+ /**
+ * Returns a summary string for the settings item that will point to the backup settings
+ * provided by the transport. If no summary was provided by transport, returns the default
+ * string.
+ *
+ * @return Summary for the backup settings item.
+ */
+ public String getSummaryForBackupSettings() {
+ String summary = getSummaryFromBackupTransport();
+ if (summary == null) {
+ summary = mContext.getString(R.string.backup_configure_account_default_summary);
+ }
+ return summary;
+ }
+
+
+ /**
+ * Checks if the manufacturer provided an intent to launch its backup settings screen
+ * in the config file.
+ */
+ public boolean isBackupProvidedByManufacturer() {
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Checking if intent provided by manufacturer");
+ }
+ String intentString =
+ mContext.getResources().getString(R.string.config_backup_settings_intent);
+
+ return intentString != null && !intentString.isEmpty();
+ }
+
+ /**
+ * Returns the label for the backup settings item provided by the manufacturer.
+ */
+ public String getLabelProvidedByManufacturer() {
+ return mContext.getResources().getString(R.string.config_backup_settings_label);
+ }
+
+ /**
+ * Returns the intent to the backup settings screen provided by the manufacturer.
+ */
+ public Intent getIntentProvidedByManufacturer() {
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Getting a backup settings intent provided by manufacturer");
+ }
+ String intentString =
+ mContext.getResources().getString(R.string.config_backup_settings_intent);
+ if (intentString != null && !intentString.isEmpty()) {
+ try {
+ return Intent.parseUri(intentString, 0);
+ } catch (URISyntaxException e) {
+ Log.e(TAG, "Invalid intent provided by the manufacturer.", e);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Gets the intent from Backup transport and adds the extra depending on whether the user has
+ * rights to see backup settings.
+ *
+ * @return Intent to launch Backup settings provided by the Backup transport.
+ */
+ @VisibleForTesting
+ Intent getIntentForBackupSettingsFromTransport() {
+ Intent intent = getIntentFromBackupTransport();
+ if (intent != null) {
+ intent.putExtra(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE, isBackupServiceActive());
+ }
+ return intent;
+ }
+
+ private Intent getIntentForDefaultBackupSettings() {
+ // Extra needed by {@link SettingsDrawerActivity} to show the back button navigation.
+ return new Intent(mContext, PrivacySettingsActivity.class)
+ .putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
+ }
+
+ /**
+ * Checks if the transport provided the intent to launch the backup settings and if that
+ * intent resolves to an activity.
+ */
+ @VisibleForTesting
+ boolean isIntentProvidedByTransport() {
+ Intent intent = getIntentFromBackupTransport();
+ return intent != null && intent.resolveActivity(mContext.getPackageManager()) != null;
+ }
+
+ /**
+ * Gets an intent to launch the backup settings from the current transport using
+ * {@link com.android.internal.backup.IBackupTransport#dataManagementIntent()} API.
+ *
+ * @return intent provided by transport or null if no intent was provided.
+ */
+ private Intent getIntentFromBackupTransport() {
+ try {
+ Intent intent =
+ mBackupManager.getDataManagementIntent(mBackupManager.getCurrentTransport());
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ if (intent != null) {
+ Log.d(TAG, "Parsed intent from backup transport: " + intent.toString());
+ } else {
+ Log.d(TAG, "Received a null intent from backup transport");
+ }
+ }
+ return intent;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting data management intent", e);
+ }
+ return null;
+ }
+
+ /** Checks if backup service is enabled for this user. */
+ private boolean isBackupServiceActive() {
+ boolean backupOkay;
+ try {
+ backupOkay = mBackupManager.isBackupServiceActive(UserHandle.myUserId());
+ } catch (Exception e) {
+ // things go wrong talking to the backup system => ignore and
+ // pass the default 'false' as the "backup is a thing?" state.
+ backupOkay = false;
+ }
+ return backupOkay;
+ }
+
+ @VisibleForTesting
+ String getLabelFromBackupTransport() {
+ try {
+ String label =
+ mBackupManager.getDataManagementLabel(mBackupManager.getCurrentTransport());
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Received the backup settings label from backup transport: " + label);
+ }
+ return label;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting data management label", e);
+ }
+ return null;
+ }
+
+ @VisibleForTesting
+ String getSummaryFromBackupTransport() {
+ try {
+ String summary =
+ mBackupManager.getDestinationString(mBackupManager.getCurrentTransport());
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG,
+ "Received the backup settings summary from backup transport: " + summary);
+ }
+ return summary;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting data management summary", e);
+ }
+ return null;
+ }
+}
diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
new file mode 100644
index 0000000..2c4605a
--- /dev/null
+++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ */
+
+package com.android.settings.backup;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+
+public class BackupSettingsPreferenceController extends PreferenceController {
+ private static final String BACKUP_SETTINGS = "backup_settings";
+ private static final String MANUFACTURER_SETTINGS = "manufacturer_backup";
+ private Intent mBackupSettingsIntent;
+ private String mBackupSettingsTitle;
+ private String mBackupSettingsSummary;
+ private Intent mManufacturerIntent;
+ private String mManufacturerLabel;
+
+ public BackupSettingsPreferenceController(Context context) {
+ super(context);
+ BackupSettingsHelper settingsHelper = new BackupSettingsHelper(context);
+ mBackupSettingsIntent = settingsHelper.getIntentForBackupSettings();
+ mBackupSettingsTitle = settingsHelper.getLabelForBackupSettings();
+ mBackupSettingsSummary = settingsHelper.getSummaryForBackupSettings();
+ mManufacturerIntent = settingsHelper.getIntentProvidedByManufacturer();
+ mManufacturerLabel = settingsHelper.getLabelProvidedByManufacturer();
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ Preference backupSettings = screen.findPreference(BACKUP_SETTINGS);
+ Preference manufacturerSettings = screen.findPreference(MANUFACTURER_SETTINGS);
+ backupSettings.setIntent(mBackupSettingsIntent);
+ backupSettings.setTitle(mBackupSettingsTitle);
+ backupSettings.setSummary(mBackupSettingsSummary);
+ manufacturerSettings.setIntent(mManufacturerIntent);
+ manufacturerSettings.setTitle(mManufacturerLabel);
+ }
+
+ /**
+ * Returns true if preference is available (should be displayed)
+ */
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ /**
+ * Returns the key for this preference.
+ */
+ @Override
+ public String getPreferenceKey() {
+ return null;
+ }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
deleted file mode 100644
index 1ba9f85..0000000
--- a/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.android.settingslib.bluetooth.BluetoothEventManager;
-
-/**
- * BluetoothDiscoveryReceiver updates a timestamp when the
- * Bluetooth adapter starts or finishes discovery mode. This
- * is used to decide whether to open an alert dialog or
- * create a notification when we receive a pairing request.
- *
- * <p>Note that the discovery start/finish intents are also handled
- * by {@link BluetoothEventManager} to update the UI, if visible.
- */
-public final class BluetoothDiscoveryReceiver extends BroadcastReceiver {
- private static final String TAG = "BluetoothDiscoveryReceiver";
-
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- Log.v(TAG, "Received: " + action);
-
- if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED) ||
- action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
- LocalBluetoothPreferences.persistDiscoveringTimestamp(context);
- }
- }
-}
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index 020ca0c..52a015e 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -938,13 +938,7 @@
public void onDeviceAdded(CachedBluetoothDevice cachedDevice) { }
public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) { }
public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
-
- @Override
- public void onScanningStateChanged(boolean started) {
- // TODO: Find a more unified place for a persistent BluetoothCallback to live
- // as this is not exactly dock related.
- LocalBluetoothPreferences.persistDiscoveringTimestamp(mContext);
- }
+ public void onScanningStateChanged(boolean started) { }
@Override
public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 6150920..6a0bdcf 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -40,8 +40,6 @@
// of raising notifications
private static final int GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND = 60 * 1000;
- private static final String KEY_DISCOVERING_TIMESTAMP = "last_discovering_time";
-
private static final String KEY_LAST_SELECTED_DEVICE = "last_selected_device";
private static final String KEY_LAST_SELECTED_DEVICE_TIME = "last_selected_device_time";
@@ -95,11 +93,14 @@
// If the device was discoverING recently
LocalBluetoothAdapter adapter = manager.getBluetoothAdapter();
- if (adapter != null && adapter.isDiscovering()) {
- return true;
- } else if ((sharedPreferences.getLong(KEY_DISCOVERING_TIMESTAMP, 0) +
+ if (adapter != null) {
+ if (adapter.isDiscovering()) {
+ return true;
+ }
+ if ((adapter.getDiscoveryEndMillis() +
GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND) > currentTimeMillis) {
- return true;
+ return true;
+ }
}
// If the device was picked in the device picker recently
@@ -147,20 +148,6 @@
editor.apply();
}
- static void persistDiscoveringTimestamp(final Context context) {
- // Load the shared preferences and edit it on a background
- // thread (but serialized!).
- QueuedWork.queue(new Runnable() {
- public void run() {
- SharedPreferences.Editor editor = getSharedPreferences(context).edit();
- editor.putLong(
- KEY_DISCOVERING_TIMESTAMP,
- System.currentTimeMillis());
- editor.apply();
- }
- }, false);
- }
-
static boolean hasDockAutoConnectSetting(Context context, String addr) {
return getSharedPreferences(context).contains(KEY_DOCK_AUTO_CONNECT + addr);
}
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 45762c7..ef62fbb 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -19,7 +19,7 @@
import android.app.Activity;
import android.app.Notification;
import android.app.NotificationChannel;
-import android.content.Context;
+import android.app.NotificationChannelGroup;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
@@ -38,13 +38,11 @@
import com.android.settings.Utils;
import com.android.settings.applications.AppHeaderController;
import com.android.settings.applications.AppInfoBase;
-import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.drawer.CategoryKey;
import java.text.Collator;
import java.util.Collections;
@@ -66,7 +64,7 @@
private DashboardFeatureProvider mDashboardFeatureProvider;
private PreferenceCategory mChannels;
- private List<NotificationChannel> mChannelList;
+ private List<NotificationChannelGroup> mChannelGroupList;
@Override
public void onActivityCreated(Bundle savedInstanceState) {
@@ -96,6 +94,7 @@
FeatureFactory.getFactory(activity).getDashboardFeatureProvider(activity);
addPreferencesFromResource(R.xml.app_notification_settings);
+ getPreferenceScreen().setOrderingAsAdded(true);
mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
@@ -108,36 +107,57 @@
ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
rows.put(mAppRow.pkg, mAppRow);
collectConfigActivities(rows);
- mChannelList = mBackend.getChannels(mPkg, mUid).getList();
- Collections.sort(mChannelList, mChannelComparator);
+ // TODO: load channels in asynctask?
+ mChannelGroupList = mBackend.getChannelGroups(mPkg, mUid).getList();
+ Collections.sort(mChannelGroupList, mChannelGroupComparator);
- if (mChannelList.isEmpty()) {
- setVisible(mChannels, false);
+ if (mChannelGroupList.isEmpty()) {
+ Preference empty = new Preference(getPrefContext());
+ empty.setTitle(R.string.no_channels);
+ empty.setEnabled(false);
+ mChannels.addPreference(empty);
} else {
- int N = mChannelList.size();
- for (int i = 0; i < N; i++) {
- final NotificationChannel channel = mChannelList.get(i);
- RestrictedPreference channelPref = new RestrictedPreference(getPrefContext());
- channelPref.setDisabledByAdmin(mSuspendedAppsAdmin);
- channelPref.setKey(channel.getId());
- channelPref.setTitle(channel.getName());
-
- if (channel.isDeleted()) {
- channelPref.setTitle(
- getString(R.string.deleted_channel_name, channel.getName()));
- channelPref.setEnabled(false);
- } else {
- Bundle channelArgs = new Bundle();
- channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
- channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
- channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
- channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
- Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
- ChannelNotificationSettings.class.getName(),
- channelArgs, null, 0, null, false);
- channelPref.setIntent(channelIntent);
+ for (NotificationChannelGroup group : mChannelGroupList) {
+ PreferenceCategory groupCategory = null;
+ if (group.getId() != null && group.getName() != null) {
+ groupCategory = new PreferenceCategory(getPrefContext());
+ groupCategory.setTitle(group.getName());
+ groupCategory.setKey(group.getId());
+ groupCategory.setOrderingAsAdded(true);
+ getPreferenceScreen().addPreference(groupCategory);
}
- mChannels.addPreference(channelPref);
+ final List<NotificationChannel> channels = group.getChannels();
+ Collections.sort(channels, mChannelComparator);
+ int N = channels.size();
+ for (int i = 0; i < N; i++) {
+ final NotificationChannel channel = channels.get(i);
+ RestrictedPreference channelPref = new RestrictedPreference(
+ getPrefContext());
+ channelPref.setDisabledByAdmin(mSuspendedAppsAdmin);
+ channelPref.setKey(channel.getId());
+ channelPref.setTitle(channel.getName());
+
+ if (channel.isDeleted()) {
+ channelPref.setTitle(
+ getString(R.string.deleted_channel_name, channel.getName()));
+ channelPref.setEnabled(false);
+ } else {
+ Bundle channelArgs = new Bundle();
+ channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
+ channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
+ channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
+ channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
+ Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+ ChannelNotificationSettings.class.getName(),
+ channelArgs, null, 0, null, false);
+ channelPref.setIntent(channelIntent);
+ }
+ if (groupCategory != null) {
+ groupCategory.addPreference(channelPref);
+ } else {
+ mChannels.addPreference(channelPref);
+ }
+ }
}
}
updateDependents(mAppRow.banned);
@@ -203,7 +223,7 @@
}
private void updateDependents(boolean banned) {
- setVisible(mChannels, !(mChannelList.isEmpty() || banned));
+ setVisible(mChannels, !banned);
setVisible(mBadge, !banned);
}
@@ -262,4 +282,25 @@
return left.getId().compareTo(right.getId());
}
};
+
+ private Comparator<NotificationChannelGroup> mChannelGroupComparator =
+ new Comparator<NotificationChannelGroup>() {
+ private final Collator sCollator = Collator.getInstance();
+
+ @Override
+ public int compare(NotificationChannelGroup left, NotificationChannelGroup right) {
+ // Non-groups channels (in placeholder group with a null id) come first
+ if (left.getId() == null && right.getId() != null) {
+ return 1;
+ } else if (right.getId() == null && left.getId() != null) {
+ return -1;
+ }
+ // sort rest of the groups by name
+ if (!Objects.equals(left.getName(), right.getName())) {
+ return sCollator.compare(left.getName().toString(),
+ right.getName().toString());
+ }
+ return left.getId().compareTo(right.getId());
+ }
+ };
}
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index ecce79e..6fa833a 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -186,7 +186,7 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
Uri ringtone = Uri.parse((String) newValue);
mRingtone.setRingtone(ringtone);
- mChannel.setSound(ringtone);
+ mChannel.setSound(ringtone, mChannel.getAudioAttributes());
mChannel.lockFields(NotificationChannel.USER_LOCKED_SOUND);
mBackend.updateChannel(mPkg, mUid, mChannel);
return false;
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 124579f..2a2185d 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -17,6 +17,7 @@
import android.app.INotificationManager;
import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
@@ -121,9 +122,9 @@
}
}
- public ParceledListSlice<NotificationChannel> getChannels(String pkg, int uid) {
+ public ParceledListSlice<NotificationChannelGroup> getChannelGroups(String pkg, int uid) {
try {
- return sINM.getNotificationChannelsForPackage(pkg, uid, true);
+ return sINM.getNotificationChannelGroupsForPackage(pkg, uid, true);
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
return ParceledListSlice.emptyList();
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index aa3c257..4a73469 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -37,6 +37,7 @@
import com.android.settings.applications.AdvancedAppSettings;
import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.SpecialAccessSettings;
+import com.android.settings.backup.BackupSettingsFragment;
import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.datausage.DataUsageMeteredSettings;
@@ -156,6 +157,7 @@
NO_DATA_RES_ID, R.drawable.ic_settings_language);
addIndex(PhysicalKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
addIndex(PrivacySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
+ addIndex(BackupSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
addIndex(DateTimeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_date_time);
addIndex(AccessibilitySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accessibility);
addIndex(PrintSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_print);
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
new file mode 100644
index 0000000..0205124
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -0,0 +1,388 @@
+/*
+ * 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
+ */
+
+package com.android.settings.backup;
+
+import android.app.backup.BackupManager;
+import android.app.backup.IBackupManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.IBinder;
+import android.os.RemoteException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+ shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class})
+public class BackupSettingsHelperTest {
+
+ private static final String DEFAULT_SETTINGS_CLASSNAME =
+ "com.android.settings.Settings$PrivacySettingsActivity";
+
+ private static final int DEFAULT_SUMMARY_RESOURCE =
+ R.string.backup_configure_account_default_summary;
+
+ private static final int DEFAULT_LABEL_RESOURCE =
+ R.string.privacy_settings_title;
+
+ private static final int MANUFACTURER_INTENT_RESOURCE = R.string.config_backup_settings_intent;
+
+ private static final int MANUFACTURER_LABEL_RESOURCE = R.string.config_backup_settings_label;
+
+ private Context mContext;
+
+ private BackupSettingsHelper mBackupSettingsHelper;
+
+ @Mock
+ private static IBackupManager mBackupManager;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ when(mBackupManager.getCurrentTransport()).thenReturn("test_transport");
+ mBackupSettingsHelper = new BackupSettingsHelper(mContext);
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport() throws Exception {
+ Intent intent = new Intent();
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ verify(mBackupManager).getDataManagementIntent(anyString());
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport_WithIntent() throws Exception {
+ Intent intent = mock(Intent.class);
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ assertThat(backupIntent).isEqualTo(intent);
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport_WithNullIntent() throws Exception {
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(null);
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ assertThat(backupIntent).isNull();
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport_RemoteException() throws Exception {
+ when(mBackupManager.getDataManagementIntent(anyString())).thenThrow(new RemoteException());
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ assertThat(backupIntent).isNull();
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport_BackupEnabled() throws Exception {
+ Intent intent = new Intent("test_intent");
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+ when(mBackupManager.isBackupServiceActive(anyInt())).thenReturn(true);
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ assertThat(backupIntent.getExtras().get(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE))
+ .isEqualTo(true);
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport_BackupDisabled() throws Exception {
+ Intent intent = new Intent("test_intent");
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+ when(mBackupManager.isBackupServiceActive(anyInt())).thenReturn(false);
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ assertThat(backupIntent.getExtras().get(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE))
+ .isEqualTo(false);
+ }
+
+ @Test
+ public void testGetIntentFromBackupTransport_BackupStatusException() throws Exception {
+ Intent intent = new Intent("test_intent");
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+ when(mBackupManager.isBackupServiceActive(anyInt())).thenThrow(new RemoteException());
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+
+ assertThat(backupIntent.getExtras().get(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE))
+ .isEqualTo(false);
+ }
+
+ @Test
+ public void testIsIntentProvidedByTransport_WithNullIntent() throws Exception {
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(null);
+
+ boolean isIntentProvided = mBackupSettingsHelper.isIntentProvidedByTransport();
+
+ assertThat(isIntentProvided).isFalse();
+ }
+
+ @Test
+ public void testIsIntentProvidedByTransport_WithInvalidIntent() throws Exception {
+ Intent intent = mock(Intent.class);
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+
+ PackageManager packageManager = mock(PackageManager.class);
+ when(mContext.getPackageManager()).thenReturn(packageManager);
+ when(intent.resolveActivity(packageManager)).thenReturn(null);
+
+ boolean isIntentProvided = mBackupSettingsHelper.isIntentProvidedByTransport();
+
+ assertThat(isIntentProvided).isFalse();
+ }
+
+ @Test
+ public void testIsIntentProvidedByTransport_WithIntent() throws Exception {
+ Intent intent = mock(Intent.class);
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+
+ PackageManager packageManager = mock(PackageManager.class);
+ when(mContext.getPackageManager()).thenReturn(packageManager);
+ when(intent.resolveActivity(packageManager)).thenReturn(mock(ComponentName.class));
+
+ boolean isIntentProvided = mBackupSettingsHelper.isIntentProvidedByTransport();
+
+ assertThat(isIntentProvided).isTrue();
+ }
+
+ @Test
+ public void testGetSummaryFromBackupTransport() throws Exception {
+ String summary = "test_summary";
+
+ when(mBackupManager.getDestinationString(anyString())).thenReturn(summary);
+
+ String backupSummary = mBackupSettingsHelper.getSummaryFromBackupTransport();
+
+ assertThat(backupSummary).isEqualTo(summary);
+ }
+
+ @Test
+ public void testGetSummaryFromBackupTransport_RemoteException() throws Exception {
+ when(mBackupManager.getDestinationString(anyString())).thenThrow(new RemoteException());
+
+ String backupSummary = mBackupSettingsHelper.getSummaryFromBackupTransport();
+
+ assertThat(backupSummary).isNull();
+ }
+
+ @Test
+ public void testGetLabelBackupTransport() throws Exception {
+ String label = "test_label";
+
+ when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
+
+ String backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
+
+ assertThat(backupLabel).isEqualTo(label);
+ }
+
+ @Test
+ public void testGetLabelBackupTransport_RemoteException() throws Exception {
+ when(mBackupManager.getDataManagementLabel(anyString())).thenThrow(new RemoteException());
+
+ String backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
+
+ assertThat(backupLabel).isNull();
+ }
+
+ @Test
+ public void testGetIntentForBackupSettings_WithIntentFromTransport() throws Exception {
+ Intent intent = mock(Intent.class);
+
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
+
+ PackageManager packageManager = mock(PackageManager.class);
+ when(mContext.getPackageManager()).thenReturn(packageManager);
+ when(intent.resolveActivity(packageManager)).thenReturn(mock(ComponentName.class));
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettings();
+
+ assertThat(backupIntent).isEqualTo(intent);
+ }
+
+ @Test
+ public void testGetIntentForBackupSettings_WithoutIntentFromTransport() throws Exception {
+ when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(null);
+
+ Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettings();
+
+ assertThat(backupIntent.getComponent().getClassName()).isEqualTo(
+ DEFAULT_SETTINGS_CLASSNAME);
+ assertThat(backupIntent.getExtras().getBoolean(
+ SettingsDrawerActivity.EXTRA_SHOW_MENU)).isTrue();
+ }
+
+ @Test
+ public void testGetLabelForBackupSettings_WithLabelFromTransport() throws Exception {
+ String label = "test_label";
+
+ when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
+
+ String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
+
+ assertThat(backupLabel).isEqualTo(label);
+ }
+
+ @Test
+ public void testGetLabelForBackupSettings_WithEmptyLabelFromTransport() throws Exception {
+ String label = "";
+
+ when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
+
+ String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
+
+ assertThat(backupLabel).isEqualTo(mContext.getString(DEFAULT_LABEL_RESOURCE));
+ }
+
+ @Test
+ public void testGetLabelForBackupSettings_WithoutLabelFromTransport() throws Exception {
+ when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(null);
+
+ String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
+
+ assertThat(backupLabel).isEqualTo(mContext.getString(DEFAULT_LABEL_RESOURCE));
+ }
+
+ @Test
+ public void testGetSummaryForBackupSettings_WithSummaryFromTransport() throws Exception {
+ String summary = "test_summary";
+
+ when(mBackupManager.getDestinationString(anyString())).thenReturn(summary);
+
+ String backupSummary = mBackupSettingsHelper.getSummaryForBackupSettings();
+
+ assertThat(backupSummary).isEqualTo(summary);
+ }
+
+ @Test
+ public void testGetSummaryForBackupSettings_WithoutSummaryFromTransport() throws Exception {
+ when(mBackupManager.getDestinationString(anyString())).thenReturn(null);
+
+ String backupSummary = mBackupSettingsHelper.getSummaryForBackupSettings();
+
+ assertThat(backupSummary).isEqualTo(mContext.getString(DEFAULT_SUMMARY_RESOURCE));
+ }
+
+ @Test
+ public void testIsBackupProvidedByManufacturer_WithIntent() throws Exception {
+ String intent = "test_intent";
+
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ Resources spiedResources = spy(mContext.getResources());
+ when(mContext.getResources()).thenReturn(spiedResources);
+ when(spiedResources.getString(MANUFACTURER_INTENT_RESOURCE)).thenReturn(intent);
+ mBackupSettingsHelper = new BackupSettingsHelper(mContext);
+
+ boolean hasManufacturerIntent = mBackupSettingsHelper.isBackupProvidedByManufacturer();
+
+ assertThat(hasManufacturerIntent).isTrue();
+ }
+
+ @Test
+ public void testIsBackupProvidedByManufacturer_WithoutIntent() throws Exception {
+ String intent = "";
+
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ Resources spiedResources = spy(mContext.getResources());
+ when(mContext.getResources()).thenReturn(spiedResources);
+ when(spiedResources.getString(MANUFACTURER_INTENT_RESOURCE)).thenReturn(intent);
+ mBackupSettingsHelper = new BackupSettingsHelper(mContext);
+
+ boolean hasManufacturerIntent = mBackupSettingsHelper.isBackupProvidedByManufacturer();
+
+ assertThat(hasManufacturerIntent).isFalse();
+ }
+
+ @Test
+ public void testGetLabelProvidedByManufacturer() throws Exception {
+ String label = "test_label";
+
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ Resources spiedResources = spy(mContext.getResources());
+ when(mContext.getResources()).thenReturn(spiedResources);
+ when(spiedResources.getString(MANUFACTURER_LABEL_RESOURCE)).thenReturn(label);
+ mBackupSettingsHelper = new BackupSettingsHelper(mContext);
+
+ String manufacturerLabel = mBackupSettingsHelper.getLabelProvidedByManufacturer();
+
+ assertThat(manufacturerLabel).isEqualTo(label);
+ }
+
+ @Test
+ public void testGetIntentProvidedByManufacturer() throws Exception {
+ String intent = "test_intent";
+
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ Resources spiedResources = spy(mContext.getResources());
+ when(mContext.getResources()).thenReturn(spiedResources);
+ when(spiedResources.getString(MANUFACTURER_INTENT_RESOURCE)).thenReturn(intent);
+ mBackupSettingsHelper = new BackupSettingsHelper(mContext);
+
+ Intent manufacturerIntent = mBackupSettingsHelper.getIntentProvidedByManufacturer();
+
+ assertThat(manufacturerIntent).isNotNull();
+ }
+
+ @Implements(IBackupManager.Stub.class)
+ public static class ShadowBackupManagerStub {
+ @Implementation
+ public static IBackupManager asInterface(IBinder iBinder) {
+ return mBackupManager;
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
new file mode 100644
index 0000000..7157862
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
@@ -0,0 +1,132 @@
+/*
+ * 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
+ */
+
+package com.android.settings.backup;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+ shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class})
+public class BackupSettingsPreferenceControllerTest {
+ private static final String BACKUP_SETTINGS = "backup_settings";
+ private static final String MANUFACTURER_SETTINGS = "manufacturer_backup";
+
+ private Context mContext;
+
+ @Mock
+ private BackupSettingsHelper mBackupHelper;
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private Preference mBackupPreference;
+ @Mock
+ private Preference mManufacturerPreference;
+
+ @Mock
+ private static Intent mBackupIntent;
+
+ private static String mBackupLabel = "Test Backup Label";
+ private static String mBackupSummary = "Test Backup Summary";
+ private static String mManufacturerLabel = "Test Manufacturer Label";
+
+ @Mock
+ private static Intent mManufacturerIntent;
+
+ private BackupSettingsPreferenceController mController;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new BackupSettingsPreferenceController(mContext);
+ }
+
+ @Test
+ public void testDisplayPreference() {
+ when(mScreen.findPreference(BACKUP_SETTINGS)).thenReturn(mBackupPreference);
+ when(mScreen.findPreference(MANUFACTURER_SETTINGS)).thenReturn(mManufacturerPreference);
+
+ mController.displayPreference(mScreen);
+
+ verify(mBackupPreference).setIntent(mBackupIntent);
+ verify(mBackupPreference).setTitle(mBackupLabel);
+ verify(mBackupPreference).setSummary(mBackupSummary);
+ verify(mManufacturerPreference).setIntent(mManufacturerIntent);
+ verify(mManufacturerPreference).setTitle(mManufacturerLabel);
+ }
+
+ @Test
+ public void testIsAvailable_shouldAlwaysReturnTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void getPreferenceKey_shouldReturnNull() {
+ assertThat(mController.getPreferenceKey()).isNull();
+ }
+
+ @Implements(BackupSettingsHelper.class)
+ public static class ShadowBackupSettingsHelper {
+
+ @Implementation
+ public Intent getIntentForBackupSettings() {
+ return mBackupIntent;
+ }
+
+ @Implementation
+ public String getLabelForBackupSettings() {
+ return mBackupLabel;
+ }
+
+ @Implementation
+ public String getSummaryForBackupSettings() {
+ return mBackupSummary;
+ }
+
+ @Implementation
+ public Intent getIntentProvidedByManufacturer() {
+ return mManufacturerIntent;
+ }
+
+ @Implementation
+ public String getLabelProvidedByManufacturer() {
+ return mManufacturerLabel;
+ }
+ }
+}