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

Remove menu from Network & Internet screen.

Browse Source 
Only one item was left "reset wi-fi, mobile & bluetooth"
which is also an option in Reset. So we're just removing
it so that there's no overflow menu at all.

Change-Id: I0298192667fb4ac2f58f51232ae2da1842e6c27e
Fixes: 77986130
Test: robotests
This commit is contained in:
Andrew Sapperstein
2018-04-13 13:48:05 -07:00
parent cd01a3ecd9
commit e358876bc1
4 changed files with 0 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
View File

@@ -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 =

76
tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
View File

@@ -1,76 +0,0 @@
/*
* 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());
}
}