diff options
| author | SongFerng Wang <songferngwang@google.com> | 2023-11-14 04:52:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-14 04:52:43 +0000 |
| commit | 6a04355cb3888f7d6316db8b485ffe5e4cc972f0 (patch) | |
| tree | 7c17071f36e8c8294e0308c05cc86155d2368daf | |
| parent | 485e8800ed2c64e6db431796f20777404021a038 (diff) | |
| parent | 0d0736c46c055dd604bae3e29c1bbe5dd837aad4 (diff) | |
| download | Settings-6a04355cb3888f7d6316db8b485ffe5e4cc972f0.tar.gz | |
Merge "Add a config to hide "Enable wireless display" menu" into main
| -rwxr-xr-x | res/values/config.xml | 3 | ||||
| -rwxr-xr-x | src/com/android/settings/wfd/WifiDisplaySettings.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 2c683ea342f..b4087dfa8f7 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -726,6 +726,9 @@ <item></item> </string-array> + <!-- Whether to display the "Enable wireless display" menu --> + <bool name="config_show_wifi_display_enable_menu">true</bool> + <!-- List of packages that should be hidden for MVNO. Do not translate --> <string-array name="datausage_hiding_carrier_service_package_names" translatable="false"/> diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 8562e5fd68b..cb515e31437 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -139,7 +139,6 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null); addPreferencesFromResource(R.xml.wifi_display_settings); - setHasOptionsMenu(true); } @Override @@ -196,8 +195,9 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - if (mWifiDisplayStatus != null && mWifiDisplayStatus.getFeatureState() - != WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) { + if (getResources().getBoolean(R.bool.config_show_wifi_display_enable_menu) + && mWifiDisplayStatus != null && mWifiDisplayStatus.getFeatureState() + != WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) { MenuItem item = menu.add(Menu.NONE, MENU_ID_ENABLE_WIFI_DISPLAY, 0, R.string.wifi_display_enable_menu_item); item.setCheckable(true); |