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

Commit 3510cd0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f1 

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



Change-Id: I259e0d59f346e5e99e34453405fa5c4cc622c92a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccdd06e4 e8df63f1

AndroidManifest.xml

+0 −17
Original line number Diff line number Diff line
@@ -3017,23 +3017,6 @@ 
            </intent-filter>

        </activity>



        <!-- NFC settings -->

        <activity

            android:name="Settings$AndroidBeamSettingsActivity"

            android:exported="true"

            android:label="@string/android_beam_settings_title">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NFCSHARING_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.nfc.AndroidBeam" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_connected_devices"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name="Settings$WifiDisplaySettingsActivity"

            android:label="@string/wifi_display_settings_title"

res/xml/connected_devices_advanced.xml

+0 −8
Original line number Diff line number Diff line
@@ -46,14 +46,6 @@ 
        settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"

        settings:keywords="@string/keywords_wifi_display_settings"/>



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.nfc.AndroidBeam"

        android:key="android_beam_settings"

        android:title="@string/android_beam_settings_title"

        settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"

        android:icon="@drawable/ic_android"

        android:order="-5"/>



    <com.android.settingslib.RestrictedPreference

        android:key="connected_device_printing"

        android:title="@string/print_settings"

src/com/android/settings/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ public class Settings extends SettingsActivity { 
    public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }

    public static class SavedAccessPointsSettingsActivity extends SettingsActivity { /* empty */ }

    public static class TextToSpeechSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AndroidBeamSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiDisplaySettingsActivity extends SettingsActivity { /* empty */ }

    public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }

    /** Activity to manage communal settings */

src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java

+0 −13
Original line number Diff line number Diff line
@@ -17,12 +17,10 @@ package com.android.settings.connecteddevice; 


import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.pm.PackageManager;

import android.provider.SearchIndexableResource;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.nfc.AndroidBeamPreferenceController;

import com.android.settings.print.PrintSettingPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.uwb.UwbPreferenceController;
@@ -111,17 +109,6 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment 
                    return Arrays.asList(sir);

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> keys = super.getNonIndexableKeys(context);

                    PackageManager pm = context.getPackageManager();

                    if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {

                        keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);

                    }



                    return keys;

                }



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −2
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ import com.android.settings.network.apn.ApnSettings; 
import com.android.settings.network.telephony.MobileNetworkSettings;

import com.android.settings.network.telephony.NetworkSelectSettings;

import com.android.settings.network.tether.TetherSettings;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;

import com.android.settings.notification.ConfigureNotificationSettings;

import com.android.settings.notification.NotificationAccessSettings;
@@ -258,7 +257,6 @@ public class SettingsGateway { 
            PrivateVolumeForget.class.getName(),

            PublicVolumeSettings.class.getName(),

            DevelopmentSettingsDashboardFragment.class.getName(),

            AndroidBeam.class.getName(),

            WifiDisplaySettings.class.getName(),

            PowerUsageSummary.class.getName(),

            AccountSyncSettings.class.getName(),