Merge "Remove menu from Network & Internet screen." into pi-dev (23035d55) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/NetworkDashboardFragment.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ import android.content.Context;
		import android.provider.SearchIndexableResource;
		import android.support.annotation.VisibleForTesting;
		import android.util.Log;
		import android.view.Menu;
		import android.view.MenuInflater;

		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		@@ -48,9 +46,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
		MobilePlanPreferenceHost {

		private static final String TAG = "NetworkDashboardFrag";
		private static final int MENU_NETWORK_RESET = Menu.FIRST;

		private NetworkResetActionMenuController mNetworkResetController;

		@Override
		public int getMetricsCategory() {
		@@ -70,7 +65,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		mNetworkResetController = new NetworkResetActionMenuController(context, MENU_NETWORK_RESET);

		use(AirplaneModePreferenceController.class).setFragment(this);
		}
		@@ -80,12 +74,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
		return R.string.help_url_network_dashboard;
		}

		@Override
		public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
		super.onCreateOptionsMenu(menu, inflater);
		mNetworkResetController.buildMenuItem(menu);
		}

		@Override
		protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
		return buildPreferenceControllers(context, getLifecycle(), mMetricsFeatureProvider, this

src/com/android/settings/network/NetworkResetActionMenuController.java

deleted100644 → 0

+0 −61

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.network;

		import android.content.Context;
		import android.view.Menu;
		import android.view.MenuItem;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.ResetNetwork;
		import com.android.settings.core.SubSettingLauncher;

		public class NetworkResetActionMenuController {

		private final Context mContext;
		private final NetworkResetRestrictionChecker mRestrictionChecker;
		private final int mMenuId;

		public NetworkResetActionMenuController(Context context, int menuId) {
		mContext = context;
		mRestrictionChecker = new NetworkResetRestrictionChecker(context);
		mMenuId = menuId;
		}

		public void buildMenuItem(Menu menu) {
		MenuItem item = null;
		if (isAvailable() && menu != null) {
		item = menu.add(0, mMenuId, 0, R.string.reset_network_title);
		}
		if (item != null) {
		item.setOnMenuItemClickListener(target -> {
		new SubSettingLauncher(mContext)
		.setDestination(ResetNetwork.class.getName())
		.setSourceMetricsCategory(MetricsEvent.SETTINGS_NETWORK_CATEGORY)
		.setTitle(R.string.reset_network_title)
		.launch();
		return true;
		});
		}
		}


		boolean isAvailable() {
		return !mRestrictionChecker.hasRestriction();
		}
		}

tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -72,17 +72,6 @@ public class NetworkDashboardFragmentTest {
		assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
		}

		@Test
		public void testPrepareActionBar_networkResetShouldBeCreated() {
		final NetworkResetActionMenuController resetController =
		mock(NetworkResetActionMenuController.class);
		ReflectionHelpers.setField(mFragment, "mNetworkResetController", resetController);

		mFragment.onCreateOptionsMenu(null, null);

		verify(resetController).buildMenuItem(nullable(Menu.class));
		}

		@Test
		public void testSummaryProvider_hasMobileAndHotspot_shouldReturnMobileSummary() {
		final MobileNetworkPreferenceController mobileNetworkPreferenceController =

tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java

deleted100644 → 0

+0 −76

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.network;

		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.view.Menu;
		import android.view.MenuItem;

		import com.android.settings.testutils.SettingsRobolectricTestRunner;

		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.util.ReflectionHelpers;

		@RunWith(SettingsRobolectricTestRunner.class)
		public class NetworkResetActionMenuControllerTest {

		private static final int MENU_ID = Menu.FIRST;

		private NetworkResetActionMenuController mController;
		@Mock
		private Menu mMenu;
		@Mock
		private MenuItem mMenuItem;
		@Mock
		private NetworkResetRestrictionChecker mRestrictionChecker;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mController = new NetworkResetActionMenuController(RuntimeEnvironment.application, MENU_ID);
		ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
		when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
		}

		@Test
		public void buildMenuItem_available_shouldAddToMenu() {
		when(mRestrictionChecker.hasRestriction()).thenReturn(false);
		mController.buildMenuItem(mMenu);

		verify(mMenu).add(anyInt(), anyInt(), anyInt(), anyInt());
		verify(mMenuItem).setOnMenuItemClickListener(any(MenuItem.OnMenuItemClickListener.class));
		}

		@Test
		public void buildMenuItem_notAvailable_shouldNotAddToMenu() {
		when(mRestrictionChecker.hasRestriction()).thenReturn(true);

		mController.buildMenuItem(mMenu);

		verify(mMenu, never()).add(anyInt(), anyInt(), anyInt(), anyInt());
		}
		}