Merge pull request #116 from BrandoCommando/dev

v254

.classpath

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.gitignore

@@ -12,8 +12,6 @@ lint.xml
 .checkstyle
 
 #IntelliJ IDEA
-.idea
-*.iml
 *.ipr
 *.iws
 classes

.gitmodules

@@ -2,3 +2,6 @@
 path = ActionBarSherlock
 url = git@github.com:BrandroidTools/ActionBarSherlock.git
 ignore = dirty
+[submodule "Volley"]
+	path = Volley
+	url = https://android.googlesource.com/platform/frameworks/volley.git

AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.brandroid.openmanager"
     android:installLocation="auto"
-    android:versionCode="228"
-    android:versionName="0.228" >
+    android:versionCode="254"
+    android:versionName="0.254" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -60,7 +60,7 @@
         android:name="org.brandroid.openmanager.activities.OpenApplication"
         android:allowBackup="true"
         android:icon="@drawable/icon_flat"
-	android:label="@string/app_name"
+		android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme.Dark" >
         <activity
@@ -129,6 +129,8 @@
         <activity
             android:name="org.brandroid.openmanager.activities.ServerSetupActivity"
       		android:uiOptions="none"
+            android:theme="@style/AppTheme.Dialog"
+            android:exported="true"
             android:configChanges="screenSize|keyboard|keyboardHidden" >
         </activity>
         <activity
@@ -158,22 +160,28 @@
         <activity
             android:name="org.brandroid.openmanager.activities.FolderPickerActivity"
             android:configChanges="screenSize|keyboard|keyboardHidden"
-            android:label="@string/s_title_picker" >
+            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" />
-
-                <data android:scheme="file" />
-                <data android:mimeType="*/*" />
+		        <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="org.openintents.action.PICK_FILE" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="file" />
-                <data android:mimeType="*/*" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+		        <data android:scheme="file" />
+		        <data android:scheme="folder" />
+		        <data android:scheme="directory" />
             </intent-filter>
         </activity>
 
@@ -215,6 +223,7 @@
         <activity
             android:name="org.brandroid.openmanager.activities.SettingsActivity"
             android:exported="false"
+            android:theme="@style/AppTheme.Dark"
             android:label="@string/s_menu_prefs_global" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

OpenExplorer.iml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <notImportedProperties>
+          <property>MANIFEST_FILE_PATH</property>
+          <property>RESOURCES_DIR_PATH</property>
+          <property>ASSETS_DIR_PATH</property>
+          <property>NATIVE_LIBS_DIR_PATH</property>
+        </notImportedProperties>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

build.gradle

@@ -0,0 +1,35 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4'
+    }
+}
+apply plugin: 'android'
+
+dependencies {
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion "17"
+
+    defaultConfig {
+        minSdkVersion 1
+        targetSdkVersion 1
+    }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        instrumentTest.setRoot('tests')
+    }
+}

custom_rules.xml

@@ -17,9 +17,6 @@
 
     <!-- Custom tasks -->
     <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
-    <taskdef name="xpath"
-        classname="com.android.ant.XPathTask"
-        classpathref="android.antlibs" />
 
     <property name="out.release.dir" location="releases" />
 
@@ -194,12 +191,12 @@
                         in.package="${out.unaligned.file}"
                         out.package="${out.final.file}" />
                 <echo level="info">Release Package: ${out.final.file}</echo>
-		<echo level="info">Uploading to release server</echo>
+		<!--<echo level="info">Uploading to release server</echo>
 		<ftp server="${ftp.server}" port="21" remotedir="www/releases/" userid="${ftp.user}" password="${ftp.password}" binary="yes" verbose="yes">
 		    <fileset dir="releases">
 			<include name="**/${ant.project.name}${mymanifest.manifest.android:versionCode}.apk" />
 		    </fileset>
-		</ftp>
+		</ftp>-->
             </sequential>
         </do-only-if-not-library>
         <record-build-info />

res/layout-large-port/main_fragments.xml

@@ -28,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/content_pager_indicator_frame"
         android:baselineAligned="false"
         android:orientation="horizontal" >
 

res/layout-large-port/title_bar.xml

@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/title_title"
-        style="@style/Text.Large"
+        style="@style/Text.Large.Dialog"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/title_icon_holder"
         android:layout_alignParentTop="true"
@@ -107,6 +107,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignWithParentIfMissing="true"
         android:nextFocusRight="@+id/title_icon_holder"
+        android:orientation="horizontal"
         android:showDividers="middle" >
     </LinearLayout>
 

res/layout/heatmap_row.xml

@@ -18,16 +18,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@android:id/progress"
+        android:layout_toLeftOf="@+id/content_progress_container"
         android:layout_toRightOf="@+id/content_icon"
         android:padding="4dp"
+        android:maxLines="2"
+        style="@style/Text.Small"
         android:text="Title" />
 
     <LinearLayout
-        android:layout_width="120dp"
+        android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
+        android:id="@+id/content_progress_container"
         android:orientation="vertical" >
 
         <TextView
@@ -42,8 +45,10 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
             android:layout_height="10dp"
+            android:indeterminate="true"
             android:max="100"
             android:progress="50" />
+
     </LinearLayout>
 
 </RelativeLayout>

res/layout/picker_pager.xml

@@ -4,68 +4,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <View
+    <GridView
+        android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/blue" />
-
-    <org.brandroid.openmanager.views.OpenViewPager
-        android:id="@+id/picker_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/blue" />
-
-    <LinearLayout
-        android:id="@+id/pick_path_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="4dp" >
-
-        <TextView
-            style="@style/Text.Mid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="left"
-            android:paddingRight="4dp"
-            android:text="@string/selected_path" />
-
-        <TextView
-            android:id="@+id/pick_path"
-            style="@style/Text.Mid"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="left" />
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/pick_filename"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/filename" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@android:id/button1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@android:string/ok" />
-
-        <Button
-            android:id="@android:id/button2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@android:string/cancel" />
-    </LinearLayout>
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        />
 
 </LinearLayout>

res/layout/picker_widget.xml

@@ -2,8 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/dialogBackgroundColorPrimary"
     android:orientation="vertical" >
+
+    <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone">
+        <CheckBox android:id="@+id/check_folders" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Only show folders" />
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"

res/layout/server.xml

@@ -19,6 +19,13 @@
         android:layout_marginTop="2dp"
         android:layout_marginBottom="3dp" 
         />
+
+    <WebView
+        android:id="@+id/server_webview"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="visible" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -27,6 +34,7 @@
         android:scrollbarStyle="outsideOverlay"
     	android:paddingLeft="5dp"
     	android:paddingRight="5dp"
+        android:id="@+id/server_text_scroller"
         android:scrollbars="vertical" >
 
         <LinearLayout
@@ -185,11 +193,6 @@
                 android:hint="@string/s_pref_server_name"
                 android:inputType="textNoSuggestions"
                 android:singleLine="true" />
-
-            <include
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                layout="@layout/server_auth_stub" />
         </LinearLayout>
     </ScrollView>
 

res/layout/server_auth_stub.xml

@@ -9,8 +9,9 @@
     <WebView
         android:id="@+id/server_webview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="visible" />
 
     <Button
         android:id="@+id/server_authenticate"

res/layout/title_bar.xml

@@ -132,6 +132,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignWithParentIfMissing="true"
         android:nextFocusRight="@+id/title_icon_holder"
+        android:orientation="vertical"
         android:showDividers="middle" >
     </LinearLayout>