Test

Android.mk

@@ -18,12 +18,22 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES += $(call all-java-files-under, libs/android-syntax-highlight/src)
+LOCAL_SRC_FILES += $(call all-java-files-under, libs/color-picker-view/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES += libtruezip
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES += juniversalchardet
 
 LOCAL_PACKAGE_NAME := CMFileManager
 LOCAL_CERTIFICATE := platform
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
 include $(BUILD_PACKAGE)
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+    juniversalchardet:libs/juniversalchardet/juniversalchardet-1.0.3.jar
 
+include $(BUILD_MULTI_PREBUILT)
 include $(call all-makefiles-under,$(LOCAL_PATH))

AndroidManifest.xml

@@ -16,27 +16,33 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.cyanogenmod.filemanager"
-  android:versionCode="101"
-  android:versionName="1.0.1">
+  android:versionCode="104"
+  android:versionName="3.0.0">
 
   <original-package android:name="com.cyanogenmod.filemanager" />
 
-  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" />
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_MEDIA_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="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
   <uses-permission android:name="com.cyanogenmod.filemanager.permissions.READ_THEME"/>
 
   <application
     android:name="FileManagerApplication"
     android:description="@string/app_description"
-    android:icon="@drawable/ic_launcher"
+    android:icon="@mipmap/ic_launcher_filemanager"
     android:label="@string/app_name"
     android:largeHeap="true"
-    android:theme="@style/FileManager.Theme.Holo.Light" >
+    android:theme="@style/FileManager.Theme.Material.Light"
+    android:supportsRtl="true">
 
     <meta-data
       android:name="android.app.default_searchable"
@@ -52,11 +58,30 @@
       android:authorities="com.cyanogenmod.filemanager.providers.bookmarks"
       android:exported="false" />
 
+    <provider
+      android:name=".providers.SecureResourceProvider"
+      android:authorities="com.cyanogenmod.filemanager.providers.resources"
+      android:grantUriPermissions="true"
+      android:exported="true" />
+
+    <provider
+      android:authorities="com.cyanogenmod.filemanager.providers.index"
+      android:name=".providers.MimeTypeIndexProvider"/>
+
+    <service
+      android:name=".service.MimeTypeIndexService"
+      android:label="@string/app_name">
+      <intent-filter>
+        <action android:name="com.cyanogenmod.filemanager.ACTION_START_INDEX"/>
+      </intent-filter>
+    </service>
+
     <activity
       android:name=".activities.NavigationActivity"
       android:label="@string/app_name"
       android:launchMode="singleTop"
       android:uiOptions="none"
+      android:theme="@style/FileManager.Theme.Material.Light.NoActionBar"
       android:windowSoftInputMode="adjustNothing"
       android:configChanges="orientation|keyboardHidden|screenSize"
       android:exported="true">
@@ -69,29 +94,21 @@
         <action android:name="android.intent.action.SEARCH" />
         <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" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:mimeType="resource/folder" />
+        <data android:scheme="file" />
+        <data android:scheme="folder" />
+        <data android:scheme="directory" />
+      </intent-filter>
       <meta-data
         android:name="android.app.searchable"
+        android:value=".activities.SearchActivity"
         android:resource="@xml/searchable" />
     </activity>
 
-    <activity
-      android:name=".activities.BookmarksActivity"
-      android:label="@string/bookmarks"
-      android:uiOptions="none"
-      android:windowSoftInputMode="adjustNothing"
-      android:configChanges="orientation|keyboardHidden|screenSize"
-      android:exported="false">
-    </activity>
-
-    <activity
-      android:name=".activities.HistoryActivity"
-      android:label="@string/history"
-      android:uiOptions="none"
-      android:configChanges="orientation|keyboardHidden|screenSize"
-      android:windowSoftInputMode="adjustNothing"
-      android:exported="false">
-    </activity>
-
     <activity
       android:name=".activities.SearchActivity"
       android:label="@string/search"
@@ -107,20 +124,31 @@
       android:label="@string/picker"
       android:uiOptions="none"
       android:configChanges="orientation|keyboardHidden|screenSize"
-      android:theme="@style/FileManager.Theme.Holo.Light.Overlay"
+      android:theme="@style/FileManager.Theme.Material.Light.Overlay"
       android:exported="true">
       <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="*/*" />
       </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>
+      <intent-filter>
+        <action android:name="com.android.fileexplorer.action.DIR_SEL" />
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
     </activity>
 
     <activity
       android:name=".activities.preferences.SettingsPreferences"
       android:label="@string/pref"
-      android:icon="@drawable/ic_launcher_settings"
       android:exported="false">
       <intent-filter>
          <category android:name="android.intent.category.PREFERENCE" />
@@ -131,7 +159,7 @@
       android:name=".activities.ShortcutActivity"
       android:label="@string/app_name"
       android:uiOptions="none"
-      android:theme="@style/FileManager.Theme.Holo.Light.Overlay"
+      android:theme="@style/FileManager.Theme.Material.Light.Overlay"
       android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -142,7 +170,7 @@
       android:name=".activities.ChangeLogActivity"
       android:label="@string/app_name"
       android:uiOptions="none"
-      android:theme="@style/FileManager.Theme.Holo.Light.Overlay"
+      android:theme="@style/FileManager.Theme.Material.Light.Overlay"
       android:exported="false">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -152,13 +180,15 @@
     <activity
       android:name=".activities.EditorActivity"
       android:label="@string/editor"
-      android:configChanges="orientation|keyboardHidden|screenSize"
-      android:icon="@drawable/ic_launcher_editor">
+      android:configChanges="orientation|keyboardHidden|screenSize">
       <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" />
 
+        <data android:scheme="content" />
         <data android:scheme="file" />
         <data android:mimeType="text/*" />
         <data android:mimeType="application/javascript" />
@@ -178,6 +208,25 @@
       </intent-filter>
     </activity>
 
+    <activity
+      android:name=".console.secure.SecureStorageKeyPromptDialog$SecureStorageKeyPromptActivity"
+      android:label="@string/app_name"
+      android:uiOptions="none"
+      android:configChanges="orientation|keyboardHidden|screenSize"
+      android:theme="@android:style/Theme.Material.Light.Dialog"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+      </intent-filter>
+    </activity>
+    <service android:name=".providers.secure.SecureCacheCleanupService">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED" />
+        <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+        <action android:name="com.cyanogenmod.filemanager.ACTION_START_CLEANUP"/>
+      </intent-filter>
+    </service>
+
   </application>
 
 </manifest>

CHANGELOG.md

@@ -1,6 +1,15 @@
 CyanogenMod File Manager
 ========================
 
+Version 2.0.0
+-------------
+* Secure storage support
+* Print support
+
+Version 1.0.2
+-------------
+* Drawer navigation support (by Florian Edelmann)
+
 Version 1.0.1
 -------------
 * NFC support