Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9461ac87 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I3e386820da6d8f8fbd7630cd67c983ae4f684899
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16fd8987 6a04355c

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -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"/>

src/com/android/settings/wfd/WifiDisplaySettings.java

+3 −3
Original line number Diff line number Diff line
@@ -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);