diff options
author | Bruno Kremp <bruno.kremp@sony.com> | 2023-07-03 10:44:11 +0200 |
---|---|---|
committer | Bruno Kremp <bruno.kremp@sony.com> | 2023-11-10 10:43:40 +0100 |
commit | 0d0736c46c055dd604bae3e29c1bbe5dd837aad4 (patch) | |
tree | 881ee2265ab21b93267123a3721939d9a05c74ca | |
parent | a23320eeddc1d8a862f23d53f01ce6f653a2607f (diff) | |
download | Settings-0d0736c46c055dd604bae3e29c1bbe5dd837aad4.tar.gz |
Add a config to hide "Enable wireless display" menu
Add config_show_wifi_display_enable_menu to control whether to
display "Enable wireless display" menu at Settings->
Connection preference->Cast.
If persist.debug.wfd.enable is 1, "Enable wireless display" menu will be
shown at Settings->Connection preference->Cast. Add a config to hide the
menu when needed.
setHasOptionsMenu is invoked in onActivityCreated of the parent class of
WifiDisplaySettings. No need to invoke it in onCreate.
Co-authored-by: Jingqiu Zhao <jingqiu.zhao@sony.com>
Test: manual test
Bug: 289532978
Change-Id: I146fb8188e783fed98d9fe56050e384bc4cca052
-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); |