OSDN Git Service

Fix for Images not appearing in camera folder after taking a picture
[android-x86/packages-apps-Gallery2.git] / AndroidManifest.xml
index a4c29ea..b57416d 100644 (file)
@@ -1,73 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest package="com.cooliris.media"
-    android:versionCode="30680"
-       android:versionName="1.1.30680"
-       xmlns:android="http://schemas.android.com/apk/res/android">
-       <application android:icon="@drawable/icon" android:label="@string/app_name"
-               android:debuggable="true">
-               <activity android:name=".Gallery" android:label="@string/app_name"
-                       android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                       android:configChanges="keyboardHidden|orientation"
-                       android:clearTaskOnLaunch="true" android:noHistory="false" android:stateNotNeeded="true">
-                       <intent-filter>
-                               <action android:name="android.intent.action.MAIN" />
-                               <category android:name="android.intent.category.LAUNCHER" />
-                       </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>
-                       <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>
+    android:versionCode="30682"
+    android:versionName="1.1.30682"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
+        android:debuggable="true">
+        <activity android:name=".Gallery" android:label="@string/app_name"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:configChanges="keyboardHidden|orientation"
+            android:clearTaskOnLaunch="true" android:noHistory="false" android:stateNotNeeded="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </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>
+            <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="image/*" />
-                       </intent-filter>
-               </activity>
-               <activity android:name="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="MovieView"
-                android:label="@string/movie_view_label"
-                android:screenOrientation="landscape"
-                android:configChanges="orientation|keyboardHidden"
-                android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
-             <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="image/*" />
+            </intent-filter>
+        </activity>
+        <activity android:name="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="MovieView"
+            android:label="@string/movie_view_label"
+            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:mimeType="video/3gpp2" />
              </intent-filter>
         </activity>
-               <activity android:name="Photographs" android:icon="@drawable/icon">
-                       <intent-filter android:label="@string/camera_setas_wallpaper">
-                               <action android:name="android.intent.action.ATTACH_DATA" />
-                               <data android:mimeType="image/*" />
-                               <category android:name="android.intent.category.DEFAULT" />
-                       </intent-filter>
-                       <intent-filter android:label="@string/app_name">
-                               <action android:name="android.intent.action.SET_WALLPAPER" />
-                               <category android:name="android.intent.category.DEFAULT" />
-                       </intent-filter>
-               </activity>
 
-               <provider android:label="Picasa Web Albums" android:name="com.cooliris.picasa.PicasaContentProvider"
-                       android:grantUriPermissions="true"
-                       android:syncable="true"
-                       android:authorities="com.cooliris.picasa.contentprovider">
-           </provider>
-               <service android:label="Picasa Sync Service" android:name="com.cooliris.picasa.PicasaService">
-                       <intent-filter>
-                               <action android:name="android.content.SyncAdapter" />
-                       </intent-filter>
-                       <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
-               </service>
-               
-               <service android:label="CacheService" android:name="com.cooliris.cache.CacheService">
-               </service>
-               <receiver android:label="BootReceiver" android:name="com.cooliris.cache.BootReceiver"
-                       android:enabled="true" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
-                       <intent-filter>
-                               <category android:name="android.intent.category.DEFAULT" />
-                               <action android:name="android.intent.action.BOOT_COMPLETE" />
-                       </intent-filter>
-                       <intent-filter>
+        <activity android:name="Photographs" android:icon="@drawable/icon">
+            <intent-filter android:label="@string/camera_setas_wallpaper">
+                <action android:name="android.intent.action.ATTACH_DATA" />
+                <data android:mimeType="image/*" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.SET_WALLPAPER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <provider android:label="Picasa Web Albums" android:name="com.cooliris.picasa.PicasaContentProvider"
+            android:grantUriPermissions="true"
+            android:syncable="true"
+            android:authorities="com.cooliris.picasa.contentprovider">
+        </provider>
+
+        <service android:label="Picasa Sync Service" android:name="com.cooliris.picasa.PicasaService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+            <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
+        </service>
+
+        <service android:label="CacheService" android:name="com.cooliris.cache.CacheService"/>
+
+        <receiver android:label="BootReceiver" android:name="com.cooliris.cache.BootReceiver"
+            android:enabled="true" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.BOOT_COMPLETE" />
+            </intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.MEDIA_SCANNER_FINISHED" />
                 <data android:scheme="file" />
             </intent-filter>
                 <action android:name="android.intent.action.MEDIA_MOUNTED" />
                 <data android:scheme="file" />
             </intent-filter>
-               </receiver>
-               <receiver android:name="PhotoAppWidgetProvider" android:label="@string/gadget_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_EJECT" />
+                <data android:scheme="file" />
+            </intent-filter>
+        </receiver>
+
+        <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
--->
+        <!-- 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" />
         <!-- We also allow direct binding where the caller provides a bitmap and
              appWidgetId to bind.  We require the permission because this changes our
              internal database without user confirmation.
--->
+        -->
         <activity android:name="PhotoAppWidgetBind" android:exported="true"
                 android:theme="@android:style/Theme.NoDisplay"
                 android:permission="android.permission.BIND_APPWIDGET" />
-       <receiver android:name="com.cooliris.picasa.PicasaReceiver"><intent-filter><action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED_ACTION"></action>
-</intent-filter>
-</receiver>
-</application>
-       <uses-sdk android:minSdkVersion="5" />
-       <uses-permission android:name="android.permission.SET_WALLPAPER" />
-       <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-       <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-       <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-       <uses-permission android:name="android.permission.INTERNET" />
-       <uses-permission android:name="android.permission.VIBRATE" />
-       <uses-permission android:name="android.permission.WAKE_LOCK" />
-       <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-       <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+
+        <receiver android:name="com.cooliris.picasa.PicasaReceiver">
+                <intent-filter>
+                    <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED_ACTION"/>
+                </intent-filter>
+        </receiver>
+    </application>
+
+    <uses-sdk android:minSdkVersion="5" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-       <supports-screens android:smallScreens="false"
-               android:normalScreens="true" android:largeScreens="true"
-               android:anyDensity="true" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
+    <supports-screens android:smallScreens="false"
+        android:normalScreens="true" android:largeScreens="true"
+        android:anyDensity="true" />
 
 </manifest>