diff options
author | Martin Hibdon <mah@android.com> | 2010-04-05 14:29:08 -0700 |
---|---|---|
committer | Martin Hibdon <mah@android.com> | 2010-04-22 10:14:19 -0700 |
commit | ed873c21cd8ad85df735ec841b147f5ac0f740a9 (patch) | |
tree | c523d58a60f7190729c522e56befe4099a669ac1 /AndroidManifest.xml | |
parent | 49f5bacd54ce3ae21f370935c71b571f5eedfff1 (diff) | |
download | VoiceDialer-ed873c21cd8ad85df735ec841b147f5ac0f740a9.tar.gz |
Make the BluetoothVoiceDialerActivity and VoiceDialerActivity into one activity
These had been separated into two activites while the BluetoothVoiceDialer
was being worked on, but it's a lot of duplicate code. Now there is a single
activity that can run in either bluetooth or non-bluetooth mode, depending
on how it is started.
The state transitions are slightly simpler when running in non-bluetooth
mode, because it does not use text to speech to inform the user about
what it is doing.
Change-Id: Iddf84108a84420917073fa18999d7394ca308400
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 77594dd..ab60c59 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,10 +23,6 @@ <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> - </activity> - - <activity android:name="BluetoothVoiceDialerActivity" - android:screenOrientation="portrait"> <intent-filter> <action android:name="android.intent.action.VOICE_COMMAND"/> <category android:name="android.intent.category.DEFAULT" /> |