Merge "Add LocaleNotificaiton feature flag" into main
diff --git a/Android.bp b/Android.bp
index e27b9a1..d34aaac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,6 +74,7 @@
"androidx.preference_preference",
"androidx.recyclerview_recyclerview",
"androidx.window_window",
+ "androidx.window_window-java",
"com.google.android.material_material",
"setupcompat",
"setupdesign",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 412846c..b0b8ad6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3287,6 +3287,7 @@
android:name="Settings$DataUsageSummaryActivity"
android:label="@string/data_usage_summary_title"
android:exported="true"
+ android:enabled="@bool/config_show_sim_info"
android:icon="@drawable/ic_homepage_data_usage">
<intent-filter android:priority="1">
<action android:name="android.settings.DATA_USAGE_SETTINGS" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3703832..d87e1de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2063,6 +2063,21 @@
<!-- Wifi details preference category title for IPv6 information -->
<string name="wifi_details_ipv6_address_header">IPv6 addresses</string>
+ <!-- Hotspot device details preference category title in Network details [CHAR LIMIT=NONE]-->
+ <string name="hotspot_device_details_category">Hotspot device details</string>
+ <!-- Internet source preference in Hotspot device details preference category [CHAR LIMIT=NONE]-->
+ <string name="hotspot_device_details_internet_source">Internet source</string>
+ <!-- Wi-Fi summary in Internet source preference [CHAR LIMIT=NONE]-->
+ <string name="internet_source_wifi">Wi\u2011Fi</string>
+ <!-- Mobile data summary in Internet source preference [CHAR LIMIT=NONE]-->
+ <string name="internet_source_mobile_data">Mobile data</string>
+ <!-- Ethernet summary in Internet source preference [CHAR LIMIT=NONE]-->
+ <string name="internet_source_ethernet">Ethernet</string>
+ <!-- Hotspot device details preference category title in Network details [CHAR LIMIT=NONE]-->
+ <string name="hotspot_connection_category">Hotspot connection</string>
+ <!-- Connection strength preference in Hotspot connection preference category [CHAR LIMIT=NONE]-->
+ <string name="hotspot_connection_strength">Connection strength</string>
+
<!-- Wifi saved access points. Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
<string name="wifi_saved_access_points_label">Saved networks</string>
<!-- Tab title for showing subscribed WiFi access points. [CHAR LIMIT=20] -->
diff --git a/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
index afb2104..058d22e 100644
--- a/res/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
@@ -24,6 +24,7 @@
<shortcut
android:shortcutId="manifest-shortcut-data-usage"
android:icon="@drawable/ic_shortcut_data_usage"
+ android:enabled="@bool/config_show_sim_info"
android:shortcutShortLabel="@string/data_usage_summary_title">
<intent
android:action="android.intent.action.MAIN"
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index eb9add1..e3464c2 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -40,6 +40,30 @@
android:key="buttons"
android:selectable="false"/>
+ <!-- Hotspot device details category -->
+ <PreferenceCategory
+ android:key="hotspot_device_details_category"
+ android:title="@string/hotspot_device_details_category"
+ settings:isPreferenceVisible="false">
+ <Preference
+ android:key="hotspot_device_details_internet_source"
+ android:title="@string/hotspot_device_details_internet_source"
+ android:selectable="false"
+ settings:enableCopying="true"/>
+ <Preference
+ android:key="hotspot_device_details_battery"
+ android:title="@string/power_usage_summary_title"
+ android:selectable="false"
+ settings:enableCopying="true"/>
+ </PreferenceCategory>
+
+ <!-- Hotspot connection category -->
+ <PreferenceCategory
+ android:key="hotspot_connection_category"
+ android:title="@string/hotspot_connection_category"
+ settings:isPreferenceVisible="false">
+ </PreferenceCategory>
+
<!-- General Details Preferences -->
<Preference
android:key="signal_strength"
diff --git a/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java b/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java
new file mode 100644
index 0000000..b975b9e
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 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.connecteddevice.fastpair;
+
+import android.annotation.NonNull;
+import android.content.Context;
+
+/**
+ * Updates the Fast Pair devices. It notifies the upper level whether to add/remove the
+ * preference through {@link DevicePreferenceCallback}
+ */
+public interface FastPairDeviceUpdater {
+
+ /**
+ * Registers the Fast Pair event callback and update the list
+ */
+ default void registerCallback() {
+ }
+
+ /**
+ * Unregisters the Fast Pair event callback
+ */
+ default void unregisterCallback() {
+ }
+
+ /**
+ * Forces to update the list of Fast Pair devices
+ */
+ default void forceUpdate() {
+ }
+
+ /**
+ * Sets the context to generate the {@link Preference}, so it could get the correct theme.
+ */
+ default void setPreferenceContext(@NonNull Context preferenceContext) {
+ }
+}
+
diff --git a/src/com/android/settings/connecteddevice/fastpair/FastPairFeatureProvider.java b/src/com/android/settings/connecteddevice/fastpair/FastPairFeatureProvider.java
new file mode 100644
index 0000000..4673e7b
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/fastpair/FastPairFeatureProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2023 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.connecteddevice.fastpair;
+
+import android.content.Context;
+
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+
+/**
+ * Feature provider for the Fast Pair device updater.
+ */
+public interface FastPairFeatureProvider {
+ /**
+ * Returns the FastPairDeviceUpdater of the account associated Fast Pair device
+ */
+ FastPairDeviceUpdater getFastPairDeviceUpdater(
+ Context context, DevicePreferenceCallback devicePreferenceCallback);
+}
diff --git a/src/com/android/settings/connecteddevice/fastpair/FastPairFeatureProviderImpl.java b/src/com/android/settings/connecteddevice/fastpair/FastPairFeatureProviderImpl.java
new file mode 100644
index 0000000..ef6f3b5
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/fastpair/FastPairFeatureProviderImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 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.connecteddevice.fastpair;
+
+import android.content.Context;
+
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+
+/**
+ * Default implementation for {@link FastPairFeatureProvider}
+ */
+public class FastPairFeatureProviderImpl implements FastPairFeatureProvider {
+ @Override
+ public FastPairDeviceUpdater getFastPairDeviceUpdater(
+ Context context, DevicePreferenceCallback devicePreferenceCallback) {
+ return new FastPairDeviceUpdater() {
+ };
+ }
+}
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 533fbe7..d96ec39 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -50,6 +50,7 @@
import androidx.annotation.VisibleForTesting;
import androidx.core.graphics.Insets;
+import androidx.core.util.Consumer;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
@@ -57,7 +58,10 @@
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
+import androidx.window.embedding.SplitController;
+import androidx.window.embedding.SplitInfo;
import androidx.window.embedding.SplitRule;
+import androidx.window.java.embedding.SplitControllerCallbackAdapter;
import com.android.settings.R;
import com.android.settings.Settings;
@@ -77,6 +81,7 @@
import com.google.android.setupcompat.util.WizardManagerHelper;
import java.net.URISyntaxException;
+import java.util.List;
import java.util.Set;
/** Settings homepage activity */
@@ -112,6 +117,9 @@
// A regular layout shows icons on homepage, whereas a simplified layout doesn't.
private boolean mIsRegularLayout = true;
+ private SplitControllerCallbackAdapter mSplitControllerAdapter;
+ private SplitInfoCallback mCallback;
+
/** A listener receiving homepage loaded events. */
public interface HomepageLoadedListener {
/** Called when the homepage is loaded. */
@@ -259,6 +267,22 @@
protected void onStart() {
((SettingsApplication) getApplication()).setHomeActivity(this);
super.onStart();
+ if (mIsEmbeddingActivityEnabled) {
+ final SplitController splitController = SplitController.getInstance(this);
+ mSplitControllerAdapter = new SplitControllerCallbackAdapter(splitController);
+ mCallback = new SplitInfoCallback(this);
+ mSplitControllerAdapter.addSplitListener(this, Runnable::run, mCallback);
+ }
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ if (mSplitControllerAdapter != null && mCallback != null) {
+ mSplitControllerAdapter.removeSplitListener(mCallback);
+ mCallback = null;
+ mSplitControllerAdapter = null;
+ }
}
@Override
@@ -281,21 +305,13 @@
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- final boolean newTwoPaneState = ActivityEmbeddingUtils.isAlreadyEmbedded(this);
- if (mIsTwoPane != newTwoPaneState) {
- mIsTwoPane = newTwoPaneState;
- updateHomepageAppBar();
- updateHomepageBackground();
- updateHomepagePaddings();
- }
- updateSplitLayout();
+ updateHomepageUI();
}
private void updateSplitLayout() {
if (!mIsEmbeddingActivityEnabled) {
return;
}
-
if (mIsTwoPane) {
if (mIsRegularLayout == ActivityEmbeddingUtils.isRegularHomepageLayout(this)) {
// Layout unchanged
@@ -365,6 +381,17 @@
}
}
+ private void updateHomepageUI() {
+ final boolean newTwoPaneState = ActivityEmbeddingUtils.isAlreadyEmbedded(this);
+ if (mIsTwoPane != newTwoPaneState) {
+ mIsTwoPane = newTwoPaneState;
+ updateHomepageAppBar();
+ updateHomepageBackground();
+ updateHomepagePaddings();
+ }
+ updateSplitLayout();
+ }
+
private void updateHomepageBackground() {
if (!mIsEmbeddingActivityEnabled) {
return;
@@ -733,4 +760,24 @@
}
}
}
+
+ /** The callback invoked while AE splitting. */
+ private static class SplitInfoCallback implements Consumer<List<SplitInfo>> {
+ private final SettingsHomepageActivity mActivity;
+
+ private boolean mIsSplitUpdatedUI = false;
+
+ SplitInfoCallback(SettingsHomepageActivity activity) {
+ mActivity = activity;
+ }
+
+ @Override
+ public void accept(List<SplitInfo> splitInfoList) {
+ if (!splitInfoList.isEmpty() && !mIsSplitUpdatedUI && !mActivity.isFinishing()
+ && ActivityEmbeddingUtils.isAlreadyEmbedded(mActivity)) {
+ mIsSplitUpdatedUI = true;
+ mActivity.updateHomepageUI();
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
index 7c299c6..6e56153 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
@@ -171,12 +171,20 @@
/** Check if this device supports LE Audio Broadcast feature */
public boolean isBroadcastSupported() {
+ if (mLocalBluetoothManager == null) {
+ Log.e(TAG, "isBroadcastSupported: Bluetooth is not supported on this device");
+ return false;
+ }
LocalBluetoothLeBroadcast broadcast =
mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();
return broadcast != null ? true : false;
}
public boolean isDeviceBroadcasting() {
+ if (mLocalBluetoothManager == null) {
+ Log.e(TAG, "isDeviceBroadcasting: Bluetooth is not supported on this device");
+ return false;
+ }
LocalBluetoothLeBroadcast broadcast =
mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();
if (broadcast == null) {
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index e3e83dc..400d261 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.network.telephony.gsm;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
@@ -36,10 +37,11 @@
import android.telephony.TelephonyManager;
import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -63,10 +65,10 @@
* Preference controller for "Auto Select Network"
*/
public class AutoSelectPreferenceController extends TelephonyTogglePreferenceController
- implements LifecycleObserver{
+ implements LifecycleEventObserver{
private static final long MINIMUM_DIALOG_TIME_MILLIS = TimeUnit.SECONDS.toMillis(1);
private static final String LOG_TAG = "AutoSelectPreferenceController";
- private static final String INTERNAL_LOG_TAG_INIT = "Init";
+ private static final String INTERNAL_LOG_TAG_ONRESUME = "OnResume";
private static final String INTERNAL_LOG_TAG_AFTERSET = "AfterSet";
private final Handler mUiHandler;
@@ -110,14 +112,37 @@
}
}
- @OnLifecycleEvent(ON_START)
- public void onStart() {
- mAllowedNetworkTypesListener.register(mContext, mSubId);
- }
-
- @OnLifecycleEvent(ON_STOP)
- public void onStop() {
- mAllowedNetworkTypesListener.unregister(mContext, mSubId);
+ /**
+ * Implementation of LifecycleEventObserver.
+ */
+ @SuppressWarnings("FutureReturnValueIgnored")
+ public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+ @NonNull Lifecycle.Event event) {
+ switch (event) {
+ case ON_START:
+ mAllowedNetworkTypesListener.register(mContext, mSubId);
+ break;
+ case ON_RESUME:
+ ThreadUtils.postOnBackgroundThread(() -> {
+ queryNetworkSelectionMode(INTERNAL_LOG_TAG_ONRESUME);
+ //Update UI in UI thread
+ mUiHandler.post(() -> {
+ if (mSwitchPreference != null) {
+ mRecursiveUpdate.getAndIncrement();
+ mSwitchPreference.setChecked(isChecked());
+ mRecursiveUpdate.decrementAndGet();
+ updateListenerValue();
+ }
+ });
+ });
+ break;
+ case ON_STOP:
+ mAllowedNetworkTypesListener.unregister(mContext, mSubId);
+ break;
+ default:
+ // Do nothing
+ break;
+ }
}
@Override
@@ -243,19 +268,6 @@
updateUiAutoSelectValue(status);
}
};
-
- ThreadUtils.postOnBackgroundThread(() -> {
- queryNetworkSelectionMode(INTERNAL_LOG_TAG_INIT);
- //Update UI in UI thread
- mUiHandler.post(() -> {
- if (mSwitchPreference != null) {
- mRecursiveUpdate.getAndIncrement();
- mSwitchPreference.setChecked(isChecked());
- mRecursiveUpdate.decrementAndGet();
- updateListenerValue();
- }
- });
- });
return this;
}
diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt
index bda0e17..7645076 100644
--- a/src/com/android/settings/overlay/FeatureFactory.kt
+++ b/src/com/android/settings/overlay/FeatureFactory.kt
@@ -23,8 +23,8 @@
import com.android.settings.biometrics.face.FaceFeatureProvider
import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider
import com.android.settings.bluetooth.BluetoothFeatureProvider
+import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
-import com.android.settings.onboarding.OnboardingFeatureProvider
import com.android.settings.dashboard.DashboardFeatureProvider
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider
@@ -35,6 +35,7 @@
import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider
import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider
import com.android.settings.localepicker.LocaleFeatureProvider
+import com.android.settings.onboarding.OnboardingFeatureProvider
import com.android.settings.overlay.FeatureFactory.Companion.setFactory
import com.android.settings.panel.PanelFeatureProvider
import com.android.settings.search.SearchFeatureProvider
@@ -155,6 +156,11 @@
*/
open val onboardingFeatureProvider: OnboardingFeatureProvider? = null
+ /**
+ * Gets implementation for Fast Pair device updater provider.
+ */
+ abstract val fastPairFeatureProvider: FastPairFeatureProvider
+
companion object {
private var _factory: FeatureFactory? = null
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
index 2f0fe8b..0afe9f4 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
@@ -33,6 +33,8 @@
import com.android.settings.bluetooth.BluetoothFeatureProvider
import com.android.settings.bluetooth.BluetoothFeatureProviderImpl
import com.android.settings.connecteddevice.dock.DockUpdaterFeatureProviderImpl
+import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider
+import com.android.settings.connecteddevice.fastpair.FastPairFeatureProviderImpl
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProviderImpl
import com.android.settings.core.instrumentation.SettingsMetricsFeatureProvider
@@ -172,4 +174,8 @@
override val stylusFeatureProvider: StylusFeatureProvider by lazy {
StylusFeatureProviderImpl()
}
+
+ override val fastPairFeatureProvider: FastPairFeatureProvider by lazy {
+ FastPairFeatureProviderImpl()
+ }
}
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index b638ce7..3b2e15a 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -15,14 +15,19 @@
*/
package com.android.settings.wifi.details;
+import static com.android.settings.network.telephony.MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON;
import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
+import static com.android.settingslib.Utils.formatPercentage;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.graphics.ColorFilter;
+import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
+import android.net.wifi.sharedconnectivity.app.HotspotNetwork;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
@@ -32,19 +37,23 @@
import android.os.SystemClock;
import android.os.UserHandle;
import android.os.UserManager;
+import android.telephony.SignalStrength;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.WifiConfigUiBase2;
import com.android.settings.wifi.WifiDialog2;
+import com.android.settings.wifi.WifiUtils;
import com.android.settings.wifi.details2.AddDevicePreferenceController2;
import com.android.settings.wifi.details2.WifiAutoConnectPreferenceController2;
import com.android.settings.wifi.details2.WifiDetailPreferenceController2;
@@ -52,10 +61,12 @@
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
import com.android.settings.wifi.details2.WifiSecondSummaryController2;
import com.android.settings.wifi.details2.WifiSubscriptionDetailPreferenceController2;
+import com.android.settings.wifi.repository.SharedConnectivityRepository;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.graph.ThemedBatteryDrawable;
import com.android.wifitrackerlib.NetworkDetailsTracker;
import com.android.wifitrackerlib.WifiEntry;
@@ -78,6 +89,12 @@
// Key of a Bundle to save/restore the selected WifiEntry
public static final String KEY_CHOSEN_WIFIENTRY_KEY = "key_chosen_wifientry_key";
+ public static final String KEY_HOTSPOT_DEVICE_CATEGORY = "hotspot_device_details_category";
+ public static final String KEY_HOTSPOT_DEVICE_INTERNET_SOURCE =
+ "hotspot_device_details_internet_source";
+ public static final String KEY_HOTSPOT_DEVICE_BATTERY = "hotspot_device_details_battery";
+ public static final String KEY_HOTSPOT_CONNECTION_CATEGORY = "hotspot_connection_category";
+
// Max age of tracked WifiEntries
private static final long MAX_SCAN_AGE_MILLIS = 15_000;
// Interval between initiating SavedNetworkTracker scans
@@ -88,10 +105,15 @@
@VisibleForTesting
NetworkDetailsTracker mNetworkDetailsTracker;
private HandlerThread mWorkerThread;
- private WifiDetailPreferenceController2 mWifiDetailPreferenceController2;
+ @VisibleForTesting
+ WifiDetailPreferenceController2 mWifiDetailPreferenceController2;
private List<WifiDialog2.WifiDialog2Listener> mWifiDialogListeners = new ArrayList<>();
@VisibleForTesting
List<AbstractPreferenceController> mControllers;
+ private boolean mIsInstantHotspotFeatureEnabled =
+ SharedConnectivityRepository.isDeviceConfigEnabled();
+ @VisibleForTesting
+ WifiNetworkDetailsViewModel mWifiNetworkDetailsViewModel;
public WifiNetworkDetailsFragment() {
super(UserManager.DISALLOW_CONFIG_WIFI);
@@ -207,6 +229,10 @@
setupNetworksDetailTracker();
final WifiEntry wifiEntry = mNetworkDetailsTracker.getWifiEntry();
+ if (mIsInstantHotspotFeatureEnabled) {
+ getWifiNetworkDetailsViewModel().setWifiEntry(wifiEntry);
+ }
+
final WifiSecondSummaryController2 wifiSecondSummaryController2 =
new WifiSecondSummaryController2(context);
wifiSecondSummaryController2.setWifiEntry(wifiEntry);
@@ -335,5 +361,98 @@
}
controller.displayPreference(screen);
}
+ if (mIsInstantHotspotFeatureEnabled) {
+ getWifiNetworkDetailsViewModel().setWifiEntry(mNetworkDetailsTracker.getWifiEntry());
+ }
+ }
+
+ private WifiNetworkDetailsViewModel getWifiNetworkDetailsViewModel() {
+ if (mWifiNetworkDetailsViewModel == null) {
+ mWifiNetworkDetailsViewModel = FeatureFactory.getFeatureFactory()
+ .getWifiFeatureProvider().getWifiNetworkDetailsViewModel(this);
+ mWifiNetworkDetailsViewModel.getHotspotNetworkData()
+ .observe(this, this::onHotspotNetworkChanged);
+ }
+ return mWifiNetworkDetailsViewModel;
+ }
+
+ @VisibleForTesting
+ void onHotspotNetworkChanged(WifiNetworkDetailsViewModel.HotspotNetworkData data) {
+ PreferenceScreen screen = getPreferenceScreen();
+ if (screen == null) {
+ return;
+ }
+ if (data == null) {
+ screen.findPreference(KEY_HOTSPOT_DEVICE_CATEGORY).setVisible(false);
+ screen.findPreference(KEY_HOTSPOT_CONNECTION_CATEGORY).setVisible(false);
+ if (mWifiDetailPreferenceController2 != null) {
+ mWifiDetailPreferenceController2.setSignalStrengthTitle(R.string.wifi_signal);
+ }
+ return;
+ }
+ screen.findPreference(KEY_HOTSPOT_DEVICE_CATEGORY).setVisible(true);
+ updateInternetSource(data.getNetworkType(), data.getUpstreamConnectionStrength());
+ updateBattery(data.isBatteryCharging(), data.getBatteryPercentage());
+
+ screen.findPreference(KEY_HOTSPOT_CONNECTION_CATEGORY).setVisible(true);
+ if (mWifiDetailPreferenceController2 != null) {
+ mWifiDetailPreferenceController2
+ .setSignalStrengthTitle(R.string.hotspot_connection_strength);
+ }
+ }
+
+ @VisibleForTesting
+ void updateInternetSource(int networkType, int upstreamConnectionStrength) {
+ Preference internetSource = getPreferenceScreen()
+ .findPreference(KEY_HOTSPOT_DEVICE_INTERNET_SOURCE);
+ Drawable drawable;
+ if (networkType == HotspotNetwork.NETWORK_TYPE_WIFI) {
+ internetSource.setSummary(R.string.internet_source_wifi);
+ drawable = getContext().getDrawable(
+ WifiUtils.getInternetIconResource(upstreamConnectionStrength, false));
+ } else if (networkType == HotspotNetwork.NETWORK_TYPE_CELLULAR) {
+ internetSource.setSummary(R.string.internet_source_mobile_data);
+ drawable = getMobileDataIcon(upstreamConnectionStrength);
+ } else if (networkType == HotspotNetwork.NETWORK_TYPE_ETHERNET) {
+ internetSource.setSummary(R.string.internet_source_ethernet);
+ drawable = getContext().getDrawable(R.drawable.ic_settings_ethernet);
+ } else {
+ internetSource.setSummary(R.string.summary_placeholder);
+ drawable = null;
+ }
+ if (drawable != null) {
+ drawable.setTintList(
+ Utils.getColorAttr(getContext(), android.R.attr.colorControlNormal));
+ }
+ internetSource.setIcon(drawable);
+ }
+
+ @VisibleForTesting
+ Drawable getMobileDataIcon(int level) {
+ return MobileNetworkUtils.getSignalStrengthIcon(getContext(), level,
+ SignalStrength.NUM_SIGNAL_STRENGTH_BINS, NO_CELL_DATA_TYPE_ICON, false, false);
+ }
+
+ @VisibleForTesting
+ void updateBattery(boolean isChanging, int percentage) {
+ Preference battery = getPreferenceScreen().findPreference(KEY_HOTSPOT_DEVICE_BATTERY);
+ battery.setSummary(formatPercentage(percentage));
+ ThemedBatteryDrawable drawable = getBatteryDrawable();
+ if (drawable != null) {
+ drawable.setCharging(isChanging);
+ drawable.setBatteryLevel(percentage);
+ }
+ battery.setIcon(drawable);
+ }
+
+ @VisibleForTesting
+ ThemedBatteryDrawable getBatteryDrawable() {
+ int frameColor = getContext()
+ .getColor(com.android.settingslib.R.color.meter_background_color);
+ ThemedBatteryDrawable drawable = new ThemedBatteryDrawable(getContext(), frameColor);
+ ColorFilter colorFilter = Utils.getAlphaInvariantColorFilterForColor(
+ Utils.getColorAttrDefaultColor(getContext(), android.R.attr.colorControlNormal));
+ drawable.setColorFilter(colorFilter);
+ return drawable;
}
}
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsViewModel.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsViewModel.java
new file mode 100644
index 0000000..07445a3
--- /dev/null
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsViewModel.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2023 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.details;
+
+import android.app.Application;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.settings.overlay.FeatureFactory;
+import com.android.wifitrackerlib.HotspotNetworkEntry;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Wi-Fi Network Details ViewModel
+ */
+public class WifiNetworkDetailsViewModel extends AndroidViewModel {
+ private static final String TAG = "WifiNetworkDetailsViewModel";
+
+ @VisibleForTesting
+ MutableLiveData<HotspotNetworkData> mHotspotNetworkData = new MutableLiveData<>();
+
+ public WifiNetworkDetailsViewModel(@NotNull Application application) {
+ super(application);
+ }
+
+ /** Sets the {@link WifiEntry} class */
+ public void setWifiEntry(WifiEntry wifiEntry) {
+ if (!(wifiEntry instanceof HotspotNetworkEntry)) {
+ log("post HotspotNetworkData:null");
+ mHotspotNetworkData.postValue(null);
+ return;
+ }
+ HotspotNetworkEntry entry = (HotspotNetworkEntry) wifiEntry;
+ HotspotNetworkData data = new HotspotNetworkData(
+ entry.getNetworkType(),
+ entry.getUpstreamConnectionStrength(),
+ entry.getBatteryPercentage(),
+ entry.isBatteryCharging());
+ log("post HotspotNetworkData:" + data);
+ mHotspotNetworkData.postValue(data);
+ }
+
+ /** Gets the {@link HotspotNetworkData} LiveData */
+ public LiveData<HotspotNetworkData> getHotspotNetworkData() {
+ return mHotspotNetworkData;
+ }
+
+ /** The {@link HotspotNetworkData} class */
+ static class HotspotNetworkData {
+ private int mNetworkType;
+ private int mUpstreamConnectionStrength;
+ private int mBatteryPercentage;
+ private boolean mIsBatteryCharging;
+
+ HotspotNetworkData(int networkType, int upstreamConnectionStrength,
+ int batteryPercentage,
+ boolean isBatteryCharging) {
+ mNetworkType = networkType;
+ mUpstreamConnectionStrength = upstreamConnectionStrength;
+ mBatteryPercentage = batteryPercentage;
+ mIsBatteryCharging = isBatteryCharging;
+ }
+
+ /** Gets the network type */
+ public int getNetworkType() {
+ return mNetworkType;
+ }
+
+ /** Gets the upstream connection strength */
+ public int getUpstreamConnectionStrength() {
+ return mUpstreamConnectionStrength;
+ }
+
+ /** Gets the battery percentage */
+ public int getBatteryPercentage() {
+ return mBatteryPercentage;
+ }
+
+ /** Returns true if the battery is charging */
+ public boolean isBatteryCharging() {
+ return mIsBatteryCharging;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName()
+ + ":{networkType:" + mNetworkType
+ + ", upstreamConnectionStrength:" + mUpstreamConnectionStrength
+ + ", batteryPercentage:" + mBatteryPercentage
+ + ", isBatteryCharging:" + mIsBatteryCharging
+ + " }";
+ }
+ }
+
+ private void log(String msg) {
+ FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
+ }
+}
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 0da56e3..ac0e149 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -21,6 +21,8 @@
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID;
+import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.app.settings.SettingsEnums;
@@ -86,6 +88,7 @@
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference;
+import com.android.wifitrackerlib.HotspotNetworkEntry;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import com.android.wifitrackerlib.WifiEntry.DisconnectCallback;
@@ -172,7 +175,8 @@
// UI elements - in order of appearance
private ActionButtonsPreference mButtonsPref;
- private EntityHeaderController mEntityHeaderController;
+ @VisibleForTesting
+ EntityHeaderController mEntityHeaderController;
private Preference mSignalStrengthPref;
private Preference mTxLinkSpeedPref;
private Preference mRxLinkSpeedPref;
@@ -533,6 +537,8 @@
private void refreshPage() {
Log.d(TAG, "Update UI!");
+ // refresh header icon
+ refreshEntryHeaderIcon();
// refresh header
refreshEntityHeader();
@@ -561,8 +567,33 @@
refreshWifiType();
}
+ @VisibleForTesting
+ void refreshEntryHeaderIcon() {
+ if (mEntityHeaderController == null) {
+ return;
+ }
+ Drawable drawable = getWifiDrawable(mWifiEntry);
+ mEntityHeaderController
+ .setIcon(redrawIconForHeader(drawable))
+ .done(true /* rebind */);
+ }
+
+ /**
+ * Returns a Wi-Fi icon {@link Drawable}.
+ *
+ * @param wifiEntry {@link WifiEntry}
+ */
+ @VisibleForTesting
+ Drawable getWifiDrawable(WifiEntry wifiEntry) {
+ if (wifiEntry instanceof HotspotNetworkEntry) {
+ int deviceType = ((HotspotNetworkEntry) wifiEntry).getDeviceType();
+ return mContext.getDrawable(getHotspotIconResource(deviceType));
+ }
+ return mIconInjector.getIcon(wifiEntry.shouldShowXLevelIcon(), wifiEntry.getLevel());
+ }
+
private void refreshRssiViews() {
- final int signalLevel = mWifiEntry.getLevel();
+ int signalLevel = mWifiEntry.getLevel();
// Disappears signal view if not in range. e.g. for saved networks.
if (signalLevel == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
@@ -571,19 +602,13 @@
return;
}
- final boolean showX = mWifiEntry.shouldShowXLevelIcon();
-
+ boolean showX = mWifiEntry.shouldShowXLevelIcon();
if (mRssiSignalLevel == signalLevel && mShowX == showX) {
return;
}
mRssiSignalLevel = signalLevel;
mShowX = showX;
Drawable wifiIcon = mIconInjector.getIcon(mShowX, mRssiSignalLevel);
-
- if (mEntityHeaderController != null) {
- mEntityHeaderController.setIcon(redrawIconForHeader(wifiIcon)).done(true /* rebind */);
- }
-
Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
mSignalStrengthPref.setIcon(wifiIconDark);
@@ -1120,4 +1145,11 @@
public void onSignInResult(@SignInStatus int status) {
refreshPage();
}
+
+ /** Sets signal strength title */
+ public void setSignalStrengthTitle(int titleResId) {
+ if (mSignalStrengthPref != null) {
+ mSignalStrengthPref.setTitle(titleResId);
+ }
+ }
}
diff --git a/src/com/android/settings/wifi/factory/WifiFeatureProvider.java b/src/com/android/settings/wifi/factory/WifiFeatureProvider.java
index 3f0d62f..9e7365e 100644
--- a/src/com/android/settings/wifi/factory/WifiFeatureProvider.java
+++ b/src/com/android/settings/wifi/factory/WifiFeatureProvider.java
@@ -26,6 +26,7 @@
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelStoreOwner;
+import com.android.settings.wifi.details.WifiNetworkDetailsViewModel;
import com.android.settings.wifi.repository.SharedConnectivityRepository;
import com.android.settings.wifi.repository.WifiHotspotRepository;
import com.android.settings.wifi.tether.WifiHotspotSecurityViewModel;
@@ -135,6 +136,17 @@
}
/**
+ * Gets WifiNetworkDetailsViewModel
+ */
+ public WifiNetworkDetailsViewModel getWifiNetworkDetailsViewModel(
+ @NotNull ViewModelStoreOwner owner) {
+ WifiNetworkDetailsViewModel viewModel =
+ new ViewModelProvider(owner).get(WifiNetworkDetailsViewModel.class);
+ verboseLog(TAG, "getWifiNetworkDetailsViewModel():" + viewModel);
+ return viewModel;
+ }
+
+ /**
* Send a {@link Log#VERBOSE} log message.
*
* @param tag Used to identify the source of a log message. It usually identifies
diff --git a/src/com/android/settings/wifi/repository/SharedConnectivityRepository.java b/src/com/android/settings/wifi/repository/SharedConnectivityRepository.java
index fa34b00..5b1a1fd 100644
--- a/src/com/android/settings/wifi/repository/SharedConnectivityRepository.java
+++ b/src/com/android/settings/wifi/repository/SharedConnectivityRepository.java
@@ -58,8 +58,7 @@
MutableLiveData<SharedConnectivitySettingsState> mSettingsState = new MutableLiveData<>();
public SharedConnectivityRepository(@NonNull Context appContext) {
- this(appContext,
- DeviceConfig.getBoolean(DEVICE_CONFIG_NAMESPACE, DEVICE_CONFIG_KEY, false));
+ this(appContext, isDeviceConfigEnabled());
}
@VisibleForTesting
@@ -181,4 +180,11 @@
private void log(String msg) {
FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
}
+
+ /**
+ * Returns true if Shared Connectivity feature is enabled.
+ */
+ public static boolean isDeviceConfigEnabled() {
+ return DeviceConfig.getBoolean(DEVICE_CONFIG_NAMESPACE, DEVICE_CONFIG_KEY, false);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
index cd06bae..444fa1e 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
@@ -313,4 +313,18 @@
assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isTrue();
}
+
+ @Test
+ public void isBroadcastSupported_noLocalMediaManager_returnFalse() {
+ mMediaOutputIndicatorWorker.mLocalMediaManager = null;
+
+ assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isFalse();
+ }
+
+ @Test
+ public void isDeviceBroadcasting_noLocalMediaManager_returnFalse() {
+ mMediaOutputIndicatorWorker.mLocalMediaManager = null;
+
+ assertThat(mMediaOutputIndicatorWorker.isDeviceBroadcasting()).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
index fc90372..c8cf290 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
@@ -235,8 +235,7 @@
mPreferenceController.getDefaultNASIntent();
mPreferenceController.updateState(mPreference);
- verify(mPreference, times(1)).setSwitchEnabled(eq(false));
+ verify(mPreference).setSwitchEnabled(eq(false));
assertFalse(mPreference.isEnabled());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
index 4f74254..bd8b5be 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
@@ -16,7 +16,19 @@
package com.android.settings.wifi.details;
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_CELLULAR;
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_ETHERNET;
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_UNKNOWN;
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_WIFI;
+import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
+
import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
+import static com.android.settings.wifi.details.WifiNetworkDetailsFragment.KEY_HOTSPOT_CONNECTION_CATEGORY;
+import static com.android.settings.wifi.details.WifiNetworkDetailsFragment.KEY_HOTSPOT_DEVICE_BATTERY;
+import static com.android.settings.wifi.details.WifiNetworkDetailsFragment.KEY_HOTSPOT_DEVICE_CATEGORY;
+import static com.android.settings.wifi.details.WifiNetworkDetailsFragment.KEY_HOTSPOT_DEVICE_INTERNET_SOURCE;
+import static com.android.settingslib.Utils.formatPercentage;
+import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MAX;
import static com.google.common.truth.Truth.assertThat;
@@ -29,25 +41,37 @@
import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.TextView;
import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.wifi.WifiUtils;
+import com.android.settings.wifi.details2.WifiDetailPreferenceController2;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.graph.ThemedBatteryDrawable;
import com.android.wifitrackerlib.NetworkDetailsTracker;
import com.android.wifitrackerlib.WifiEntry;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@@ -56,23 +80,63 @@
@RunWith(RobolectricTestRunner.class)
public class WifiNetworkDetailsFragmentTest {
- private static final String TEST_PREFERENCE_KEY = "TEST_PREFERENCE_KEY";
+ static final String TEST_PREFERENCE_KEY = "TEST_PREFERENCE_KEY";
+ static final int BATTERY_PERCENTAGE_MAX = 100;
+ @Rule
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Spy
+ Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ PreferenceManager mPreferenceManager;
+ @Mock
+ Preference mHotspotDeviceCategory;
+ @Mock
+ Preference mInternetSource;
+ @Mock
+ Preference mBattery;
+ @Mock
+ Preference mHotspotConnectionCategory;
+ @Mock
+ Menu mMenu;
+ @Mock
+ Drawable mDrawable;
+ @Mock
+ WifiDetailPreferenceController2 mWifiDetailPreferenceController2;
@Mock
WifiEntry mWifiEntry;
@Mock
NetworkDetailsTracker mNetworkDetailsTracker;
@Mock
- Menu mMenu;
- private WifiNetworkDetailsFragment mFragment;
+ WifiNetworkDetailsViewModel.HotspotNetworkData mHotspotNetworkData;
+
+ FakeFragment mFragment;
+ PreferenceScreen mScreen;
+ ArgumentCaptor<ThemedBatteryDrawable> mThemedBatteryDrawableCaptor =
+ ArgumentCaptor.forClass(ThemedBatteryDrawable.class);
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
doReturn(mWifiEntry).when(mNetworkDetailsTracker).getWifiEntry();
doReturn(true).when(mWifiEntry).isSaved();
+ doReturn(NETWORK_TYPE_WIFI).when(mHotspotNetworkData).getNetworkType();
+ doReturn(WIFI_LEVEL_MAX).when(mHotspotNetworkData).getUpstreamConnectionStrength();
+ doReturn(BATTERY_PERCENTAGE_MAX).when(mHotspotNetworkData).getBatteryPercentage();
+ doReturn(true).when(mHotspotNetworkData).isBatteryCharging();
- mFragment = new WifiNetworkDetailsFragment();
+ mFragment = spy(new FakeFragment());
+ doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
+ doReturn(mContext).when(mPreferenceManager).getContext();
+ doReturn(mContext).when(mFragment).getContext();
+ mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null));
+ doReturn(mPreferenceManager).when(mScreen).getPreferenceManager();
+ doReturn(mScreen).when(mFragment).getPreferenceScreen();
+
+ doReturn(mHotspotDeviceCategory).when(mScreen).findPreference(KEY_HOTSPOT_DEVICE_CATEGORY);
+ doReturn(mInternetSource).when(mScreen).findPreference(KEY_HOTSPOT_DEVICE_INTERNET_SOURCE);
+ doReturn(mBattery).when(mScreen).findPreference(KEY_HOTSPOT_DEVICE_BATTERY);
+ doReturn(mHotspotConnectionCategory).when(mScreen)
+ .findPreference(KEY_HOTSPOT_CONNECTION_CATEGORY);
mFragment.mNetworkDetailsTracker = mNetworkDetailsTracker;
}
@@ -94,7 +158,7 @@
@Test
public void onCreateOptionsMenu_shouldSetCorrectIcon() {
- final MenuItem menuItem = mock(MenuItem.class);
+ MenuItem menuItem = mock(MenuItem.class);
doReturn(menuItem).when(mMenu).add(anyInt(), eq(Menu.FIRST), anyInt(), anyInt());
mFragment.onCreateOptionsMenu(mMenu, mock(MenuInflater.class));
@@ -122,47 +186,129 @@
@Test
public void restrictUi_shouldShowRestrictedText() {
- final FakeFragment fragment = spy(new FakeFragment());
- final PreferenceScreen screen = mock(PreferenceScreen.class);
- final TextView restrictedText = mock(TextView.class);
- doReturn(screen).when(fragment).getPreferenceScreen();
- doReturn(false).when(fragment).isUiRestrictedByOnlyAdmin();
- doReturn(restrictedText).when(fragment).getEmptyTextView();
+ TextView restrictedText = mock(TextView.class);
+ doReturn(mScreen).when(mFragment).getPreferenceScreen();
+ doReturn(false).when(mFragment).isUiRestrictedByOnlyAdmin();
+ doReturn(restrictedText).when(mFragment).getEmptyTextView();
- fragment.restrictUi();
+ mFragment.restrictUi();
verify(restrictedText).setText(anyInt());
}
@Test
public void restrictUi_shouldRemoveAllPreferences() {
- final FakeFragment fragment = spy(new FakeFragment());
- final PreferenceScreen screen = mock(PreferenceScreen.class);
- doReturn(screen).when(fragment).getPreferenceScreen();
- doReturn(true).when(fragment).isUiRestrictedByOnlyAdmin();
+ doReturn(mScreen).when(mFragment).getPreferenceScreen();
+ doReturn(true).when(mFragment).isUiRestrictedByOnlyAdmin();
- fragment.restrictUi();
+ mFragment.restrictUi();
- verify(screen).removeAll();
+ verify(mScreen).removeAll();
}
@Test
public void refreshPreferences_controllerShouldUpdateStateAndDisplayPreference() {
- final FakeFragment fragment = spy(new FakeFragment());
- final PreferenceScreen screen = mock(PreferenceScreen.class);
- final Preference preference = mock(Preference.class);
- final TestController controller = mock(TestController.class);
- doReturn(screen).when(fragment).getPreferenceScreen();
- doReturn(preference).when(screen).findPreference(TEST_PREFERENCE_KEY);
+ Preference preference = mock(Preference.class);
+ TestController controller = mock(TestController.class);
+ doReturn(mScreen).when(mFragment).getPreferenceScreen();
+ doReturn(preference).when(mScreen).findPreference(TEST_PREFERENCE_KEY);
doReturn(TEST_PREFERENCE_KEY).when(controller).getPreferenceKey();
- fragment.mControllers = new ArrayList<>();
- fragment.mControllers.add(controller);
- fragment.addPreferenceController(controller);
+ mFragment.mControllers = new ArrayList<>();
+ mFragment.mControllers.add(controller);
+ mFragment.addPreferenceController(controller);
- fragment.refreshPreferences();
+ mFragment.refreshPreferences();
verify(controller).updateState(preference);
- verify(controller).displayPreference(screen);
+ verify(controller).displayPreference(mScreen);
+ }
+
+ @Test
+ public void onHotspotNetworkChanged_dataNull_hotspotSetVisibleFalse() {
+ mFragment.mWifiDetailPreferenceController2 = mWifiDetailPreferenceController2;
+
+ mFragment.onHotspotNetworkChanged(null);
+
+ verify(mHotspotDeviceCategory).setVisible(false);
+ verify(mHotspotConnectionCategory).setVisible(false);
+ verify(mWifiDetailPreferenceController2).setSignalStrengthTitle(R.string.wifi_signal);
+ }
+
+ @Test
+ public void onHotspotNetworkChanged_dataNotNull_hotspotSetVisibleTrue() {
+ mFragment.mWifiDetailPreferenceController2 = mWifiDetailPreferenceController2;
+
+ mFragment.onHotspotNetworkChanged(mHotspotNetworkData);
+
+ verify(mHotspotDeviceCategory).setVisible(true);
+ verify(mFragment).updateInternetSource(mHotspotNetworkData.getNetworkType(),
+ mHotspotNetworkData.getUpstreamConnectionStrength());
+ verify(mFragment).updateBattery(mHotspotNetworkData.isBatteryCharging(),
+ mHotspotNetworkData.getBatteryPercentage());
+ verify(mHotspotConnectionCategory).setVisible(true);
+ verify(mWifiDetailPreferenceController2)
+ .setSignalStrengthTitle(R.string.hotspot_connection_strength);
+ }
+
+ @Test
+ public void updateInternetSource_networkTypeWifi_setWifiResource() {
+ doReturn(mDrawable).when(mContext)
+ .getDrawable(WifiUtils.getInternetIconResource(WIFI_LEVEL_MAX, false));
+
+ mFragment.updateInternetSource(NETWORK_TYPE_WIFI, WIFI_LEVEL_MAX);
+
+ verify(mInternetSource).setSummary(R.string.internet_source_wifi);
+ verify(mInternetSource).setIcon(mDrawable);
+ }
+
+ @Test
+ public void updateInternetSource_networkTypeMobileData_setMobileDataResource() {
+ doReturn(mDrawable).when(mFragment).getMobileDataIcon(SIGNAL_STRENGTH_GREAT);
+
+ mFragment.updateInternetSource(NETWORK_TYPE_CELLULAR, SIGNAL_STRENGTH_GREAT);
+
+ verify(mInternetSource).setSummary(R.string.internet_source_mobile_data);
+ verify(mInternetSource).setIcon(mDrawable);
+ }
+
+ @Test
+ public void updateInternetSource_networkTypeEthernet_setEthernetResource() {
+ doReturn(mDrawable).when(mContext).getDrawable(R.drawable.ic_settings_ethernet);
+
+ mFragment.updateInternetSource(NETWORK_TYPE_ETHERNET, 0 /* don't care */);
+
+ verify(mInternetSource).setSummary(R.string.internet_source_ethernet);
+ verify(mInternetSource).setIcon(mDrawable);
+ }
+
+ @Test
+ public void updateInternetSource_networkTypeUnknown_setPlaceholderResource() {
+ mFragment.updateInternetSource(NETWORK_TYPE_UNKNOWN, 0 /* don't care */);
+
+ verify(mInternetSource).setSummary(R.string.summary_placeholder);
+ verify(mInternetSource).setIcon(null);
+ }
+
+ @Test
+ public void updateBattery_hiPercentageNoCharging_setResourceCorrect() {
+ mFragment.updateBattery(false /* isChanging */, BATTERY_PERCENTAGE_MAX);
+
+ verify(mBattery).setSummary(formatPercentage(BATTERY_PERCENTAGE_MAX));
+ verify(mBattery).setIcon(mThemedBatteryDrawableCaptor.capture());
+ ThemedBatteryDrawable drawable = mThemedBatteryDrawableCaptor.getValue();
+ assertThat(drawable.getCharging()).isFalse();
+ assertThat(drawable.getBatteryLevel()).isEqualTo(BATTERY_PERCENTAGE_MAX);
+ }
+
+ @Test
+ public void updateBattery_lowPercentageWithCharging_setResourceCorrect() {
+ mFragment.updateBattery(true /* isChanging */, 0 /* percentage */);
+
+ verify(mBattery).setSummary(formatPercentage(0));
+ verify(mBattery).setIcon(mThemedBatteryDrawableCaptor.capture());
+ ThemedBatteryDrawable drawable = mThemedBatteryDrawableCaptor.getValue();
+ assertThat(drawable.getCharging()).isTrue();
+ assertThat(drawable.getBatteryLevel()).isEqualTo(0);
}
// Fake WifiNetworkDetailsFragment to override the protected method as public.
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index 7c9f665..c573c94 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -15,8 +15,13 @@
*/
package com.android.settings.wifi.details2;
+import static android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.DEVICE_TYPE_PHONE;
+
+import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
@@ -83,6 +88,7 @@
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference;
+import com.android.wifitrackerlib.HotspotNetworkEntry;
import com.android.wifitrackerlib.NetworkDetailsTracker;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
@@ -524,12 +530,12 @@
}
@Test
- public void entityHeader_shouldNotHaveIconSetForNotInRangeNetwork() {
+ public void entityHeader_shouldHaveIconSetForNotInRangeNetwork() {
setUpForNotInRangeNetwork();
displayAndResume();
- verify(mMockHeaderController, never()).setIcon(any(Drawable.class));
+ verify(mMockHeaderController).setIcon(any(Drawable.class));
}
@Test
@@ -1814,6 +1820,71 @@
assertThat(info.getDisplayName().toString()).isEqualTo("sim2");
}
+ @Test
+ public void refreshEntryHeaderIcon_entityHeaderControllerNull_doNothing() {
+ setUpSpyController();
+ mController.mEntityHeaderController = null;
+
+ mController.refreshEntryHeaderIcon();
+
+ verify(mController, never()).getWifiDrawable(any());
+ }
+
+ @Test
+ public void refreshEntryHeaderIcon_entityHeaderControllerNotNull_setIcon() {
+ setUpSpyController();
+ mController.mEntityHeaderController = mMockHeaderController;
+
+ mController.refreshEntryHeaderIcon();
+
+ verify(mController).getWifiDrawable(any());
+ verify(mMockHeaderController).setIcon(any(Drawable.class));
+ }
+
+ @Test
+ public void getWifiDrawable_withHotspotNetworkEntry_returnHotspotDrawable() {
+ setUpSpyController();
+ HotspotNetworkEntry entry = mock(HotspotNetworkEntry.class);
+ when(entry.getDeviceType()).thenReturn(DEVICE_TYPE_PHONE);
+
+ mController.getWifiDrawable(entry);
+
+ verify(mContext).getDrawable(getHotspotIconResource(DEVICE_TYPE_PHONE));
+ }
+
+ @Test
+ public void getWifiDrawable_withWifiEntryNotShowXLevelIcon_getIconWithInternet() {
+ setUpSpyController();
+ when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
+ when(mMockWifiEntry.shouldShowXLevelIcon()).thenReturn(false);
+
+ mController.getWifiDrawable(mMockWifiEntry);
+
+ verify(mMockIconInjector).getIcon(eq(false) /* noInternet */, anyInt());
+ }
+
+ @Test
+ public void getWifiDrawable_withWifiEntryShowXLevelIcon_getIconWithNoInternet() {
+ setUpSpyController();
+ when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
+ when(mMockWifiEntry.shouldShowXLevelIcon()).thenReturn(true);
+
+ mController.getWifiDrawable(mMockWifiEntry);
+
+ verify(mMockIconInjector).getIcon(eq(true) /* noInternet */, anyInt());
+ verify(mMockIconInjector).getIcon(eq(true) /* noInternet */, anyInt());
+ }
+
+ @Test
+ public void setSignalStrengthTitle_prefNotNull_setPrefTitle() {
+ setUpSpyController();
+ mController.displayPreference(mMockScreen);
+
+ mController.setSignalStrengthTitle(R.string.hotspot_connection_strength);
+
+ verify(mMockSignalStrengthPref).setTitle(R.string.hotspot_connection_strength);
+ }
+
private SubscriptionInfo mockSubscriptionInfo(int subId, String displayName, int carrierId) {
SubscriptionInfo info = mock(SubscriptionInfo.class);
when(info.getSubscriptionId()).thenReturn(subId);
diff --git a/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
index c8db62f..52a5f24 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
@@ -26,6 +26,7 @@
import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider;
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -95,6 +96,7 @@
public KeyboardSettingsFeatureProvider mKeyboardSettingsFeatureProvider;
public StylusFeatureProvider mStylusFeatureProvider;
public OnboardingFeatureProvider mOnboardingFeatureProvider;
+ public FastPairFeatureProvider mFastPairFeatureProvider;
/**
* Call this in {@code @Before} method of the test class to use fake factory.
@@ -140,6 +142,7 @@
mKeyboardSettingsFeatureProvider = mock(KeyboardSettingsFeatureProvider.class);
mStylusFeatureProvider = mock(StylusFeatureProvider.class);
mOnboardingFeatureProvider = mock(OnboardingFeatureProvider.class);
+ mFastPairFeatureProvider = mock(FastPairFeatureProvider.class);
}
@Override
@@ -307,4 +310,10 @@
public OnboardingFeatureProvider getOnboardingFeatureProvider() {
return mOnboardingFeatureProvider;
}
+
+ @Override
+ public FastPairFeatureProvider getFastPairFeatureProvider() {
+ return mFastPairFeatureProvider;
+ }
}
+
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt
index 5922fac..18af600 100644
--- a/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt
@@ -26,6 +26,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
import org.junit.Before
+import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -86,6 +87,7 @@
}
@Test
+ @Ignore("b/297923588")
fun getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub() {
whenever(subscriptionManager.availableSubscriptionInfoList)
.thenReturn(listOf(SUBSCRIBER_INFO))
@@ -168,4 +170,4 @@
const val SUBSCRIBER_ID = "Test Subscriber"
val SUBSCRIBER_INFO: SubscriptionInfo = SubscriptionInfo.Builder().setId(SUB_ID).build()
}
-}
\ No newline at end of file
+}
diff --git a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
index e5e4990..95f25ad 100644
--- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
+++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
@@ -24,6 +24,7 @@
import com.android.settings.biometrics.face.FaceFeatureProvider
import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider
import com.android.settings.bluetooth.BluetoothFeatureProvider
+import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
import com.android.settings.dashboard.DashboardFeatureProvider
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
@@ -137,4 +138,6 @@
get() = TODO("Not yet implemented")
override val stylusFeatureProvider: StylusFeatureProvider
get() = TODO("Not yet implemented")
+ override val fastPairFeatureProvider: FastPairFeatureProvider
+ get() = TODO("Not yet implemented")
}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
index 05ed662..a3a92a3 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -23,10 +23,10 @@
import com.android.settings.accessibility.AccessibilitySearchFeatureProvider;
import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.onboarding.OnboardingFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider;
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -39,6 +39,7 @@
import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider;
import com.android.settings.localepicker.LocaleFeatureProvider;
+import com.android.settings.onboarding.OnboardingFeatureProvider;
import com.android.settings.overlay.DockUpdaterFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.SupportFeatureProvider;
@@ -94,6 +95,7 @@
public KeyboardSettingsFeatureProvider mKeyboardSettingsFeatureProvider;
public StylusFeatureProvider mStylusFeatureProvider;
public OnboardingFeatureProvider mOnboardingFeatureProvider;
+ public FastPairFeatureProvider mFastPairFeatureProvider;
/**
* Call this in {@code @Before} method of the test class to use fake factory.
@@ -104,9 +106,9 @@
return factory;
}
- /**
- * FeatureFactory constructor.
- */
+ /**
+ * FeatureFactory constructor.
+ */
public FakeFeatureFactory() {
supportFeatureProvider = mock(SupportFeatureProvider.class);
metricsFeatureProvider = mock(MetricsFeatureProvider.class);
@@ -139,6 +141,7 @@
mKeyboardSettingsFeatureProvider = mock(KeyboardSettingsFeatureProvider.class);
mStylusFeatureProvider = mock(StylusFeatureProvider.class);
mOnboardingFeatureProvider = mock(OnboardingFeatureProvider.class);
+ mFastPairFeatureProvider = mock(FastPairFeatureProvider.class);
}
@Override
@@ -306,4 +309,9 @@
public OnboardingFeatureProvider getOnboardingFeatureProvider() {
return mOnboardingFeatureProvider;
}
+
+ @Override
+ public FastPairFeatureProvider getFastPairFeatureProvider() {
+ return mFastPairFeatureProvider;
+ }
}
diff --git a/tests/unit/src/com/android/settings/wifi/details/WifiNetworkDetailsViewModelTest.java b/tests/unit/src/com/android/settings/wifi/details/WifiNetworkDetailsViewModelTest.java
new file mode 100644
index 0000000..5f2c561
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/details/WifiNetworkDetailsViewModelTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2023 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.details;
+
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_CELLULAR;
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_ETHERNET;
+import static android.net.wifi.sharedconnectivity.app.HotspotNetwork.NETWORK_TYPE_WIFI;
+import static android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
+
+import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MAX;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Application;
+
+import androidx.lifecycle.MutableLiveData;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.wifitrackerlib.HotspotNetworkEntry;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+public class WifiNetworkDetailsViewModelTest {
+
+ @Rule
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Spy
+ Application mApplication = ApplicationProvider.getApplicationContext();
+ @Mock
+ MutableLiveData<WifiNetworkDetailsViewModel.HotspotNetworkData> mHotspotNetworkData;
+ @Mock
+ HotspotNetworkEntry mHotspotNetworkEntry;
+
+ WifiNetworkDetailsViewModel mViewModel;
+ ArgumentCaptor<WifiNetworkDetailsViewModel.HotspotNetworkData> mHotspotNetworkDataCaptor =
+ ArgumentCaptor.forClass(WifiNetworkDetailsViewModel.HotspotNetworkData.class);
+
+ @Before
+ public void setUp() {
+ mViewModel = new WifiNetworkDetailsViewModel(mApplication);
+ mViewModel.mHotspotNetworkData = mHotspotNetworkData;
+ }
+
+ @Test
+ public void setWifiEntry_notHotspotNetworkEntry_postValueNull() {
+ mViewModel.setWifiEntry(mock(WifiEntry.class));
+
+ verify(mHotspotNetworkData).postValue(null);
+ }
+
+ @Test
+ public void setWifiEntry_hotspotNetworkEntryWifi_postValueCorrect() {
+ when(mHotspotNetworkEntry.getNetworkType()).thenReturn(NETWORK_TYPE_WIFI);
+ when(mHotspotNetworkEntry.getUpstreamConnectionStrength()).thenReturn(WIFI_LEVEL_MAX);
+ when(mHotspotNetworkEntry.getBatteryPercentage()).thenReturn(100);
+ when(mHotspotNetworkEntry.isBatteryCharging()).thenReturn(false);
+
+
+ mViewModel.setWifiEntry(mHotspotNetworkEntry);
+
+ verify(mHotspotNetworkData).postValue(mHotspotNetworkDataCaptor.capture());
+ WifiNetworkDetailsViewModel.HotspotNetworkData data = mHotspotNetworkDataCaptor.getValue();
+ assertThat(data.getNetworkType()).isEqualTo(NETWORK_TYPE_WIFI);
+ assertThat(data.getUpstreamConnectionStrength()).isEqualTo(WIFI_LEVEL_MAX);
+ assertThat(data.getBatteryPercentage()).isEqualTo(100);
+ assertThat(data.isBatteryCharging()).isEqualTo(false);
+ }
+
+ @Test
+ public void setWifiEntry_hotspotNetworkEntryMobileData_postValueCorrect() {
+ when(mHotspotNetworkEntry.getNetworkType()).thenReturn(NETWORK_TYPE_CELLULAR);
+ when(mHotspotNetworkEntry.getUpstreamConnectionStrength())
+ .thenReturn(SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
+ when(mHotspotNetworkEntry.getBatteryPercentage()).thenReturn(0);
+ when(mHotspotNetworkEntry.isBatteryCharging()).thenReturn(true);
+
+
+ mViewModel.setWifiEntry(mHotspotNetworkEntry);
+
+ verify(mHotspotNetworkData).postValue(mHotspotNetworkDataCaptor.capture());
+ WifiNetworkDetailsViewModel.HotspotNetworkData data = mHotspotNetworkDataCaptor.getValue();
+ assertThat(data.getNetworkType()).isEqualTo(NETWORK_TYPE_CELLULAR);
+ assertThat(data.getUpstreamConnectionStrength()).isEqualTo(SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
+ assertThat(data.getBatteryPercentage()).isEqualTo(0);
+ assertThat(data.isBatteryCharging()).isEqualTo(true);
+ }
+
+ @Test
+ public void setWifiEntry_hotspotNetworkEntryEthernet_postValueCorrect() {
+ when(mHotspotNetworkEntry.getNetworkType()).thenReturn(NETWORK_TYPE_ETHERNET);
+ when(mHotspotNetworkEntry.getBatteryPercentage()).thenReturn(50);
+ when(mHotspotNetworkEntry.isBatteryCharging()).thenReturn(true);
+
+
+ mViewModel.setWifiEntry(mHotspotNetworkEntry);
+
+ verify(mHotspotNetworkData).postValue(mHotspotNetworkDataCaptor.capture());
+ WifiNetworkDetailsViewModel.HotspotNetworkData data = mHotspotNetworkDataCaptor.getValue();
+ assertThat(data.getNetworkType()).isEqualTo(NETWORK_TYPE_ETHERNET);
+ assertThat(data.getBatteryPercentage()).isEqualTo(50);
+ assertThat(data.isBatteryCharging()).isEqualTo(true);
+ }
+
+ @Test
+ public void getSecuritySummary_returnNotNull() {
+ assertThat(mViewModel.getHotspotNetworkData()).isNotNull();
+ }
+}