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

Commit e0eedf71 authored by Nick Pelly's avatar Nick Pelly
Browse files

Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS. 



ACTION_NFCSHARING_SETTINGS is a new ICS API that doesn't work until now.
It allows application to show UI to turn Android Beam on.

Add ACTION_NFC_SHARING - exposed in MR2.

Remove ANDROID_BEAM_SETTINGS, this was orphanned.

I wish we had renamed ACTION_NFCSHARING_SETTINGS to ACTION_NDEF_PUSH_SETTINGS,
but too late now. It's already released in SDK.

Bug: 5465097
Change-Id: I641b2efa39a3567cbd1c31587f3b67b1b0a0caa0

Signed-off-by: default avatarNick Pelly <npelly@google.com>
parent d9bf0d1a

AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
                <action android:name="android.intent.action.MAIN" />

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

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

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

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

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

            </intent-filter>
@@ -979,11 +980,11 @@ 
                android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

                <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.NdefPush" />

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

        </activity>



        <!-- Accessibility tutorial -->