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

Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I3e386820da6d8f8fbd7630cd67c983ae4f684899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2023-11-14 05:23:27 +00:00
committed by Automerger Merge Worker
parent 16fd898705 6a04355cb3
commit 9461ac87e8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -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"/>

4
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -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,7 +195,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (mWifiDisplayStatus != null && mWifiDisplayStatus.getFeatureState()
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);