Merge "CMFM: User-defined date/time format" into cm-10.1

[android-x86/packages-apps-CMFileManager.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 20cbb9e..21ae47e 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,33 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- ** Copyright (C) 2012 The CyanogenMod Project
- **
- ** Licensed under the Apache License, Version 2.0 (the "License");
- ** you may not use this file except in compliance with the License.
- ** You may obtain a copy of the License at
- **
- **      http://www.apache.org/licenses/LICENSE-2.0
- **
- ** Unless required by applicable law or agreed to in writing, software
- ** distributed under the License is distributed on an "AS IS" BASIS,
- ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ** See the License for the specific language governing permissions and
- ** limitations under the License.
--->
+<!-- Copyright (C) 2012 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.cyanogenmod.filemanager"
-  android:versionCode="100"
-  android:versionName="1.0.0">
+  android:versionCode="101"
+  android:versionName="1.0.1">
 
   <original-package android:name="com.cyanogenmod.filemanager" />
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
+  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" />
 
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
   <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
-  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+  <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
   <uses-permission android:name="android.permission.NFC"/>
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+  <uses-permission android:name="com.cyanogenmod.filemanager.permissions.READ_THEME"/>
 
   <application
     android:name="FileManagerApplication"
@@ -114,6 +116,14 @@
         <category android:name="android.intent.category.DEFAULT" />
         <data android:mimeType="*/*" />
       </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.PICK" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="file" />
+        <data android:scheme="folder" />
+        <data android:scheme="directory" />
+      </intent-filter>
     </activity>
 
     <activity
@@ -152,15 +162,43 @@
       android:name=".activities.EditorActivity"
       android:label="@string/editor"
       android:configChanges="orientation|keyboardHidden|screenSize"
-      android:icon="@drawable/ic_launcher_editor"
-      android:exported="false">
+      android:icon="@drawable/ic_launcher_editor">
       <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
         <action android:name="android.intent.action.EDIT" />
+        <category android:name="android.intent.category.DEFAULT" />
+
+        <data android:scheme="file" />
+        <data android:mimeType="text/*" />
+        <data android:mimeType="application/javascript" />
+        <data android:mimeType="application/json" />
+        <data android:mimeType="application/xhtml+xml" />
+        <data android:mimeType="application/xml" />
+        <data android:mimeType="application/x-msdownload" />
+        <data android:mimeType="application/x-csh" />
+        <data android:mimeType="application/x-sh" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <action android:name="android.intent.action.EDIT" />
+        <category android:name="android.intent.category.DEFAULT" />
         <category android:name="com.cyanogenmod.filemanager.category.INTERNAL_VIEWER" />
         <category android:name="com.cyanogenmod.filemanager.category.EDITOR" />
       </intent-filter>
     </activity>
 
+    <activity
+      android:name=".themes.ThemeActivity"
+      android:label="@string/app_name"
+      android:permission="com.cyanogenmod.filemanager.permissions.READ_THEME"
+      android:icon="@drawable/ic_theme_launcher"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="com.cyanogenmod.filemanager.actions.MAIN_THEME" />
+        <category android:name="com.cyanogenmod.filemanager.categories.THEME" />
+      </intent-filter>
+    </activity>
+
   </application>
 
 </manifest>