Merge "Do not handle category collapse in SettingAPI."

5 files changed, 5 insertions, 30 deletions

diff --git a/SettingsAPI/api/system-current.txt b/SettingsAPI/api/system-current.txt
index d2d1ee9c2..494d1abcb 100644
--- a/SettingsAPI/api/system-current.txt
+++ b/SettingsAPI/api/system-current.txt
@@ -7,7 +7,6 @@ package com.android.tv.settings.library {
     method public static int getStateIdentifier(int);
     method public static boolean isChecked(com.android.tv.settings.library.PreferenceCompat);
     method public static boolean isVisible(com.android.tv.settings.library.PreferenceCompat);
-    field public static final String INFO_COLLAPSE = "collapse";
     field public static final String INFO_CURRENT_FONT_SCALE_VALUE = "current_font_scale_value";
     field public static final String INFO_INTENT = "intent";
     field public static final String INFO_PREVIEW_FONT_SCALE_VALUE = "preview_font_scale_value";
@@ -135,8 +134,7 @@ package com.android.tv.settings.library {
     field public static final byte TYPE_PREFERENCE = 0; // 0x0
     field public static final byte TYPE_PREFERENCE_ACCESS_POINT = 2; // 0x2
     field public static final byte TYPE_PREFERENCE_CATEGORY = 1; // 0x1
-    field public static final byte TYPE_PREFERENCE_COLLAPSE_CATEGORY = 7; // 0x7
-    field public static final byte TYPE_PREFERENCE_WIFI_COLLAPSE_CATEGORY = 3; // 0x3
+    field public static final byte TYPE_PREFERENCE_COLLAPSE_CATEGORY = 3; // 0x3
     field public static final byte TYPE_RADIO = 6; // 0x6
     field public static final byte TYPE_SWITCH = 5; // 0x5
   }
diff --git a/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java b/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java
index 7761dbdc2..22cec87a0 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/ManagerUtil.java
@@ -73,7 +73,6 @@ public final class ManagerUtil {
     public static final String KEY_KEYBOARD_SETTINGS = "autofillSettings";
     public static final String INFO_INTENT = "intent";
     public static final String INFO_WIFI_SIGNAL_LEVEL = "wifi_signal_level";
-    public static final String INFO_COLLAPSE = "collapse";
     /** Argument key containing the current font scale value. */
     public static final String INFO_CURRENT_FONT_SCALE_VALUE = "current_font_scale_value";
     /** Argument key containing the font scale value this fragment will preview. */
diff --git a/SettingsAPI/java/com/android/tv/settings/library/PreferenceCompat.java b/SettingsAPI/java/com/android/tv/settings/library/PreferenceCompat.java
index df8b92ea9..dccd850d9 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/PreferenceCompat.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/PreferenceCompat.java
@@ -35,11 +35,10 @@ public class PreferenceCompat {
     public static final byte TYPE_PREFERENCE = 0;
     public static final byte TYPE_PREFERENCE_CATEGORY = 1;
     public static final byte TYPE_PREFERENCE_ACCESS_POINT = 2;
-    public static final byte TYPE_PREFERENCE_WIFI_COLLAPSE_CATEGORY = 3;
+    public static final byte TYPE_PREFERENCE_COLLAPSE_CATEGORY = 3;
     public static final byte TYPE_LIST = 4;
     public static final byte TYPE_SWITCH = 5;
     public static final byte TYPE_RADIO = 6;
-    public static final byte TYPE_PREFERENCE_COLLAPSE_CATEGORY = 7;
 
     public static final byte STATUS_UNASSIGNED = 0;
     public static final byte STATUS_OFF = 1;
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java b/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
index 02e0c3614..42aa3a821 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/NetworkState.java
@@ -16,8 +16,6 @@
 
 package com.android.tv.settings.library.network;
 
-import static com.android.tv.settings.library.ManagerUtil.INFO_COLLAPSE;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ -68,7 +66,6 @@ public class NetworkState extends PreferenceControllerState implements
     private static final int INITIAL_UPDATE_DELAY = 500;
 
     private PreferenceCompat mEnableWifiPref;
-    private PreferenceCompat mCollapsePref;
     private PreferenceCompat mAddPref;
     private PreferenceCompat mEthernetCategory;
     private PreferenceCompat mEthernetStatusPref;
@@ -109,14 +106,12 @@ public class NetworkState extends PreferenceControllerState implements
         mPreferenceCompatManager = new PreferenceCompatManager();
         mEnableWifiPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_WIFI_ENABLE);
         mAlwaysScan = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_WIFI_ALWAYS_SCAN);
-        mCollapsePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_WIFI_COLLAPSE);
-        mCollapsePref.addInfo(INFO_COLLAPSE, true);
         mAddPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_WIFI_ADD);
         mEthernetCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_ETHERNET);
         mEthernetStatusPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_ETHERNET_STATUS);
         mEthernetProxyPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_ETHERNET_PROXY);
         mWifiNetworkCategoryPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_WIFI_LIST);
-        mWifiNetworkCategoryPref.setType(PreferenceCompat.TYPE_PREFERENCE_WIFI_COLLAPSE_CATEGORY);
+        mWifiNetworkCategoryPref.setType(PreferenceCompat.TYPE_PREFERENCE_COLLAPSE_CATEGORY);
         mDataSaverSlicePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DATA_SAVER_SLICE);
         mDataAlertSlicePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DATA_ALERT_SLICE);
         mNetworkDiagnosticsPref = mPreferenceCompatManager.getOrCreatePrefCompat(
@@ -212,18 +207,6 @@ public class NetworkState extends PreferenceControllerState implements
                 mNetworkModule.getConnectivityListener().setWifiEnabled(status);
                 mEnableWifiPref.setChecked(status);
                 break;
-            case KEY_WIFI_COLLAPSE:
-                Object collapse = mCollapsePref.getInfo(INFO_COLLAPSE);
-                if (collapse instanceof Boolean) {
-                    mWifiNetworkCategoryPref.addInfo(
-                            ManagerUtil.INFO_COLLAPSE, !(boolean) collapse);
-                    mCollapsePref.addInfo(ManagerUtil.INFO_COLLAPSE, !(boolean) collapse);
-                    if (mUIUpdateCallback != null) {
-                        mUIUpdateCallback.notifyUpdate(getStateIdentifier(),
-                                mWifiNetworkCategoryPref);
-                    }
-                }
-                break;
             case KEY_WIFI_ALWAYS_SCAN:
                 mAlwaysScan.setChecked(status);
                 Settings.Global.putInt(mContext.getContentResolver(),
@@ -260,13 +243,9 @@ public class NetworkState extends PreferenceControllerState implements
         mWifiNetworkCategoryPref.setVisible(wifiEnabled);
         preferenceCompats.add(mWifiNetworkCategoryPref);
 
-        mCollapsePref.setVisible(wifiEnabled);
-        preferenceCompats.add(mCollapsePref);
-
         mAddPref.setVisible(wifiEnabled);
         preferenceCompats.add(mAddPref);
 
-
         if (!wifiEnabled) {
             updateWifiList();
         }
diff --git a/SettingsAPI/java/com/android/tv/settings/library/privacy/SensorState.java b/SettingsAPI/java/com/android/tv/settings/library/privacy/SensorState.java
index 51fed81f6..dfeeb85d6 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/privacy/SensorState.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/privacy/SensorState.java
@@ -124,7 +124,7 @@ public class SensorState extends PreferenceControllerState {
         mRecentAppsCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_RECENT_REQUESTS);
         mRecentAppsCategory.setTitle(
                 ResourcesUtil.getString(mContext, "recently_accessed_by_category"));
-
+        mRecentAppsCategory.clearChildPrefCompats();
         // Get recent accesses.
         List<RecentlyAccessedByUtils.App> recentApps = RecentlyAccessedByUtils.getAppList(
                 mContext, mToggle.appOps);
@@ -143,7 +143,7 @@ public class SensorState extends PreferenceControllerState {
             mRecentAppsCategory.addChildPrefCompat(pref);
         }
 
-        if (recentApps.size() == 0) {
+        if (mRecentAppsCategory.getChildPrefsCount() == 0) {
             PreferenceCompat banner = mPreferenceCompatManager.getOrCreatePrefCompat(
                     new String[]{KEY_RECENT_REQUESTS, KEY_NO_RECENT});
             banner.setSummary(ResourcesUtil.getString(mContext, "no_recent_sensor_accesses"));