diff --git a/res/values/strings.xml b/res/values/strings.xml index 8dca8d0e2af..9cd57adb84a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6094,10 +6094,6 @@ Backup - - On - - Off Backup & restore diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java index b55172e6487..258f54dc07d 100644 --- a/src/com/android/settings/backup/BackupSettingsHelper.java +++ b/src/com/android/settings/backup/BackupSettingsHelper.java @@ -24,7 +24,6 @@ import android.content.Intent; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.os.UserManager; import android.text.TextUtils; import android.util.Log; @@ -50,24 +49,6 @@ public class BackupSettingsHelper { mContext = context; } - /** - * If there is only one profile, show whether the backup is on or off. - * Otherwise, show nothing. - */ - public String getSummary() { - UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); - if (userManager.getUserProfiles().size() == 1) { - try { - int resId = mBackupManager.isBackupEnabled() - ? R.string.backup_summary_state_on : R.string.backup_summary_state_off; - return mContext.getText(resId).toString(); - } catch (RemoteException e) { - Log.e(TAG, "Error getting isBackupEnabled", e); - } - } - return null; - } - /** * 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. diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index b6ef32c5e9f..17f17c1a5c1 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -34,7 +34,6 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.IBinder; import android.os.RemoteException; -import android.os.UserHandle; import com.android.settings.R; @@ -48,8 +47,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowUserManager; @RunWith(RobolectricTestRunner.class) @Config(shadows = BackupSettingsHelperTest.ShadowBackupManagerStub.class) @@ -72,46 +69,12 @@ public class BackupSettingsHelperTest { @Mock private static IBackupManager mBackupManager; - private ShadowUserManager mUserManager; - @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application.getApplicationContext()); when(mBackupManager.getCurrentTransport()).thenReturn("test_transport"); mBackupSettingsHelper = new BackupSettingsHelper(mContext); - mUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE)); - } - - @Test - public void testGetSummary_backupEnabledOnlyOneProfile_showsOn() throws Exception { - mUserManager.addUserProfile(new UserHandle(0)); - when(mBackupManager.isBackupEnabled()).thenReturn(true); - - String backupSummary = mBackupSettingsHelper.getSummary(); - - assertThat(backupSummary).isEqualTo(mContext.getString(R.string.backup_summary_state_on)); - } - - @Test - public void testGetSummary_backupDisabledOnlyOneProfile_showsOff() throws Exception { - mUserManager.addUserProfile(new UserHandle(0)); - when(mBackupManager.isBackupEnabled()).thenReturn(false); - - String backupSummary = mBackupSettingsHelper.getSummary(); - - assertThat(backupSummary).isEqualTo(mContext.getString(R.string.backup_summary_state_off)); - } - - @Test - public void testGetSummary_TwoProfiles_returnsNull() throws Exception { - mUserManager.addUserProfile(new UserHandle(0)); - mUserManager.addUserProfile(new UserHandle(10)); - when(mBackupManager.isBackupEnabled()).thenReturn(true); - - String backupSummary = mBackupSettingsHelper.getSummary(); - - assertThat(backupSummary).isNull(); } @Test