commit 9b12d9fe96aa6381ff11348549e699db6f18d35e
author Mangesh Ghiware <mghiware@google.com> Fri Sep 14 12:17:54 2012 -0700
committer Mangesh Ghiware <mghiware@google.com> Fri Sep 14 12:17:54 2012 -0700
tree d6c23661a79bf1ea58bf1d25964a4c2e2baddc79
parent a03ff6f3fad765def142825d70722922f34d6a5e

Handle image capture intent using new camera UI.

Bug: 7166362
Change-Id: I253230342803c12d25025378ef80ba3ef96a1233

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4a727b2..cc99215 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -267,10 +267,6 @@
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
-            <intent-filter>
-                <action android:name="android.media.action.IMAGE_CAPTURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
 
         <!-- New camera doesn't support the CAPTURE intents yet. -->
@@ -283,6 +279,10 @@
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
+                <action android:name="android.media.action.IMAGE_CAPTURE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>