Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b0c991e authored by Antony Sargent's avatar Antony Sargent Committed by Android (Google) Code Review
Browse files

Merge "Layout changes in v2 Network & internet page"

parents fec2c738 11b7c7f2

res/xml/network_and_internet_v2.xml

+25 −23
Original line number Diff line number Diff line
@@ -21,13 +21,20 @@ 
    android:title="@string/network_dashboard_title"

    settings:initialExpandedChildrenCount="5">



    <PreferenceCategory

        android:key="multi_network_header"

        settings:allowDividerBelow="true"

        android:order="-40"

        settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>



    <com.android.settings.widget.MasterSwitchPreference

        android:fragment="com.android.settings.wifi.WifiSettings"

        android:key="toggle_wifi"

        android:title="@string/wifi_settings"

        android:summary="@string/summary_placeholder"

        android:icon="@drawable/ic_settings_wireless"

        android:order="-30">

        android:order="-30"

        settings:allowDividerAbove="true">

        <intent

            android:action="android.settings.WIFI_SETTINGS"

            android:targetClass="Settings$WifiSettingsActivity" />
@@ -44,16 +51,15 @@ 
        settings:useAdminDisabledSummary="true">

    </com.android.settingslib.RestrictedPreference>



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.TetherSettings"

        android:key="tether_settings"

        android:title="@string/tether_settings_title_all"

        android:icon="@drawable/ic_wifi_tethering"

    <com.android.settingslib.RestrictedSwitchPreference

        android:key="toggle_airplane"

        android:title="@string/airplane_mode"

        android:icon="@drawable/ic_airplanemode_active"

        android:disableDependentsState="true"

        android:order="-5"

        android:summary="@string/summary_placeholder"

        settings:keywords="@string/keywords_hotspot_tethering"

        settings:userRestriction="no_config_tethering"

        settings:useAdminDisabledSummary="true" />

        settings:controller="com.android.settings.network.AirplaneModePreferenceController"

        settings:platform_slice="true"

        settings:userRestriction="no_airplane_mode"/>



    <com.android.settingslib.RestrictedPreference

        android:key="manage_mobile_plan"
@@ -63,20 +69,16 @@ 
        settings:userRestriction="no_config_mobile_networks"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="toggle_airplane"

        android:title="@string/airplane_mode"

        android:icon="@drawable/ic_airplanemode_active"

        android:disableDependentsState="true"

    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.TetherSettings"

        android:key="tether_settings"

        android:title="@string/tether_settings_title_all"

        android:icon="@drawable/ic_wifi_tethering"

        android:order="5"

        settings:controller="com.android.settings.network.AirplaneModePreferenceController"

        settings:platform_slice="true"

        settings:userRestriction="no_airplane_mode"/>



    <Preference

        android:fragment="com.android.settings.ProxySelector"

        android:key="proxy_settings"

        android:title="@string/proxy_settings_title" />

        android:summary="@string/summary_placeholder"

        settings:keywords="@string/keywords_hotspot_tethering"

        settings:userRestriction="no_config_tethering"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.vpn2.VpnSettings"

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

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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 com.android.settings.core.BasePreferenceController;



// This controls a header at the top of the Network & internet page that only appears when there

// are two or more active mobile subscriptions. It shows an overview of available network

// connections with an entry for wifi (if connected) and an entry for each subscription.

public class MultiNetworkHeaderController extends BasePreferenceController {



    public MultiNetworkHeaderController(Context context, String key) {

      super(context, key);

    }



    @Override

    public int getAvailabilityStatus() {

        return UNSUPPORTED_ON_DEVICE;

    }

}