PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expand ASM activation warning." into oc-dr1-dev

Browse Source 
am: 64acb2906c

Change-Id: I980227fd99274364a7160a0e896b9518c2de1dd0
This commit is contained in:
Daniel Nishi
2017-07-11 19:56:41 +00:00
committed by android-build-merger
parent ace9759446 64acb2906c
commit 4961451a4e
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
View File

@@ -88,9 +88,17 @@ public class AutomaticStorageManagementSwitchPreferenceController extends Prefer
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
isChecked ? 1 : 0); isChecked ? 1 : 0);
boolean storageManagerEnabledByDefault = SystemProperties.getBoolean( final boolean storageManagerEnabledByDefault =
STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false); SystemProperties.getBoolean(STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
if (isChecked && !storageManagerEnabledByDefault) { final boolean storageManagerDisabledByPolicy =
Settings.Secure.getInt(
mContext.getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
0)
!= 0;
// Show warning if it is disabled by default and turning it on or if it was disabled by
// policy and we're turning it on.
if ((isChecked && (!storageManagerEnabledByDefault || storageManagerDisabledByPolicy))) {
ActivationWarningFragment fragment = ActivationWarningFragment.newInstance(); ActivationWarningFragment fragment = ActivationWarningFragment.newInstance();
fragment.show(mFragmentManager, ActivationWarningFragment.TAG); fragment.show(mFragmentManager, ActivationWarningFragment.TAG);
} }

19
tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
View File

@@ -168,4 +168,23 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest {
verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG)); verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG));
} }
@Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
FragmentTransaction transaction = mock(FragmentTransaction.class);
when(mFragmentManager.beginTransaction()).thenReturn(transaction);
SettingsShadowSystemProperties.set(
AutomaticStorageManagementSwitchPreferenceController
.STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY,
"true");
Settings.Secure.putInt(
mContext.getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
1);
mController.onSwitchToggled(true);
verify(transaction).add(any(), eq(ActivationWarningFragment.TAG));
}
} }