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

12
src/com/android/settings/network/NetworkDashboardFragment.java
View File

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

61
src/com/android/settings/network/NetworkResetActionMenuController.java
View File

@@ -1,61 +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 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();
}
}