Skip to content

Commit 0c8dcf5

Browse files
BrandoCommandoBrandoCommando
committed
Merge pull request BrandroidTools#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

Diff for: ‎.classpath

+3-2
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>

Diff for: ‎.gitignore

-2
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

Diff for: ‎.gitmodules

+3
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

Diff for: ‎ActionBarSherlock

Diff for: ‎AndroidManifest.xml

+21-12
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" />

Diff for: ‎OpenExplorer.iml

+25
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+

Diff for: ‎build.gradle

+35
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+
}

Diff for: ‎custom_rules.xml

+2-5
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 />

Diff for: ‎libs/commons-logging-1.1.1.jar

-59.3 KB
Binary file not shown.

Diff for: ‎res/drawable-hdpi/ic_drawer.png

2.78 KB
Loading

Diff for: ‎res/drawable-mdpi/ic_drawer.png

2.77 KB
Loading

Diff for: ‎res/drawable-xhdpi/ic_drawer.png

1.03 KB
Loading

Diff for: ‎res/layout-large-port/main_fragments.xml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
android:layout_width="match_parent"
2929
android:layout_height="match_parent"
3030
android:layout_alignParentLeft="true"
31-
android:layout_below="@+id/content_pager_indicator_frame"
3231
android:baselineAligned="false"
3332
android:orientation="horizontal" >
3433

Diff for: ‎res/layout-large-port/title_bar.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<TextView
4040
android:id="@+id/title_title"
41-
style="@style/Text.Large"
41+
style="@style/Text.Large.Dialog"
4242
android:layout_height="wrap_content"
4343
android:layout_alignBottom="@+id/title_icon_holder"
4444
android:layout_alignParentTop="true"
@@ -107,6 +107,7 @@
107107
android:layout_alignParentRight="true"
108108
android:layout_alignWithParentIfMissing="true"
109109
android:nextFocusRight="@+id/title_icon_holder"
110+
android:orientation="horizontal"
110111
android:showDividers="middle" >
111112
</LinearLayout>
112113

Diff for: ‎res/layout/heatmap_row.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@
1818
android:layout_width="wrap_content"
1919
android:layout_height="wrap_content"
2020
android:layout_centerVertical="true"
21-
android:layout_toLeftOf="@android:id/progress"
21+
android:layout_toLeftOf="@+id/content_progress_container"
2222
android:layout_toRightOf="@+id/content_icon"
2323
android:padding="4dp"
24+
android:maxLines="2"
25+
style="@style/Text.Small"
2426
android:text="Title" />
2527

2628
<LinearLayout
27-
android:layout_width="120dp"
29+
android:layout_width="100dp"
2830
android:layout_height="wrap_content"
2931
android:layout_alignParentRight="true"
3032
android:layout_centerVertical="true"
33+
android:id="@+id/content_progress_container"
3134
android:orientation="vertical" >
3235

3336
<TextView
@@ -42,8 +45,10 @@
4245
style="?android:attr/progressBarStyleHorizontal"
4346
android:layout_width="match_parent"
4447
android:layout_height="10dp"
48+
android:indeterminate="true"
4549
android:max="100"
4650
android:progress="50" />
51+
4752
</LinearLayout>
4853

4954
</RelativeLayout>

Diff for: ‎res/layout/picker_pager.xml

+5-62
Original file line numberDiff line numberDiff line change
@@ -4,68 +4,11 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical" >
66

7-
<View
7+
<GridView
8+
android:id="@android:id/list"
89
android:layout_width="match_parent"
9-
android:layout_height="1dp"
10-
android:background="@color/blue" />
11-
12-
<org.brandroid.openmanager.views.OpenViewPager
13-
android:id="@+id/picker_pager"
14-
android:layout_width="match_parent"
15-
android:layout_height="match_parent"
16-
android:layout_weight="1" />
17-
18-
<View
19-
android:layout_width="match_parent"
20-
android:layout_height="1dp"
21-
android:background="@color/blue" />
22-
23-
<LinearLayout
24-
android:id="@+id/pick_path_row"
25-
android:layout_width="match_parent"
26-
android:layout_height="wrap_content"
27-
android:padding="4dp" >
28-
29-
<TextView
30-
style="@style/Text.Mid"
31-
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
33-
android:gravity="left"
34-
android:paddingRight="4dp"
35-
android:text="@string/selected_path" />
36-
37-
<TextView
38-
android:id="@+id/pick_path"
39-
style="@style/Text.Mid"
40-
android:layout_width="match_parent"
41-
android:layout_height="wrap_content"
42-
android:gravity="left" />
43-
</LinearLayout>
44-
45-
<EditText
46-
android:id="@+id/pick_filename"
47-
android:layout_width="match_parent"
48-
android:layout_height="wrap_content"
49-
android:hint="@string/filename" />
50-
51-
<LinearLayout
52-
android:layout_width="match_parent"
53-
android:layout_height="wrap_content"
54-
android:orientation="horizontal" >
55-
56-
<Button
57-
android:id="@android:id/button1"
58-
android:layout_width="wrap_content"
59-
android:layout_height="wrap_content"
60-
android:layout_weight="1"
61-
android:text="@android:string/ok" />
62-
63-
<Button
64-
android:id="@android:id/button2"
65-
android:layout_width="wrap_content"
66-
android:layout_height="wrap_content"
67-
android:layout_weight="1"
68-
android:text="@android:string/cancel" />
69-
</LinearLayout>
10+
android:layout_height="0dp"
11+
android:layout_weight="1"
12+
/>
7013

7114
</LinearLayout>

Diff for: ‎res/layout/picker_widget.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
5-
android:background="?attr/dialogBackgroundColorPrimary"
65
android:orientation="vertical" >
6+
7+
<LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone">
8+
<CheckBox android:id="@+id/check_folders" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Only show folders" />
9+
</LinearLayout>
710

811
<View
912
android:layout_width="match_parent"

Diff for: ‎res/layout/server.xml

+8-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
android:layout_marginTop="2dp"
2020
android:layout_marginBottom="3dp"
2121
/>
22+
23+
<WebView
24+
android:id="@+id/server_webview"
25+
android:layout_width="match_parent"
26+
android:layout_height="0dp"
27+
android:layout_weight="1"
28+
android:visibility="visible" />
2229

2330
<ScrollView
2431
android:layout_width="match_parent"
@@ -27,6 +34,7 @@
2734
android:scrollbarStyle="outsideOverlay"
2835
android:paddingLeft="5dp"
2936
android:paddingRight="5dp"
37+
android:id="@+id/server_text_scroller"
3038
android:scrollbars="vertical" >
3139

3240
<LinearLayout
@@ -185,11 +193,6 @@
185193
android:hint="@string/s_pref_server_name"
186194
android:inputType="textNoSuggestions"
187195
android:singleLine="true" />
188-
189-
<include
190-
android:layout_width="match_parent"
191-
android:layout_height="wrap_content"
192-
layout="@layout/server_auth_stub" />
193196
</LinearLayout>
194197
</ScrollView>
195198

Diff for: ‎res/layout/server_auth_stub.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<WebView
1010
android:id="@+id/server_webview"
1111
android:layout_width="match_parent"
12-
android:layout_height="wrap_content"
13-
android:visibility="gone" />
12+
android:layout_height="0dp"
13+
android:layout_weight="1"
14+
android:visibility="visible" />
1415

1516
<Button
1617
android:id="@+id/server_authenticate"

Diff for: ‎res/layout/title_bar.xml

+1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
android:layout_alignParentRight="true"
133133
android:layout_alignWithParentIfMissing="true"
134134
android:nextFocusRight="@+id/title_icon_holder"
135+
android:orientation="vertical"
135136
android:showDividers="middle" >
136137
</LinearLayout>
137138

0 commit comments

Comments
 (0)