Merge "Remove menu from Network & Internet screen." into pi-dev am: 23035d558a
am: 3fdfb99375
Change-Id: I88a8e8d7ee77bafb5b8180d6d882d1ed9c09bd1f
This commit is contained in:
@@ -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;
|
||||
@@ -50,9 +48,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() {
|
||||
@@ -72,7 +67,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);
|
||||
}
|
||||
@@ -82,12 +76,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
|
||||
|
Reference in New Issue
Block a user