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

Commit 75dc89b1 authored by Arc Wang's avatar Arc Wang
Browse files

[Wi-Fi] Create WifiNetworkDetailsFragment related version 2 files for WifiTracker2 development 

Create below version 2 files for WifiTracker2 development, we can
check the feature flag only a few times and easily remove version 1
files in the future.

    src/com/android/settings/wifi/details2/
    src/com/android/settings/wifi/savedaccesspoints2/
    tests/robotests/src/com/android/settings/wifi/details2/
    tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/

Bug: 143326832
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.details2
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.savedaccesspoints2

Change-Id: I4d2caf1ce313871605252395764b02747240f217
parent b4a6245d

res/xml/wifi_display_saved_access_points2.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 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.

-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="saved_access_points"

    android:title="@string/wifi_saved_access_points_label">



    <PreferenceCategory

        android:key="subscribed_access_points_category"

        android:title="@string/wifi_subscribed_access_points_tab"

        settings:controller="com.android.settings.wifi.savedaccesspoints2.SubscribedAccessPointsPreferenceController2"/>



    <PreferenceCategory

        android:key="saved_access_points_category"

        android:title="@string/wifi_saved_access_points_tab"

        settings:controller="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsPreferenceController2"/>



</PreferenceScreen>

res/xml/wifi_settings2.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 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.

-->



<PreferenceScreen

        xmlns:android="http://schemas.android.com/apk/res/android"

        xmlns:settings="http://schemas.android.com/apk/res-auto"

        android:title="@string/wifi_settings"

        settings:keywords="@string/keywords_wifi">



    <com.android.settings.wifi.LinkablePreference

        android:key="wifi_status_message"/>



    <PreferenceCategory

        android:key="connected_access_point"

        android:layout="@layout/preference_category_no_label"/>



    <PreferenceCategory

        android:key="access_points"

        android:layout="@layout/preference_category_no_label"/>



    <Preference

        android:key="configure_settings"

        android:title="@string/wifi_configure_settings_preference_title"

        settings:allowDividerAbove="true"

        android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>



    <Preference

        android:key="saved_networks"

        android:title="@string/wifi_saved_access_points_label"

        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>



    <com.android.settings.datausage.DataUsagePreference

        android:key="wifi_data_usage"

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

</PreferenceScreen>

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment; 
import com.android.settings.wifi.calling.WifiCallingSettings;

import com.android.settings.wifi.p2p.WifiP2pSettings;

import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings;

import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;

import com.android.settings.wifi.tether.WifiTetherSettings;



public class SettingsGateway {
@@ -161,6 +162,7 @@ public class SettingsGateway { 
            WifiSettings2.class.getName(),

            ConfigureWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings2.class.getName(),

            TetherSettings.class.getName(),

            WifiP2pSettings.class.getName(),

            WifiTetherSettings.class.getName(),

src/com/android/settings/panel/WifiPanel.java

+16 −5
Original line number Diff line number Diff line
@@ -20,12 +20,14 @@ import android.app.settings.SettingsEnums; 
import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.util.FeatureFlagUtils;



import com.android.settings.R;

import com.android.settings.SubSettings;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.SliceBuilderUtils;

import com.android.settings.wifi.WifiSettings;

import com.android.settings.wifi.WifiSettings2;



import java.util.ArrayList;

import java.util.List;
@@ -61,11 +63,20 @@ public class WifiPanel implements PanelContent { 
    public Intent getSeeMoreIntent() {

        final String screenTitle =

                mContext.getText(R.string.wifi_settings).toString();

        final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,

        Intent intent;

        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {

            intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,

                    WifiSettings2.class.getName(),

                    null /* key */,

                    screenTitle,

                    SettingsEnums.WIFI);

        } else {

            intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,

                    WifiSettings.class.getName(),

                    null /* key */,

                    screenTitle,

                    SettingsEnums.WIFI);

        }

        intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        return intent;

src/com/android/settings/wifi/WifiConfigController.java

+18 −6
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.text.InputType; 
import android.text.SpannableString;

import android.text.TextUtils;

import android.text.TextWatcher;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.KeyEvent;

import android.view.View;
@@ -70,6 +71,7 @@ import androidx.annotation.VisibleForTesting; 
import com.android.settings.ProxySelector;

import com.android.settings.R;

import com.android.settings.wifi.details.WifiPrivacyPreferenceController;

import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;

import com.android.settings.wifi.dpp.WifiDppUtils;

import com.android.settingslib.Utils;

import com.android.settingslib.utils.ThreadUtils;
@@ -289,9 +291,14 @@ public class WifiConfigController implements TextWatcher, 
                        ? HIDDEN_NETWORK

                        : NOT_HIDDEN_NETWORK);



                final int prefMacValue =

                        WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(

                                config.macRandomizationSetting);

                int prefMacValue;

                if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {

                    prefMacValue = WifiPrivacyPreferenceController2

                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);

                } else {

                    prefMacValue = WifiPrivacyPreferenceController

                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);

                }

                mPrivacySettingsSpinner.setSelection(prefMacValue);



                if (config.getIpAssignment() == IpAssignment.STATIC) {
@@ -843,9 +850,14 @@ public class WifiConfigController implements TextWatcher, 
        }



        if (mPrivacySettingsSpinner != null) {

            final int macValue =

                    WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(

            int macValue;

            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {

                macValue = WifiPrivacyPreferenceController2.translatePrefValueToMacRandomizedValue(

                        mPrivacySettingsSpinner.getSelectedItemPosition());

            } else {

                macValue = WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(

                        mPrivacySettingsSpinner.getSelectedItemPosition());

            }

            config.macRandomizationSetting = macValue;

        }