Skip to content

Commit 0c8dcf5

Browse files
BrandoCommandoBrandoCommando
committed
Merge pull request #116 from BrandoCommando/dev
v254
2 parents b6faeaa + 955434b commit 0c8dcf5

File tree

154 files changed

+11797
-3448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+11797
-3448
lines changed

‎.classpath‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4-
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
3+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="src" path="gen"/>
7+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
78
<classpathentry kind="output" path="bin/classes"/>
89
</classpath>

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ lint.xml
1212
.checkstyle
1313

1414
#IntelliJ IDEA
15-
.idea
16-
*.iml
1715
*.ipr
1816
*.iws
1917
classes

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
path = ActionBarSherlock
33
url = [email protected]:BrandroidTools/ActionBarSherlock.git
44
ignore = dirty
5+
[submodule "Volley"]
6+
path = Volley
7+
url = https://android.googlesource.com/platform/frameworks/volley.git

‎ActionBarSherlock‎

‎AndroidManifest.xml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2020
package="org.brandroid.openmanager"
2121
android:installLocation="auto"
22-
android:versionCode="228"
23-
android:versionName="0.228" >
22+
android:versionCode="254"
23+
android:versionName="0.254" >
2424

2525
<uses-sdk
2626
android:minSdkVersion="8"
@@ -60,7 +60,7 @@
6060
android:name="org.brandroid.openmanager.activities.OpenApplication"
6161
android:allowBackup="true"
6262
android:icon="@drawable/icon_flat"
63-
android:label="@string/app_name"
63+
android:label="@string/app_name"
6464
android:largeHeap="true"
6565
android:theme="@style/AppTheme.Dark" >
6666
<activity
@@ -129,6 +129,8 @@
129129
<activity
130130
android:name="org.brandroid.openmanager.activities.ServerSetupActivity"
131131
android:uiOptions="none"
132+
android:theme="@style/AppTheme.Dialog"
133+
android:exported="true"
132134
android:configChanges="screenSize|keyboard|keyboardHidden" >
133135
</activity>
134136
<activity
@@ -158,22 +160,28 @@
158160
<activity
159161
android:name="org.brandroid.openmanager.activities.FolderPickerActivity"
160162
android:configChanges="screenSize|keyboard|keyboardHidden"
161-
android:label="@string/s_title_picker" >
163+
android:exported="true" >
164+
<intent-filter>
165+
<action android:name="android.intent.action.GET_CONTENT" />
166+
<category android:name="android.intent.category.OPENABLE" />
167+
<category android:name="android.intent.category.DEFAULT" />
168+
<data android:mimeType="*/*" />
169+
</intent-filter>
162170
<intent-filter>
163171
<action android:name="android.intent.action.PICK" />
164-
165172
<category android:name="android.intent.category.DEFAULT" />
166-
167-
<data android:scheme="file" />
168-
<data android:mimeType="*/*" />
173+
<category android:name="android.intent.category.BROWSABLE" />
174+
<data android:scheme="file" />
175+
<data android:scheme="folder" />
176+
<data android:scheme="directory" />
169177
</intent-filter>
170178
<intent-filter>
171179
<action android:name="org.openintents.action.PICK_FILE" />
172-
173180
<category android:name="android.intent.category.DEFAULT" />
174-
175-
<data android:scheme="file" />
176-
<data android:mimeType="*/*" />
181+
<category android:name="android.intent.category.BROWSABLE" />
182+
<data android:scheme="file" />
183+
<data android:scheme="folder" />
184+
<data android:scheme="directory" />
177185
</intent-filter>
178186
</activity>
179187

@@ -215,6 +223,7 @@
215223
<activity
216224
android:name="org.brandroid.openmanager.activities.SettingsActivity"
217225
android:exported="false"
226+
android:theme="@style/AppTheme.Dark"
218227
android:label="@string/s_menu_prefs_global" >
219228
<intent-filter>
220229
<action android:name="android.intent.action.VIEW" />

‎OpenExplorer.iml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android" name="Android">
5+
<configuration>
6+
<notImportedProperties>
7+
<property>MANIFEST_FILE_PATH</property>
8+
<property>RESOURCES_DIR_PATH</property>
9+
<property>ASSETS_DIR_PATH</property>
10+
<property>NATIVE_LIBS_DIR_PATH</property>
11+
</notImportedProperties>
12+
</configuration>
13+
</facet>
14+
</component>
15+
<component name="NewModuleRootManager" inherit-compiler-output="true">
16+
<exclude-output />
17+
<content url="file://$MODULE_DIR$">
18+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
19+
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
20+
</content>
21+
<orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
22+
<orderEntry type="sourceFolder" forTests="false" />
23+
</component>
24+
</module>
25+

‎build.gradle‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
dependencies {
6+
classpath 'com.android.tools.build:gradle:0.4'
7+
}
8+
}
9+
apply plugin: 'android'
10+
11+
dependencies {
12+
}
13+
14+
android {
15+
compileSdkVersion 17
16+
buildToolsVersion "17"
17+
18+
defaultConfig {
19+
minSdkVersion 1
20+
targetSdkVersion 1
21+
}
22+
sourceSets {
23+
main {
24+
manifest.srcFile 'AndroidManifest.xml'
25+
java.srcDirs = ['src']
26+
resources.srcDirs = ['src']
27+
aidl.srcDirs = ['src']
28+
renderscript.srcDirs = ['src']
29+
res.srcDirs = ['res']
30+
assets.srcDirs = ['assets']
31+
}
32+
33+
instrumentTest.setRoot('tests')
34+
}
35+
}

‎custom_rules.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
<!-- Custom tasks -->
1919
<taskdef resource="anttasks.properties" classpathref="android.antlibs" />
20-
<taskdef name="xpath"
21-
classname="com.android.ant.XPathTask"
22-
classpathref="android.antlibs" />
2320

2421
<property name="out.release.dir" location="releases" />
2522

@@ -194,12 +191,12 @@
194191
in.package="${out.unaligned.file}"
195192
out.package="${out.final.file}" />
196193
<echo level="info">Release Package: ${out.final.file}</echo>
197-
<echo level="info">Uploading to release server</echo>
194+
<!--<echo level="info">Uploading to release server</echo>
198195
<ftp server="${ftp.server}" port="21" remotedir="www/releases/" userid="${ftp.user}" password="${ftp.password}" binary="yes" verbose="yes">
199196
<fileset dir="releases">
200197
<include name="**/${ant.project.name}${mymanifest.manifest.android:versionCode}.apk" />
201198
</fileset>
202-
</ftp>
199+
</ftp>-->
203200
</sequential>
204201
</do-only-if-not-library>
205202
<record-build-info />

‎libs/commons-logging-1.1.1.jar‎

-59.3 KB
Binary file not shown.

‎res/drawable-hdpi/ic_drawer.png‎

2.78 KB
Loading

0 commit comments

Comments
 (0)