am 96bfc861: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev

* commit '96bfc86185fe14a52f676d0d0e90dffc61f0f52d':
  Remove intent filter for Airplane mode voice activity.
This commit is contained in:
Barnaby James
2014-09-05 20:21:48 +00:00
committed by Android Git Automerger

View File

@@ -138,18 +138,6 @@
android:value="true" />
</activity>
<activity android:name="AirplaneModeVoiceActivity"
android:label="@string/wireless_networks_settings_title"
android:theme="@android:style/Theme.Material.Light.Voice"
android:exported="true"
android:taskAffinity="">
<intent-filter>
<action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE" />
</intent-filter>
</activity>
<!-- Top-level settings -->
<activity android:name="Settings$WifiSettingsActivity"