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

Misc fix on network & internet screen for developer preview

Browse Source 
- Move wifi calling into wifi preference screen
- Update tethering setting title
- Ripple for master swtich preference only apply on the left half.
- Move network reset to action bar overflow menu

Fix: 34974598
Fix: 34976385
Test: RunSettingsRoboTests
Change-Id: I0e11843efc52a0042784a4da46b7ac81fcf16138
This commit is contained in:
Fan Zhang
2017-02-06 14:40:20 -08:00
parent 99f0b44440
commit 56199e9487
13 changed files with 280 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,8 @@ import android.app.Dialog;
import android.content.Context;
import android.provider.SearchIndexableResource;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -42,6 +44,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
private static final String TAG = "NetworkDashboardFrag";
private NetworkResetActionMenuController mNetworkResetController;
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY;
@@ -57,6 +61,18 @@ public class NetworkDashboardFragment extends DashboardFragment implements
return R.xml.network_and_internet;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
mNetworkResetController = new NetworkResetActionMenuController(context);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
mNetworkResetController.buildMenuItem(menu);
}
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
final AirplaneModePreferenceController airplaneModePreferenceController =
@@ -64,7 +80,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, this);
final WifiMasterSwitchPreferenceController wifiPreferenceController =
new WifiMasterSwitchPreferenceController(context, mMetricsFeatureProvider);
new WifiMasterSwitchPreferenceController(context, mMetricsFeatureProvider);
final Lifecycle lifecycle = getLifecycle();
lifecycle.addObserver(airplaneModePreferenceController);
lifecycle.addObserver(mobilePlanPreferenceController);
@@ -75,8 +91,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(new MobileNetworkPreferenceController(context));
controllers.add(new TetherPreferenceController(context));
controllers.add(new VpnPreferenceController(context));
controllers.add(new WifiCallingPreferenceController(context));
controllers.add(new NetworkResetPreferenceController(context));
controllers.add(new ProxyPreferenceController(context));
controllers.add(mobilePlanPreferenceController);
controllers.add(wifiPreferenceController);