From f037273000e25360e295c4792542c6930c4f023e Mon Sep 17 00:00:00 2001
From: Swan Wang <swandle@gmail.com>
Date: Sat, 6 Feb 2010 17:46:07 +0800
Subject: [PATCH] make music player ok and make preview size 352*288

---
 AndroidManifest.xml         | 116 ++++++++++++++++++++++++++++++++++++++++++++
 res/layout/camera.xml       |  13 ++---
 res/layout/video_camera.xml |   9 ++--
 3 files changed, 128 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index efbaa3d..45b8184 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -10,6 +10,10 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <!-- Needed by the ZoomRingController to set the bit saying we've already shown the
+         tutorial toast. -->
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <uses-permission android:name="android.permission.READ_SMS" />
 
     <application android:icon="@drawable/ic_launcher_camera"
@@ -50,6 +54,11 @@
                 android:clearTaskOnLaunch="true"
                 android:taskAffinity="android.task.camcorder">
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
                 <action android:name="android.media.action.VIDEO_CAMERA" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -63,15 +72,65 @@
                 android:icon="@drawable/ic_launcher_gallery"
                 android:clearTaskOnLaunch="true"
                 android:taskAffinity="android.task.pictures">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity android:name="ImageGallery" android:label="@string/gallery_label"
                 android:configChanges="orientation|keyboardHidden"
                 android:icon="@drawable/ic_launcher_gallery">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/video" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+            </intent-filter>
         </activity>
+
         <activity android:name="CropImage"
                 android:process=":CropImage"
                 android:configChanges="orientation|keyboardHidden"
                 android:label="@string/crop_label">
+            <intent-filter android:label="@string/crop_label">
+                <action android:name="com.android.camera.action.CROP" />
+                <data android:mimeType="image/*" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.ALTERNATIVE" />
+                <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
+            </intent-filter>
         </activity>
         <activity android:name="ReviewImage"
                 android:label="@string/view_label"
@@ -84,33 +143,90 @@
                 android:label="@string/view_label"
                 android:screenOrientation="behind"
                 android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
         <activity android:name="MovieView"
                 android:label="@string/movieviewlabel"
                 android:screenOrientation="landscape"
                 android:configChanges="orientation|keyboardHidden"
                 android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="rtsp" />
+             </intent-filter>
+             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="application/sdp" />
+             </intent-filter>
+             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:mimeType="video/mp4" />
+                <data android:mimeType="video/3gp" />
+                <data android:mimeType="video/3gpp" />
+                <data android:mimeType="video/3gpp2" />
+             </intent-filter>
         </activity>
         <activity android:name=".DeleteImage"
                 android:label="@string/delete_images_message"
                 android:theme="@style/Theme.DeleteImageDialog">
         </activity>
 
+        <activity android:name="CameraSettings" android:label="@string/preferences_label">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="GallerySettings" android:label="@string/preferences_label">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".Wallpaper"
                 android:label="@string/camera_setas_wallpaper"
                 android:icon="@drawable/ic_launcher_gallery">
+            <intent-filter>
+                <action android:name="android.intent.action.ATTACH_DATA" />
+                <data android:mimeType="image/*" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".PickWallpaper"
                 android:label="@string/camera_pick_wallpaper"
                 android:icon="@drawable/ic_launcher_gallery">
+            <intent-filter>
+                <action android:name="android.intent.action.SET_WALLPAPER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
+        <receiver android:name="PhotoAppWidgetProvider" android:label="@string/gadget_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
+        </receiver>
+
         <!-- We configure a widget by asking to pick a photo, then crop it, and store the config internally -->
         <activity android:name="PhotoAppWidgetConfigure">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
         </activity>
 
         <!-- We also allow direct binding where the caller provides a bitmap and
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 199208f..489a24f 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -30,16 +30,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
         <FrameLayout android:id="@+id/frame"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:background="@drawable/border_view_finder">
             <SurfaceView android:id="@+id/camera_preview"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"/>
+                    android:layout_width="352dp"
+                    android:layout_height="288dp"/>
             <com.android.camera.FocusRectangle
                     android:id="@+id/focus_rectangle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"/>
+                    android:layout_width="352dp"
+                    android:layout_height="288dp"/>
             <LinearLayout android:id="@+id/indicator_bar"
                     android:orientation="vertical"
                     android:visibility="visible"
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index b6717d8..79b3545 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -30,12 +30,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
         <FrameLayout android:id="@+id/frame"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:background="@drawable/border_view_finder">
             <SurfaceView android:id="@+id/camera_preview"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"/>
+                    android:layout_width="352dp"
+                    android:layout_height="288dp"/>
             <ImageView android:id="@+id/video_frame"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
-- 
2.11.0