Revert "Add summary to special app access." (13e5af06) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/AppAndNotificationDashboardFragment.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ 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;

		@@ -56,13 +55,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {

		@Override
		protected List<PreferenceController> getPreferenceControllers(Context context) {
		return buildPreferenceControllers(context);
		}

		private static List<PreferenceController> buildPreferenceControllers(Context context) {
		final List<PreferenceController> controllers = new ArrayList<>();
		controllers.add(new SpecialAppAccessPreferenceController(context));
		return controllers;
		return null;
		}

		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		@@ -74,10 +67,5 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
		sir.xmlResId = R.xml.app_and_notification;
		return Arrays.asList(sir);
		}

		@Override
		public List<PreferenceController> getPreferenceControllers(Context context) {
		return buildPreferenceControllers(context);
		}
		};
		}

src/com/android/settings/applications/SpecialAppAccessPreferenceController.java

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		/*
		* 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);
		mDataSaverBackend = new DataSaverBackend(context);
		}

		@Override
		public boolean isAvailable() {
		return true;
		}

		@Override
		public String getPreferenceKey() {
		return KEY_SPECIAL_ACCESS;
		}

		@Override
		public void updateState(Preference preference) {
		final int count = mDataSaverBackend.getWhitelistedCount();
		preference.setSummary(mContext.getResources().getQuantityString(
		R.plurals.special_access_summary, count, count));
		}
		}

tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java

deleted100644 → 0

+0 −78

Original line number	Diff line number	Diff line
		/*
		* 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));
		}
		}