PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Wifi & Bluetooth slice can't show on search result

Browse Source 
root cause: we remove wifi & bluetooth preference screen key from search
indexing, this cause these 2 special slices can't map to correct key

solution: rename preference key for mapping

Bug: 149366072
Test: robotest & manual
Change-Id: Id424e63c4f97ccd6f58a80aaa414807774159512
This commit is contained in:
Edgar Wang
2020-02-12 16:56:39 +08:00
parent 8163bc5630
commit 7312defa4a
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/connected_devices_advanced.xml
View File

@@ -21,7 +21,7 @@
<Preference
android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment"
android:key="bluetooth_settings"
android:key="bluetooth_switchbar_screen"
android:title="@string/bluetooth_settings_title"
android:icon="@*android:drawable/ic_settings_bluetooth"
android:order="-9"/>

2
res/xml/network_and_internet.xml
View File

@@ -30,7 +30,7 @@
<com.android.settings.widget.MasterSwitchPreference
android:fragment="com.android.settings.wifi.WifiSettings"
android:key="toggle_wifi"
android:key="main_toggle_wifi"
android:title="@string/wifi_settings"
android:summary="@string/summary_placeholder"
android:icon="@drawable/ic_settings_wireless"

8
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -150,13 +150,5 @@ public class NetworkDashboardFragment extends DashboardFragment implements
null /* metricsFeatureProvider */, null /* fragment */,
null /* mobilePlanHost */);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
// Remove master switch as a result
keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
return keys;
}
};
}

2
src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
View File

@@ -36,7 +36,7 @@ public class WifiMasterSwitchPreferenceController extends AbstractPreferenceCont
implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
public static final String KEY_TOGGLE_WIFI = "toggle_wifi";
public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi";
private MasterSwitchPreference mWifiPreference;
private WifiEnabler mWifiEnabler;