Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75b7958..132b12d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2416,6 +2416,10 @@
<string name="wifi_hotspot_auto_off_title">Turn off hotspot automatically</string>
<!-- Summary for the toggle to turn off hotspot automatically [CHAR LIMIT=NONE]-->
<string name="wifi_hotspot_auto_off_summary">When no devices are connected</string>
+ <!-- Title for the toggle to enable/disable the maximize compatibility [CHAR LIMIT=NONE]-->
+ <string name="wifi_hotspot_maximize_compatibility">Maximize compatibility</string>
+ <!-- Summary for the toggle to show the maximize compatibility warning message [CHAR LIMIT=NONE]-->
+ <string name="wifi_hotspot_maximize_compatibility_summary">This may reduce speed for devices connected to this hotspot and use more power</string>
<!-- Summary text when turning hotspot on -->
<string name="wifi_tether_starting">Turning hotspot on\u2026</string>
@@ -8217,7 +8221,7 @@
<string name="zen_mode_settings_dnd_custom_settings_footer">Do Not Disturb is on for <xliff:g id="rule_names" example="Sleeping and Work">%s</xliff:g> with custom settings.</string>
<!-- [CHAR LIMIT=120] Zen mode settings footer: Link following zen_mode_settings_dnd_custom_settings_footer to see the currently applied custom dnd settings. -->
- <string name="zen_mode_settings_dnd_custom_settings_footer_link"><annotation id="link"> View custom settings</annotation></string>
+ <string name="zen_mode_settings_dnd_custom_settings_footer_link"> <annotation id="link">View custom settings</annotation></string>
<!--[CHAR LIMIT=40] Zen Interruption level: Priority. -->
<string name="zen_interruption_level_priority">Priority only</string>
@@ -8275,6 +8279,9 @@
<!-- Do not disturb settings, main screen, field, duration setting where user can specify how
long dnd will last when toggling dnd on from qs) [CHAR LIMIT=100] -->
<string name="zen_category_duration">Duration for Quick Settings</string>
+ <!-- Do not disturb settings, main screen, category header describing settings that do not
+ fit in another group [CHAR LIMIT=100] -->
+ <string name="zen_settings_general">General</string>
<!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->
<string name="zen_sound_footer">When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.</string>
@@ -12851,7 +12858,9 @@
<!-- Title for battery saver main switch preferences. [CHAR LIMIT=50] -->
<string name="battery_saver_main_switch_title">Use battery saver</string>
<!-- Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
- <string name="do_not_disturb_main_switch_title">Use Do Not Disturb</string>
+ <string name="do_not_disturb_main_switch_title_on">Turn off now</string>
+ <!-- Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
+ <string name="do_not_disturb_main_switch_title_off">Turn on now</string>
<!-- Title for Night Light main switch preferences. [CHAR LIMIT=50] -->
<string name="night_light_main_switch_title">Use Night Light</string>
<!-- Title for NFC main switch preferences. [CHAR LIMIT=50] -->
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index c92ce94..4a11cbe 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -18,8 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="network_and_internet_screen"
- android:title="@string/network_dashboard_title"
- settings:initialExpandedChildrenCount="5">
+ android:title="@string/network_dashboard_title">
<PreferenceCategory
android:key="multi_network_header"
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
index 035026b..bb7117d 100644
--- a/res/xml/network_provider_internet.xml
+++ b/res/xml/network_provider_internet.xml
@@ -18,8 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="network_provider_and_internet_screen"
- android:title="@string/network_dashboard_title"
- settings:initialExpandedChildrenCount="5">
+ android:title="@string/network_dashboard_title">
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.network.NetworkProviderSettings"
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index d6564b7..2c93f3d 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -36,149 +36,124 @@
android:title="@string/connected_devices_dashboard_title"
settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
- <PreferenceCategory
- android:key="apps"
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.applications.AppDashboardFragment"
+ android:icon="@drawable/ic_homepage_apps_v2"
+ android:key="top_level_apps"
android:order="-120"
- settings:allowDividerAbove="false">
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.applications.AppDashboardFragment"
- android:icon="@drawable/ic_homepage_apps_v2"
- android:key="top_level_apps"
- android:order="-120"
- android:title="@string/apps_dashboard_title"/>
+ android:title="@string/apps_dashboard_title"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
- android:icon="@drawable/ic_homepage_notification_v2"
- android:key="top_level_notification"
- android:order="-110"
- android:title="@string/configure_notification_settings"/>
- </PreferenceCategory>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+ android:icon="@drawable/ic_homepage_notification_v2"
+ android:key="top_level_notification"
+ android:order="-110"
+ android:title="@string/configure_notification_settings"/>
- <PreferenceCategory
- android:key="phone_essential"
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
+ android:icon="@drawable/ic_homepage_battery_v2"
+ android:key="top_level_battery"
android:order="-100"
- settings:allowDividerAbove="false">
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
- android:icon="@drawable/ic_homepage_battery_v2"
- android:key="top_level_battery"
- android:order="-100"
- android:title="@string/power_usage_summary_title"
- settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
+ android:title="@string/power_usage_summary_title"
+ settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.deviceinfo.StorageSettings"
- android:icon="@drawable/ic_homepage_storage_v2"
- android:key="top_level_storage"
- android:order="-90"
- android:title="@string/storage_settings"
- settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.deviceinfo.StorageSettings"
+ android:icon="@drawable/ic_homepage_storage_v2"
+ android:key="top_level_storage"
+ android:order="-90"
+ android:title="@string/storage_settings"
+ settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.notification.SoundSettings"
- android:icon="@drawable/ic_homepage_sound_v2"
- android:key="top_level_sound"
- android:order="-80"
- android:title="@string/sound_settings"/>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.notification.SoundSettings"
+ android:icon="@drawable/ic_homepage_sound_v2"
+ android:key="top_level_sound"
+ android:order="-80"
+ android:title="@string/sound_settings"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.DisplaySettings"
- android:icon="@drawable/ic_homepage_display_v2"
- android:key="top_level_display"
- android:order="-70"
- android:title="@string/display_settings"
- settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.DisplaySettings"
+ android:icon="@drawable/ic_homepage_display_v2"
+ android:key="top_level_display"
+ android:order="-70"
+ android:title="@string/display_settings"
+ settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
- <com.android.settings.homepage.RestrictedHomepagePreference
- android:icon="@drawable/ic_homepage_wallpaper_v2"
- android:key="top_level_wallpaper"
- android:order="-60"
- android:title="@string/wallpaper_settings_title"
- settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
+ <com.android.settings.homepage.RestrictedHomepagePreference
+ android:icon="@drawable/ic_homepage_wallpaper_v2"
+ android:key="top_level_wallpaper"
+ android:order="-60"
+ android:title="@string/wallpaper_settings_title"
+ settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.accessibility.AccessibilitySettings"
- android:icon="@drawable/ic_homepage_accessibility_v2"
- android:key="top_level_accessibility"
- android:order="-50"
- android:title="@string/accessibility_settings"
- settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
- </PreferenceCategory>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+ android:icon="@drawable/ic_homepage_accessibility_v2"
+ android:key="top_level_accessibility"
+ android:order="-50"
+ android:title="@string/accessibility_settings"
+ settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
- <PreferenceCategory
- android:key="privacy_and_security"
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+ android:icon="@drawable/ic_homepage_privacy_v2"
+ android:key="top_level_privacy"
android:order="-40"
- settings:allowDividerAbove="false">
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
- android:icon="@drawable/ic_homepage_privacy_v2"
- android:key="top_level_privacy"
- android:order="-40"
- android:title="@string/privacy_dashboard_title"/>
+ android:title="@string/privacy_dashboard_title"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.location.LocationSettings"
- android:icon="@drawable/ic_homepage_location_v2"
- android:key="top_level_location"
- android:order="-30"
- android:title="@string/location_settings_title"
- settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.location.LocationSettings"
+ android:icon="@drawable/ic_homepage_location_v2"
+ android:key="top_level_location"
+ android:order="-30"
+ android:title="@string/location_settings_title"
+ settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.security.SecuritySettings"
- android:icon="@drawable/ic_homepage_security_v2"
- android:key="top_level_security"
- android:order="-20"
- android:title="@string/security_settings_title"
- settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.security.SecuritySettings"
+ android:icon="@drawable/ic_homepage_security_v2"
+ android:key="top_level_security"
+ android:order="-20"
+ android:title="@string/security_settings_title"
+ settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
- <com.android.settings.homepage.HomepagePreference
- android:key="top_level_emergency"
- android:title="@string/emergency_settings_preference_title"
- android:icon="@drawable/ic_homepage_emergency_v2"
- android:order="-10"
- android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="accounts"
+ <com.android.settings.homepage.HomepagePreference
+ android:key="top_level_emergency"
+ android:title="@string/emergency_settings_preference_title"
+ android:icon="@drawable/ic_homepage_emergency_v2"
android:order="-10"
- settings:allowDividerAbove="false">
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.accounts.AccountDashboardFragment"
- android:icon="@drawable/ic_homepage_accounts_v2"
- android:key="top_level_accounts"
- android:order="-10"
- android:title="@string/account_dashboard_title"
- settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
- </PreferenceCategory>
+ android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
- <PreferenceCategory
- android:key="system"
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+ android:icon="@drawable/ic_homepage_accounts_v2"
+ android:key="top_level_accounts"
+ android:order="-10"
+ android:title="@string/account_dashboard_title"
+ settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
+
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.system.SystemDashboardFragment"
+ android:icon="@drawable/ic_homepage_system_dashboard_v2"
+ android:key="top_level_system"
android:order="10"
- settings:allowDividerAbove="false">
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.system.SystemDashboardFragment"
- android:icon="@drawable/ic_homepage_system_dashboard_v2"
- android:key="top_level_system"
- android:order="10"
- android:title="@string/header_category_system"/>
+ android:title="@string/header_category_system"/>
- <com.android.settings.homepage.HomepagePreference
- android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
- android:icon="@drawable/ic_homepage_about_v2"
- android:key="top_level_about_device"
- android:order="20"
- android:title="@string/about_settings"
- settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
+ <com.android.settings.homepage.HomepagePreference
+ android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+ android:icon="@drawable/ic_homepage_about_v2"
+ android:key="top_level_about_device"
+ android:order="20"
+ android:title="@string/about_settings"
+ settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
- <com.android.settings.homepage.HomepagePreference
- android:icon="@drawable/ic_homepage_support_v2"
- android:key="top_level_support"
- android:order="100"
- android:title="@string/page_tab_title_support"
- settings:controller="com.android.settings.support.SupportPreferenceController"/>
- </PreferenceCategory>
+ <com.android.settings.homepage.HomepagePreference
+ android:icon="@drawable/ic_homepage_support_v2"
+ android:key="top_level_support"
+ android:order="100"
+ android:title="@string/page_tab_title_support"
+ settings:controller="com.android.settings.support.SupportPreferenceController"/>
</PreferenceScreen>
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index 34d8032..8648cff 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -37,12 +37,13 @@
android:persistent="false"
android:title="@string/wifi_hotspot_password_title"/>
- <ListPreference
- android:key="wifi_tether_network_ap_band"
- android:title="@string/wifi_hotspot_ap_band_title"/>
-
<SwitchPreference
android:key="wifi_tether_auto_turn_off"
android:title="@string/wifi_hotspot_auto_off_title"
android:summary="@string/wifi_hotspot_auto_off_summary"/>
+
+ <SwitchPreference
+ android:key="wifi_tether_maximize_compatibility"
+ android:title="@string/wifi_hotspot_maximize_compatibility"
+ android:summary="@string/wifi_hotspot_maximize_compatibility_summary"/>
</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 78dee02..10b3e41 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -23,7 +23,6 @@
<!-- Turn on DND button -->
<com.android.settingslib.widget.MainSwitchPreference
android:key="zen_mode_toggle"
- android:title="@string/do_not_disturb_main_switch_title"
settings:keywords="@string/keywords_zen_mode_settings"/>
<PreferenceCategory
@@ -49,15 +48,18 @@
</PreferenceCategory>
<!-- Automatic rules -->
- <Preference
- android:key="zen_mode_automation_settings"
- android:title="@string/zen_category_schedule"
- settings:allowDividerAbove="true"
- android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
+ <PreferenceCategory
+ android:key="zen_mode_settings_schedule"
+ android:title="@string/zen_category_schedule">
+ <Preference
+ android:key="zen_mode_automation_settings"
+ android:title="@string/zen_category_schedule"
+ android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
+ </PreferenceCategory>
<PreferenceCategory
- android:key="zen_mode_settings_advanced"
- settings:initialExpandedChildrenCount="0">
+ android:title="@string/zen_settings_general"
+ android:key="zen_mode_settings_advanced">
<!-- DND duration settings -->
<com.android.settings.notification.zen.ZenDurationDialogPreference
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index 1a45640..0b0fa27 100644
--- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -15,10 +15,10 @@
*/
package com.android.settings.datetime;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+import static android.app.time.Capabilities.CAPABILITY_NOT_ALLOWED;
+import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;
+import static android.app.time.Capabilities.CAPABILITY_POSSESSED;
import android.app.time.TimeManager;
import android.app.time.TimeZoneCapabilities;
diff --git a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
index a431883..8bfcd13 100644
--- a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
@@ -25,6 +25,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.SettingsEnableZenModeDialog;
@@ -90,9 +91,11 @@
case Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
mPreference.updateStatus(true);
+ mPreference.setTitle(R.string.do_not_disturb_main_switch_title_on);
break;
case Settings.Global.ZEN_MODE_OFF:
default:
+ mPreference.setTitle(R.string.do_not_disturb_main_switch_title_off);
mPreference.updateStatus(false);
}
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
new file mode 100644
index 0000000..bc87d5c
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2021 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.wifi.tether;
+
+import android.content.Context;
+import android.net.wifi.SoftApConfiguration;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+/**
+ * This controller helps to manage the state of maximize compatibility switch preference.
+ */
+public class WifiTetherMaximizeCompatibilityPreferenceController extends
+ WifiTetherBasePreferenceController {
+
+ private static final String TAG = "WifiTetherMaximizeCompatibilityPref";
+ public static final String PREF_KEY = "wifi_tether_maximize_compatibility";
+
+ private boolean mIsChecked;
+
+ public WifiTetherMaximizeCompatibilityPreferenceController(Context context,
+ WifiTetherBasePreferenceController.OnTetherConfigUpdateListener listener) {
+ super(context, listener);
+ mIsChecked = isMaximizeCompatibilityEnabled();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return PREF_KEY;
+ }
+
+ @Override
+ public void updateDisplay() {
+ if (mPreference == null) {
+ return;
+ }
+ mPreference.setEnabled(is5GhzBandSupported());
+ ((SwitchPreference) mPreference).setChecked(mIsChecked);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ mIsChecked = (Boolean) newValue;
+ if (mListener != null) {
+ mListener.onTetherConfigUpdated(this);
+ }
+ return true;
+ }
+
+ private boolean is5GhzBandSupported() {
+ if (mWifiManager == null) {
+ return false;
+ }
+ if (!mWifiManager.is5GHzBandSupported() || mWifiManager.getCountryCode() == null) {
+ return false;
+ }
+ return true;
+ }
+
+ @VisibleForTesting
+ boolean isMaximizeCompatibilityEnabled() {
+ if (mWifiManager == null) {
+ return false;
+ }
+ final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
+ if (config == null) {
+ return false;
+ }
+ if (mWifiManager.isBridgedApConcurrencySupported()) {
+ final boolean isEnabled = config.isBridgedModeOpportunisticShutdownEnabled();
+ Log.d(TAG, "isBridgedModeOpportunisticShutdownEnabled:" + isEnabled);
+ return isEnabled;
+ }
+
+ // If the BridgedAp Concurrency is not supported in early Pixel devices (e.g. Pixel 2~5),
+ // show toggle on if the band includes SoftApConfiguration.BAND_5GHZ.
+ final int band = config.getBand();
+ Log.d(TAG, "getBand:" + band);
+ return (band & SoftApConfiguration.BAND_5GHZ) > 0;
+ }
+
+ /**
+ * Setup the Maximize Compatibility setting to the SoftAp Configuration
+ *
+ * @param builder The builder to build the SoftApConfiguration.
+ */
+ public void setupMaximizeCompatibility(SoftApConfiguration.Builder builder) {
+ if (builder == null) {
+ return;
+ }
+ final boolean enabled = mIsChecked;
+ if (mWifiManager.isBridgedApConcurrencySupported()) {
+ int[] bands = {
+ SoftApConfiguration.BAND_2GHZ,
+ SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ};
+ builder.setBands(bands);
+ Log.d(TAG, "setBridgedModeOpportunisticShutdownEnabled:" + enabled);
+ builder.setBridgedModeOpportunisticShutdownEnabled(enabled);
+ } else {
+ int band = enabled
+ ? SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ
+ : SoftApConfiguration.BAND_2GHZ;
+ Log.d(TAG, "setBand:" + band);
+ builder.setBand(band);
+ }
+ }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 939f077..e342550 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -54,8 +54,7 @@
private static final String TAG = "WifiTetherSettings";
private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
private static final String KEY_WIFI_TETHER_SCREEN = "wifi_tether_settings_screen";
- private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
- private static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
+ private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
@VisibleForTesting
static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";
@@ -64,13 +63,14 @@
@VisibleForTesting
static final String KEY_WIFI_TETHER_AUTO_OFF = "wifi_tether_auto_turn_off";
@VisibleForTesting
- static final String KEY_WIFI_TETHER_NETWORK_AP_BAND = "wifi_tether_network_ap_band";
+ static final String KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY =
+ WifiTetherMaximizeCompatibilityPreferenceController.PREF_KEY;
private WifiTetherSwitchBarController mSwitchBarController;
private WifiTetherSSIDPreferenceController mSSIDPreferenceController;
private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
- private WifiTetherApBandPreferenceController mApBandPreferenceController;
private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
+ private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
private WifiManager mWifiManager;
private boolean mRestartWifiApAfterConfigChange;
@@ -116,7 +116,8 @@
mSSIDPreferenceController = use(WifiTetherSSIDPreferenceController.class);
mSecurityPreferenceController = use(WifiTetherSecurityPreferenceController.class);
mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);
- mApBandPreferenceController = use(WifiTetherApBandPreferenceController.class);
+ mMaxCompatibilityPrefController =
+ use(WifiTetherMaximizeCompatibilityPreferenceController.class);
}
@Override
@@ -180,10 +181,9 @@
controllers.add(new WifiTetherSSIDPreferenceController(context, listener));
controllers.add(new WifiTetherSecurityPreferenceController(context, listener));
controllers.add(new WifiTetherPasswordPreferenceController(context, listener));
- controllers.add(new WifiTetherApBandPreferenceController(context, listener));
controllers.add(
new WifiTetherAutoOffPreferenceController(context, KEY_WIFI_TETHER_AUTO_OFF));
-
+ controllers.add(new WifiTetherMaximizeCompatibilityPreferenceController(context, listener));
return controllers;
}
@@ -219,7 +219,7 @@
mPasswordPreferenceController.getPasswordValidated(securityType),
securityType);
}
- configBuilder.setBand(mApBandPreferenceController.getBandIndex());
+ mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder);
return configBuilder.build();
}
@@ -229,14 +229,10 @@
}
private void updateDisplayWithNewConfig() {
- use(WifiTetherSSIDPreferenceController.class)
- .updateDisplay();
- use(WifiTetherSecurityPreferenceController.class)
- .updateDisplay();
- use(WifiTetherPasswordPreferenceController.class)
- .updateDisplay();
- use(WifiTetherApBandPreferenceController.class)
- .updateDisplay();
+ use(WifiTetherSSIDPreferenceController.class).updateDisplay();
+ use(WifiTetherSecurityPreferenceController.class).updateDisplay();
+ use(WifiTetherPasswordPreferenceController.class).updateDisplay();
+ use(WifiTetherMaximizeCompatibilityPreferenceController.class).updateDisplay();
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -250,7 +246,7 @@
keys.add(KEY_WIFI_TETHER_NETWORK_NAME);
keys.add(KEY_WIFI_TETHER_NETWORK_PASSWORD);
keys.add(KEY_WIFI_TETHER_AUTO_OFF);
- keys.add(KEY_WIFI_TETHER_NETWORK_AP_BAND);
+ keys.add(KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
}
// Remove duplicate
@@ -294,22 +290,17 @@
private void reConfigInitialExpandedChildCount() {
final PreferenceGroup screen = getPreferenceScreen();
- if (mSecurityPreferenceController.getSecurityType()
- == SoftApConfiguration.SECURITY_TYPE_OPEN) {
- screen.setInitialExpandedChildrenCount(EXPANDED_CHILD_COUNT_WITH_SECURITY_NON);
- return;
+ if (screen != null) {
+ screen.setInitialExpandedChildrenCount(getInitialExpandedChildCount());
}
- screen.setInitialExpandedChildrenCount(EXPANDED_CHILD_COUNT_DEFAULT);
}
@Override
public int getInitialExpandedChildCount() {
- if (mSecurityPreferenceController == null) {
- return EXPANDED_CHILD_COUNT_DEFAULT;
+ if (mSecurityPreferenceController != null && mSecurityPreferenceController.getSecurityType()
+ == SoftApConfiguration.SECURITY_TYPE_OPEN) {
+ return (EXPANDED_CHILD_COUNT_DEFAULT - 1);
}
-
- return (mSecurityPreferenceController.getSecurityType()
- == SoftApConfiguration.SECURITY_TYPE_OPEN)
- ? EXPANDED_CHILD_COUNT_WITH_SECURITY_NON : EXPANDED_CHILD_COUNT_DEFAULT;
+ return EXPANDED_CHILD_COUNT_DEFAULT;
}
}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 8a68f38..eb29b7c 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -18,17 +18,16 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
-import static org.robolectric.shadow.api.Shadow.extract;
+import static org.mockito.Mockito.when;
import android.content.Context;
-import android.net.ConnectivityManager;
import android.provider.Settings;
+import android.telephony.TelephonyManager;
import androidx.preference.Preference;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,27 +35,28 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowConnectivityManager.class)
public class AutoTimeZonePreferenceControllerTest {
@Mock
private UpdateTimeAndDateCallback mCallback;
-
+ @Mock
private Context mContext;
private AutoTimeZonePreferenceController mController;
private Preference mPreference;
- private ShadowConnectivityManager connectivityManager;
+ @Mock
+ private TelephonyManager mTelephonyManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
+
mPreference = new Preference(mContext);
- connectivityManager = extract(mContext.getSystemService(ConnectivityManager.class));
- connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
+
+ when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+ when(mTelephonyManager.isDataCapable()).thenReturn(true);
}
@Test
@@ -77,8 +77,7 @@
@Test
public void isWifiOnly_notAvailable() {
- connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
+ when(mTelephonyManager.isDataCapable()).thenReturn(false);
mController = new AutoTimeZonePreferenceController(
mContext, null /* callback */, false /* fromSUW */);
@@ -95,8 +94,7 @@
@Test
public void isWifiOnly_notEnable() {
- connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
+ when(mTelephonyManager.isDataCapable()).thenReturn(false);
mController = new AutoTimeZonePreferenceController(
mContext, null /* callback */, false /* fromSUW */);
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index ae200b9..68b2990 100644
--- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -16,9 +16,9 @@
package com.android.settings.datetime;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;
+import static android.app.time.Capabilities.CAPABILITY_POSSESSED;
import static com.google.common.truth.Truth.assertThat;
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.time.Capabilities;
import android.app.time.TimeManager;
import android.app.time.TimeZoneCapabilities;
import android.app.time.TimeZoneCapabilitiesAndConfig;
@@ -142,7 +143,7 @@
}
private static TimeZoneCapabilities createTimeZoneCapabilities(
- @TimeZoneCapabilities.CapabilityState int geoDetectionCapability) {
+ @Capabilities.CapabilityState int geoDetectionCapability) {
UserHandle arbitraryUserHandle = UserHandle.of(123);
return new TimeZoneCapabilities.Builder(arbitraryUserHandle)
.setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
index 79df221..87fdb22 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
@@ -21,44 +21,42 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.shadow.api.Shadow.extract;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
-import android.net.ConnectivityManager;
import android.sysprop.TelephonyProperties;
-
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import android.telephony.TelephonyManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.Arrays;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowConnectivityManager.class)
public class BasebandVersionPreferenceControllerTest {
-
+ @Mock
private Context mContext;
private BasebandVersionPreferenceController mController;
+ @Mock
+ private TelephonyManager mTelephonyManager;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
mController = new BasebandVersionPreferenceController(mContext, "key");
+ when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
}
@Test
public void getAvailability_wifiOnly_unavailable() {
- final ShadowConnectivityManager connectivityManager =
- extract(mContext.getSystemService(ConnectivityManager.class));
- connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
+ when(mTelephonyManager.isDataCapable()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@@ -66,10 +64,7 @@
public void getAvailability_hasMobile_available() {
final String text = "test";
TelephonyProperties.baseband_version(Arrays.asList(new String[]{text}));
- ShadowConnectivityManager connectivityManager =
- extract(mContext.getSystemService(ConnectivityManager.class));
- connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
-
+ when(mTelephonyManager.isDataCapable()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
index ea90860..44611ce 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
@@ -74,7 +74,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);
ShadowEntityHeaderController.setUseMock(mock(EntityHeaderController.class));
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index a241296..2ecc7d2 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -101,7 +101,7 @@
assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
- assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+ assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
}
@Test
@@ -115,7 +115,7 @@
assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
- assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+ assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
}
@Test
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java
new file mode 100644
index 0000000..a2b99bf
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (C) 2021 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.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.wifi.SoftApConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Looper;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
+
+ @Rule
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Mock
+ private WifiManager mWifiManager;
+ @Mock
+ private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
+
+ private WifiTetherMaximizeCompatibilityPreferenceController mController;
+ private SwitchPreference mPreference;
+ private SoftApConfiguration mConfig;
+
+ @Before
+ public void setUp() {
+ final Context context = spy(ApplicationProvider.getApplicationContext());
+ mConfig = new SoftApConfiguration.Builder()
+ .setSsid("test_Ssid")
+ .setPassphrase(null, SoftApConfiguration.SECURITY_TYPE_OPEN)
+ .setBridgedModeOpportunisticShutdownEnabled(true)
+ .build();
+ doReturn(mWifiManager).when(context).getSystemService(Context.WIFI_SERVICE);
+ doReturn(true).when(mWifiManager).isBridgedApConcurrencySupported();
+ doReturn(mConfig).when(mWifiManager).getSoftApConfiguration();
+
+ mController = new WifiTetherMaximizeCompatibilityPreferenceController(context, mListener);
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+ final PreferenceManager preferenceManager = new PreferenceManager(context);
+ final PreferenceScreen screen = preferenceManager.createPreferenceScreen(context);
+ mPreference = new SwitchPreference(context);
+ mPreference.setKey(WifiTetherMaximizeCompatibilityPreferenceController.PREF_KEY);
+ screen.addPreference(mPreference);
+ mController.displayPreference(screen);
+ }
+
+ @Test
+ public void getPreferenceKey_shouldBeCorrect() {
+ assertThat(mController.getPreferenceKey())
+ .isEqualTo(WifiTetherMaximizeCompatibilityPreferenceController.PREF_KEY);
+ }
+
+ @Test
+ public void updateDisplay_notSupport5GHzBand_setPreferenceDisabled() {
+ doReturn(false).when(mWifiManager).is5GHzBandSupported();
+
+ mController.updateDisplay();
+
+ assertThat(mPreference.isEnabled()).isEqualTo(false);
+ }
+
+ @Test
+ public void updateDisplay_getNullCountryCode_setPreferenceDisabled() {
+ doReturn(null).when(mWifiManager).getCountryCode();
+
+ mController.updateDisplay();
+
+ assertThat(mPreference.isEnabled()).isEqualTo(false);
+ }
+
+ @Test
+ public void updateDisplay_supported5GHzBandAndCountryCodeIsNotNull_setPreferenceEnabled() {
+ doReturn(true).when(mWifiManager).is5GHzBandSupported();
+ doReturn("US").when(mWifiManager).getCountryCode();
+
+ mController.updateDisplay();
+
+ assertThat(mPreference.isEnabled()).isEqualTo(true);
+ }
+
+ @Test
+ public void onPreferenceChange_callbackOnTetherConfigUpdated() {
+ mController.onPreferenceChange(mPreference, true);
+ verify(mListener).onTetherConfigUpdated(any());
+ }
+
+ @Test
+ public void isMaximizeCompatibilityEnabled_concurrencySupportedAndEnabled_returnTure() {
+ // The preconditions are ready in setup().
+
+ assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
+ }
+
+ @Test
+ public void isMaximizeCompatibilityEnabled_concurrencySupportedAndDisabled_returnFalse() {
+ SoftApConfiguration config = new SoftApConfiguration.Builder()
+ .setBridgedModeOpportunisticShutdownEnabled(false)
+ .build();
+ doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+ assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false);
+ }
+
+ @Test
+ public void isMaximizeCompatibilityEnabled_noConcurrencyAndGetBand2gOnly_returnFalse() {
+ doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+ SoftApConfiguration config = new SoftApConfiguration.Builder()
+ .setBand(SoftApConfiguration.BAND_2GHZ)
+ .build();
+ doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+ assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false);
+ }
+
+ @Test
+ public void isMaximizeCompatibilityEnabled_noConcurrencyAndGetBand5gOnly_returnTrue() {
+ doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+ SoftApConfiguration config = new SoftApConfiguration.Builder()
+ .setBand(SoftApConfiguration.BAND_5GHZ)
+ .build();
+ doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+ assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
+ }
+
+ @Test
+ public void isMaximizeCompatibilityEnabled_noConcurrencyAndGetBand2gAnd5g_returnTrue() {
+ doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+ SoftApConfiguration config = new SoftApConfiguration.Builder()
+ .setBand(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ)
+ .build();
+ doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+ assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
+ }
+
+ @Test
+ public void setupMaximizeCompatibility_concurrencySupportedAndDisabled_setDisabled() {
+ // The precondition of the concurrency supported is ready in setup().
+ mController.onPreferenceChange(mPreference, false);
+
+ SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+ mController.setupMaximizeCompatibility(builder);
+
+ assertThat(builder.build().isBridgedModeOpportunisticShutdownEnabled()).isEqualTo(false);
+ }
+
+ @Test
+ public void setupMaximizeCompatibility_concurrencySupportedAndEnabled_setEnabled() {
+ // The precondition of the concurrency supported is ready in setup().
+ mController.onPreferenceChange(mPreference, true);
+
+ SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+ mController.setupMaximizeCompatibility(builder);
+
+ assertThat(builder.build().isBridgedModeOpportunisticShutdownEnabled()).isEqualTo(true);
+ }
+
+ @Test
+ public void setupMaximizeCompatibility_noConcurrencyAndSetDisabled_setBand2gOnly() {
+ doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+ mController.onPreferenceChange(mPreference, false);
+
+ SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+ mController.setupMaximizeCompatibility(builder);
+
+ assertThat(builder.build().getBand()).isEqualTo(SoftApConfiguration.BAND_2GHZ);
+ }
+
+ @Test
+ public void setupMaximizeCompatibility_noConcurrencyAndSetEnabled_setBand2gAnd5g() {
+ doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+ mController.onPreferenceChange(mPreference, true);
+
+ SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+ mController.setupMaximizeCompatibility(builder);
+
+ assertThat(builder.build().getBand())
+ .isEqualTo(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ);
+ }
+}