Merge "Don't override expand count when page is opened from search"

src/com/android/settings/DeviceInfoSettings.java

@@ -83,8 +83,14 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
+        final Bundle arguments = getArguments();
         if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) || true) {
+            // Do not override initial expand children count if we come from
+            // search (EXTRA_FRAGMENT_ARG_KEY is set) - we need to display every if entry point
+            // is search.
+            if (arguments == null
+                    || !arguments.containsKey(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY)) {
+
                 // Increase the number of children when the device contains more than 1 sim.
                 final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(
                         Context.TELEPHONY_SERVICE);
@@ -94,6 +100,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
                 getPreferenceScreen().setInitialExpandedChildrenCount(numberOfChildren);
             }
         }
+    }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {

tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java

@@ -18,6 +18,7 @@ package com.android.settings;
 
 import static com.android.settings.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
 import static com.android.settings.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
+import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
@@ -28,6 +29,7 @@ import static org.mockito.Mockito.verify;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.SystemProperties;
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.TelephonyManager;
@@ -118,6 +120,19 @@ public class DeviceInfoSettingsTest {
         assertThat(keys).containsAllIn(niks);
     }
 
+    @Test
+    @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
+            SettingsShadowSystemProperties.class})
+    public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
+        final Bundle args = new Bundle();
+        args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
+        mSettings.setArguments(args);
+
+        mSettings.onCreate(null /* icicle */);
+
+        verify(mScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+    }
+
     @Test
     @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
             SettingsShadowSystemProperties.class})