From 6f3364bf78f2e2dfbb7451c2ed2c54e85d97060f Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Tue, 11 Apr 2017 15:35:49 -0700 Subject: [PATCH] Add summary to special app access. Get the count of apps that has unrestricted data access and add that to the summary for Apps & notifications -> Special app access. Bug: 36376411 Test: make RunSettingsRoboTests Change-Id: Id80a030e1e066f1391f94114f478091a2a87fcd8 --- .../AppAndNotificationDashboardFragment.java | 14 +++- .../SpecialAppAccessPreferenceController.java | 51 ++++++++++++++ .../SpecialAppAccessPreferenceControllerTest.java | 78 ++++++++++++++++++++++ 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/applications/SpecialAppAccessPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index 9018d9b3ec..51225aa3fb 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -25,6 +25,7 @@ import com.android.settings.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -55,7 +56,13 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { @Override protected List getPreferenceControllers(Context context) { - return null; + return buildPreferenceControllers(context); + } + + private static List buildPreferenceControllers(Context context) { + final List controllers = new ArrayList<>(); + controllers.add(new SpecialAppAccessPreferenceController(context)); + return controllers; } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = @@ -67,5 +74,10 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { sir.xmlResId = R.xml.app_and_notification; return Arrays.asList(sir); } + + @Override + public List getPreferenceControllers(Context context) { + return buildPreferenceControllers(context); + } }; } diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java new file mode 100644 index 0000000000..3735c0158a --- /dev/null +++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java @@ -0,0 +1,51 @@ +/* + * 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.applications; + +import android.content.Context; +import android.support.v7.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceController; +import com.android.settings.datausage.DataSaverBackend; + +public class SpecialAppAccessPreferenceController extends PreferenceController { + + private static final String KEY_SPECIAL_ACCESS = "special_access"; + + private DataSaverBackend mDataSaverBackend; + + public SpecialAppAccessPreferenceController(Context context) { + super(context); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return KEY_SPECIAL_ACCESS; + } + + @Override + public void updateState(Preference preference) { + if (mDataSaverBackend == null) { + mDataSaverBackend = new DataSaverBackend(mContext); + } + final int count = mDataSaverBackend.getWhitelistedCount(); + preference.setSummary(mContext.getResources().getQuantityString( + R.plurals.special_access_summary, count, count)); + } +} diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java new file mode 100644 index 0000000000..44ca9f7550 --- /dev/null +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -0,0 +1,78 @@ +/* + * 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.applications; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.support.v7.preference.Preference; +import com.android.settings.R; +import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; +import com.android.settings.datausage.DataSaverBackend; +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.util.ReflectionHelpers; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class SpecialAppAccessPreferenceControllerTest { + private Context mContext; + @Mock + private DataSaverBackend mBackend; + @Mock + private Preference mPreference; + + private SpecialAppAccessPreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new SpecialAppAccessPreferenceController(mContext); + ReflectionHelpers.setField(mController, "mDataSaverBackend", mBackend); + } + + @Test + public void isAvailable_shouldAlwaysReturnTrue() { + assertThat(mController.isAvailable()).isTrue(); + } + + @Test + public void updateState_shouldSetSummary() { + when(mBackend.getWhitelistedCount()).thenReturn(0); + + mController.updateState(mPreference); + + verify(mPreference).setSummary(mContext.getResources().getQuantityString( + R.plurals.special_access_summary, 0, 0)); + + when(mBackend.getWhitelistedCount()).thenReturn(1); + + mController.updateState(mPreference); + + verify(mPreference).setSummary(mContext.getResources().getQuantityString( + R.plurals.special_access_summary, 1, 1)); + } +} -- 2.11.0