diff --git a/res/values/config.xml b/res/values/config.xml index f50e918cc18..7af29c84a6b 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -761,6 +761,9 @@ + + true + diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 96f067c2fed..2ec69c43016 100644 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -140,7 +140,6 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null); addPreferencesFromResource(R.xml.wifi_display_settings); - setHasOptionsMenu(true); } @Override @@ -197,8 +196,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);