Merge "Add config value to switch between Tether Settings UIs."

src/com/android/settings/wifi/tether/WifiTetherSettings.java

@@ -257,6 +257,12 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
                     return keys;
                 }
 
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return !context.getResources().getBoolean(
+                            R.bool.config_show_all_in_one_tether_settings);
+                }
+
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
                         Context context) {