diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 28165a7..493d7f4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -171,7 +171,7 @@ <activity android:name=".wifi.WifiSetupActivity" android:uiOptions="splitActionBarWhenNarrow" - android:theme="@style/setup_wizard_theme" + android:theme="@style/SetupWizardWifiTheme" android:label="@string/wifi_setup_wizard_title" android:icon="@drawable/empty_icon" android:clearTaskOnLaunch="true"> @@ -1625,9 +1625,14 @@ android:excludeFromRecents="true" android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert"> <intent-filter> + <!-- TODO this filter can be removed --> <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <intent-filter> + <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> <activity android:name="Settings$NotificationAccessSettingsActivity" @@ -1667,7 +1672,7 @@ <action android:name="android.net.wifi.WIFI_STATE_CHANGED" /> <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" /> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> - <action android:name="android.location.PROVIDERS_CHANGED" /> + <action android:name="android.location.MODE_CHANGED" /> <action android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" /> |