Rename NetworkMainState to NetworkState.
Test: tested locally with two-panel flavor. Do not affect production.
Change-Id: If79a601d83a4f39f2160e626438a538f3848ec05
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkFragmentCompat.java b/Settings/src/com/android/tv/settings/connectivity/NetworkFragmentCompat.java
index 17634fa..4627576 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkFragmentCompat.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkFragmentCompat.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.connectivity;
import static com.android.tv.settings.library.ManagerUtil.INFO_COLLAPSE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_NETWORK_MAIN;
+import static com.android.tv.settings.library.ManagerUtil.STATE_NETWORK;
import android.content.Intent;
import android.os.Bundle;
@@ -91,6 +91,6 @@
@Override
public int getStateIdentifier() {
- return STATE_NETWORK_MAIN;
+ return STATE_NETWORK;
}
}
diff --git a/SettingsAPI/api/system-current.txt b/SettingsAPI/api/system-current.txt
index 550380c..38ac209 100644
--- a/SettingsAPI/api/system-current.txt
+++ b/SettingsAPI/api/system-current.txt
@@ -20,7 +20,7 @@
field public static final int STATE_DEVICE_MAIN = 2; // 0x2
field public static final int STATE_EXTERNAL_SOURCES = 14; // 0xe
field public static final int STATE_HIGH_POWER = 7; // 0x7
- field public static final int STATE_NETWORK_MAIN = 0; // 0x0
+ field public static final int STATE_NETWORK = 0; // 0x0
field public static final int STATE_NOTIFICATION_ACCESS = 8; // 0x8
field public static final int STATE_PICTURE_IN_PICTURE = 12; // 0xc
field public static final int STATE_SPECIAL_ACCESS = 6; // 0x6
diff --git a/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java b/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java
index 019ee42..ecea3cd 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java
@@ -28,7 +28,7 @@
@SystemApi
public final class ManagerUtil {
public static final int OFFSET_MULTIPLIER = 100000;
- public static final int STATE_NETWORK_MAIN = 0;
+ public static final int STATE_NETWORK = 0;
public static final int STATE_WIFI_DETAILS = 1;
public static final int STATE_DEVICE_MAIN = 2;
public static final int STATE_APPS = 3;
diff --git a/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java b/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java
index a0f917b..4ba3ecc 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java
@@ -22,7 +22,7 @@
import static com.android.tv.settings.library.ManagerUtil.STATE_APP_MANAGEMENT;
import static com.android.tv.settings.library.ManagerUtil.STATE_APP_USAGE_ACCESS;
import static com.android.tv.settings.library.ManagerUtil.STATE_HIGH_POWER;
-import static com.android.tv.settings.library.ManagerUtil.STATE_NETWORK_MAIN;
+import static com.android.tv.settings.library.ManagerUtil.STATE_NETWORK;
import static com.android.tv.settings.library.ManagerUtil.STATE_NOTIFICATION_ACCESS;
import static com.android.tv.settings.library.ManagerUtil.STATE_PICTURE_IN_PICTURE;
import static com.android.tv.settings.library.ManagerUtil.STATE_SPECIAL_ACCESS;
@@ -46,7 +46,7 @@
import com.android.tv.settings.library.device.apps.specialaccess.SpecialAppAccessState;
import com.android.tv.settings.library.device.apps.specialaccess.SystemAlertWindowState;
import com.android.tv.settings.library.device.apps.specialaccess.WriteSettingsState;
-import com.android.tv.settings.library.network.NetworkMainState;
+import com.android.tv.settings.library.network.NetworkState;
import com.android.tv.settings.library.network.WifiDetailsState;
import com.android.tv.settings.library.system.DateTimeState;
@@ -59,8 +59,8 @@
Context context, int stateIdentifier, UIUpdateCallback uiUpdateCallback) {
State state = null;
switch (stateIdentifier) {
- case STATE_NETWORK_MAIN:
- state = new NetworkMainState(context, uiUpdateCallback);
+ case STATE_NETWORK:
+ state = new NetworkState(context, uiUpdateCallback);
break;
case STATE_WIFI_DETAILS:
state = new WifiDetailsState(context, uiUpdateCallback);
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/NetworkMainState.java b/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
similarity index 97%
rename from SettingsAPI/java/com/android/tv/settings/library/network/NetworkMainState.java
rename to SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
index 159a1dd..4d4f2c7 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/NetworkMainState.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
@@ -41,7 +41,7 @@
import java.util.List;
/** State to provide data for rendering NetworkFragment. */
-public class NetworkMainState implements State, AccessPoint.AccessPointListener,
+public class NetworkState implements State, AccessPoint.AccessPointListener,
ConnectivityListener.WifiNetworkListener, ConnectivityListener.Listener {
private static final String TAG = "NetworkMainState";
private static final boolean DEBUG = true;
@@ -88,7 +88,7 @@
}
};
- public NetworkMainState(Context context, UIUpdateCallback callback) {
+ public NetworkState(Context context, UIUpdateCallback callback) {
mUIUpdateCallback = callback;
mContext = context;
}
@@ -162,8 +162,8 @@
}
private void updateWifiList() {
- if (!mNetworkModule.isWifiHardwarePresent() ||
- !mNetworkModule.getConnectivityListener().isWifiEnabledOrEnabling()) {
+ if (!mNetworkModule.isWifiHardwarePresent()
+ || !mNetworkModule.getConnectivityListener().isWifiEnabledOrEnabling()) {
mNoWifiUpdateBeforeMillis = 0;
return;
}
@@ -345,7 +345,7 @@
@Override
public int getStateIdentifier() {
- return ManagerUtil.STATE_NETWORK_MAIN;
+ return ManagerUtil.STATE_NETWORK;
}
private boolean isCaptivePortal(AccessPoint accessPoint) {
