Merge lp:~karni/ubuntuone-android-files/greendroid into lp:ubuntuone-android-files

[Michał Karnicki]

Applied GreenDroid lib to the application UI, see: action bar, quick actions for files and folders, fixed two bugs and few other minor fixes.

I tried to refrain from pending clean up (unrelated string externalization, etc), because the diff is already quite big.

[lp:~karni/ubuntuone-android-files/greendroid]

54. By Michał Karnicki on 2011-04-04

Applied review fixes. Changed e-mail, cleaned up .project and .classpath files.

=== modified file '.classpath'
--- .classpath	2011-01-29 16:22:20 +0000
+++ .classpath	2011-04-04 13:36:49 +0000
@@ -6,10 +6,10 @@
 	<classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.jar"/>
 	<classpathentry kind="lib" path="libs/signpost-core-1.2.jar"/>
 	<classpathentry kind="lib" path="libs/storageprotocol-1.1.0-20110103.190619-2.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="lib" path="libs/protobuf-java-2.3.0.jar"/>
 	<classpathentry kind="lib" path="libs/netty-3.1.5.GA.jar"/>
 	<classpathentry kind="lib" path="libs/commons-codec-1.4.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2011-03-23 13:30:35 +0000
+++ AndroidManifest.xml	2011-04-04 13:36:49 +0000
@@ -2,8 +2,8 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.ubuntuone.android.files"
-	android:versionCode="48"
-	android:versionName="1.1.48" >
+	android:versionCode="54"
+	android:versionName="1.2.54" >
 	
     <uses-sdk
     	android:minSdkVersion="6"
@@ -61,7 +61,7 @@
         	android:name=".ui.DashboardActivity"
         	android:launchMode="singleTask"
         	android:label="@string/title_text"
-        	android:theme="@style/LauncherBackground" >
+        	android:theme="@style/Theme.Dashboard" >
         	
         	<intent-filter
         		android:label="@string/app_name" >
@@ -80,14 +80,13 @@
         
         <activity
     		android:name=".Preferences"
-    		android:theme="@android:style/Theme.Light"
     		android:configChanges="orientation"
     		android:label="@string/title_preferences" >
     	</activity>
     	
     	<activity
     		android:name=".StorageManagement"
-    		android:theme="@android:style/Theme.Light"
+    		android:theme="@style/Theme.U1F"
     		android:configChanges="orientation"
     		android:label="@string/storage_management_title" >
     	</activity>

=== modified file 'README.txt'
--- README.txt	2010-11-23 00:40:34 +0000
+++ README.txt	2011-04-04 13:36:49 +0000
@@ -1,2 +1,25 @@
 Run ./setup to download depenencies.
 
+Then fetch GreenDroid UI library with:
+git clone http://github.com/cyrilmottier/GreenDroid.git
+and apply the library as follows.
+
+--- ant users ---
+
+see: http://developer.android.com/guide/developing/projects/projects-cmdline.html
+
+android update project --path path/to/ubuntuone-android-files --library path/to/GreenDroid
+
+where path/to/GreenDroid might be ../GreenDroid/GreenDroid if you pulled GD sources
+into the same folder as u1f sources.
+
+Please note that GreenDRoid library folder resides inside the GreenDroid folder created by git.
+
+--- eclipse users ---
+
+Right-click on the project -> Properties -> Android
+You'll find the Library list at the bottom. Click Add, and point Eclipse to GreenDroid folder.
+
+Eclipse will add an entry to .project file to point to the GreenDroid library project.
+The entry contains a locationURI, that references a path variable contained in your workspace
+eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs:pathvariable._android_greendroid_ec1dc959=/home/user/greendroid/path/here

=== modified file 'build.properties'
--- build.properties	2010-12-21 15:50:43 +0000
+++ build.properties	2011-04-04 13:36:49 +0000
@@ -15,3 +15,4 @@
 #  'key.alias' for the name of the key to use.
 # The password will be asked during the build when you use the 'release' target.
 external.libs.absolute.dir=./libs
+android.library.reference.1=../GreenDroid/GreenDroid

=== modified file 'default.properties'
--- default.properties	2010-11-23 00:40:34 +0000
+++ default.properties	2011-04-04 13:36:49 +0000
@@ -9,3 +9,4 @@
 
 # Project target.
 target=android-6
+android.library.reference.1=../GreenDroid/GreenDroid

=== added file 'res/drawable-hdpi/action_bar_divider.png'
Binary files res/drawable-hdpi/action_bar_divider.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/action_bar_divider.png	2011-04-04 13:36:49 +0000 differ
=== added file 'res/drawable-mdpi/action_bar_divider.png'
Binary files res/drawable-mdpi/action_bar_divider.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/action_bar_divider.png	2011-04-04 13:36:49 +0000 differ
=== added file 'res/drawable/action_bar_background.xml'
--- res/drawable/action_bar_background.xml	1970-01-01 00:00:00 +0000
+++ res/drawable/action_bar_background.xml	2011-04-04 13:36:49 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2010 Cyril Mottier (http://www.cyrilmottier.com)
+**
+** 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.
+*/
+-->
+
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	
+	<gradient
+		android:startColor="#817f81"
+		android:endColor="#ccc9cc"
+		android:angle="90" />
+		
+</shape>

=== modified file 'res/drawable/list_selector.xml'
--- res/drawable/list_selector.xml	2010-11-23 00:40:34 +0000
+++ res/drawable/list_selector.xml	2011-04-04 13:36:49 +0000
@@ -3,9 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
     <corners
-    	android:radius="10dp"
+    	android:topLeftRadius="10dp"
     	android:topRightRadius="1dp"
-    	android:bottomRightRadius="1dp" />
+    	android:bottomRightRadius="1dp"
+    	android:bottomLeftRadius="10dp" />
     <gradient
         android:angle="90"
         android:startColor="#f90"

=== modified file 'res/layout/activity_dashboard.xml'
--- res/layout/activity_dashboard.xml	2011-02-21 01:32:08 +0000
+++ res/layout/activity_dashboard.xml	2011-04-04 13:36:49 +0000
@@ -5,26 +5,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="#FFFFFF" >
-    
-    <LinearLayout style="@style/TitleBar">
-    	<TextView android:id="@id/actionbar_title"
-    		style="@style/TitleBarText"
-    		android:text="@string/title_text" />
-    		
-	    <ProgressBar android:id="@id/actionbar_indeterminate"
-	    	style="@style/TitleBarProgressIndicator"
-	        android:visibility="gone" />
-	    <!-- 
-	    <ImageView
-	    	style="@style/TitleBarSeparator"
-	    	android:visibility="gone" />
-	     -->
-	    <ImageButton android:id="@id/actionbar_search"
-	    	style="@style/TitleBarAction"
-	    	android:visibility="gone"
-	    	android:src="@drawable/ic_title_search_default"
-	        android:onClick="onSearchClick" />
-	</LinearLayout>
  
     <LinearLayout
         android:orientation="vertical"

=== modified file 'res/layout/activity_list.xml'
--- res/layout/activity_list.xml	2011-03-24 14:09:46 +0000
+++ res/layout/activity_list.xml	2011-04-04 13:36:49 +0000
@@ -5,33 +5,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
     
-	<LinearLayout style="@style/TitleBar">
-	    <TextView android:id="@id/actionbar_title"
-	    	style="@style/TitleBarText"
-	    	android:text="@string/title_files" />
-	    
-	    <ProgressBar android:id="@id/actionbar_indeterminate"
-	    	style="@style/TitleBarProgressIndicator"
-	        android:visibility="gone" />
-    	<!-- 
-	    <ImageView style="@style/TitleBarSeparator"
-	    	android:id="@+id/btn_title_upload_separator" />
-	     -->
-	    <ImageButton android:id="@+id/actionbar_upload"
-	    	style="@style/TitleBarAction"
-	    	android:visibility="gone"
-	        android:src="@drawable/ic_title_share_default" />
-	    <!-- 
-	    <ImageView style="@style/TitleBarSeparator"
-	    	android:id="@+id/btn_title_search_separator" />
-	     -->
-	    <ImageButton android:id="@id/actionbar_search"
-	    	style="@style/TitleBarAction"
-	    	android:visibility="gone"
-	    	android:src="@drawable/ic_title_search_default"
-	        android:onClick="onSearchClick" />
-	</LinearLayout>
-	
 	<!--
 		We don't use calls to setHeader() of the ListActivity, because
 		we show/hide the header during the time the Activity is already visible.
@@ -41,13 +14,21 @@
 		style="@style/ListHeaderText"
 		android:visibility="gone"
 		android:text="" />
-	
+		
    	<ListView
-		android:id="@android:id/list"
+		android:id="@id/android:list"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:drawSelectorOnTop="false"
-		android:listSelector="@drawable/list_selector"
-		/>	
+		android:fastScrollEnabled="true" />
+		
+	<TextView
+		android:id="@id/android:empty"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_centerInParent="true"
+		android:layout_centerHorizontal="true"
+		android:gravity="center"
+		android:text="@string/no_items"
+		android:textColor="@color/file_text_fg" />
 	
 </LinearLayout>

=== modified file 'res/layout/activity_login.xml'
--- res/layout/activity_login.xml	2011-01-06 23:32:17 +0000
+++ res/layout/activity_login.xml	2011-04-04 13:36:49 +0000
@@ -3,16 +3,6 @@
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
 	android:background="#FFFFFF" >
-    
-    <LinearLayout style="@style/TitleBar">
-    	<TextView android:id="@id/actionbar_title"
-    		style="@style/TitleBarText"
-    		android:text="@string/title_text" />
-    		
-	    <ProgressBar android:id="@id/actionbar_indeterminate"
-	    	style="@style/TitleBarProgressIndicator"
-	        android:visibility="gone" />
-	</LinearLayout>
 	
 	<ImageView
 		android:id="@+id/loginImage"

=== modified file 'res/layout/activity_status.xml'
--- res/layout/activity_status.xml	2011-01-06 23:32:17 +0000
+++ res/layout/activity_status.xml	2011-04-04 13:36:49 +0000
@@ -5,23 +5,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
     
-	<LinearLayout style="@style/TitleBar">
-	    <TextView android:id="@id/actionbar_title"
-	    	style="@style/TitleBarText"
-	    	android:text="@string/title_status" />
-	    
-	    <ProgressBar android:id="@id/actionbar_indeterminate"
-	    	style="@style/TitleBarProgressIndicator"
-	        android:visibility="gone" />
-	    <!-- 	
-	    <ImageView style="@style/TitleBarSeparator" />
-	     -->
-	    <ImageButton android:id="@id/actionbar_refresh"
-	    	style="@style/TitleBarAction"
-	    	android:src="@drawable/ic_title_refresh_default"
-	        android:onClick="onRefreshClick" />
-	</LinearLayout>
-    
    	<ListView
 		android:id="@+id/service_list"
 		android:layout_width="fill_parent"

=== modified file 'res/layout/row.xml'
--- res/layout/row.xml	2011-01-12 22:24:37 +0000
+++ res/layout/row.xml	2011-04-04 13:36:49 +0000
@@ -48,7 +48,7 @@
 		android:singleLine="true"
 		android:ellipsize="marquee"
 		android:textSize="16dip"
-		android:textColor="#EE0000"
+		android:textColor="@color/file_text_fg"
 		
 		android:text="filename" />
 		

=== modified file 'res/raw/notice'
--- res/raw/notice	2011-03-01 19:36:58 +0000
+++ res/raw/notice	2011-04-04 13:36:49 +0000
@@ -61,6 +61,6 @@
 
 karni
 
-e-mail: [e-mail]
+e-mail: [e-mail]
 irc: karni #ubuntuone @freenode
 </small>

=== modified file 'res/values/colors.xml'
--- res/values/colors.xml	2011-03-24 15:38:17 +0000
+++ res/values/colors.xml	2011-04-04 13:36:49 +0000
@@ -5,6 +5,8 @@
 	<color name="text_fg_dash_btn">#AAAAAA</color>
 	<color name="list_separator">#CCCCCC</color>
 	
-	<color name="remote_file_background">#CCDFDFDF</color>
-	<color name="local_file_background">#FFFFFF</color>
+	<color name="remote_file_bg">#CCDFDFDF</color>
+	<color name="local_file_bg">#FFFFFF</color>
+	<color name="file_text_fg">#EE0000</color>
+	<color name="file_published_text_fg">#1157FE</color>
 </resources>

=== removed file 'res/values/ids.xml'
--- res/values/ids.xml	2011-01-06 23:32:17 +0000
+++ res/values/ids.xml	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<item type="id" name="title_bar" />
-	<item type="id" name="title_logo" />
-	<item type="id" name="title_text" />
-	
-	<!-- Actionbar item ids -->
-	<item type="id" name="actionbar_title" />
-	<item type="id" name="actionbar_indeterminate" />
-	<item type="id" name="actionbar_search" />
-	<item type="id" name="actionbar_refresh" />
-	<item type="id" name="actionbar_upload" />
-</resources>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2011-03-06 03:36:02 +0000
+++ res/values/strings.xml	2011-04-04 13:36:49 +0000
@@ -19,6 +19,9 @@
     <string name="pick_image_title">Pick image with</string>
     <string name="pick_video_title">Pick video with</string>
     <string name="pick_audio_title">Pick audio with</string>
+    <string name="action_bar_image">Image</string>
+    <string name="action_bar_video">Video</string>
+    <string name="action_bar_audio">Audio</string>
     
     <!-- Context menus -->
     <string name="context_open">Open</string>
@@ -27,7 +30,7 @@
     <string name="context_copy_link">Copy public link</string>
     <string name="context_unpublish">Unpublish</string>
     <string name="context_sync">Sync</string>
-    <string name="context_dont_sync">Dont sync</string>
+    <string name="context_dont_sync">Don\'t sync</string>
     <string name="context_share">Share</string>
     <string name="context_rename">Rename</string>
     <string name="context_remove">Remove</string>
@@ -46,16 +49,13 @@
     <string name="option_stop_and_quit_title">Stop sync, too</string>
     
     <!-- Files activity -->
-    <string name="title_files">Files</string>
+    <string name="title_files">Ubuntu One</string>
     
     <!-- UDFs activity -->
-    <string name="title_udfs">UDFs</string>
+    <string name="title_udfs">Synced Folders</string>
     
     <!-- Shares activity -->
     <string name="title_shares">Shares</string>
-    
-    <!-- Published activity -->
-    <string name="title_published">Published</string>
         
     <!-- Status activity -->
     <string name="title_status">Status</string>
@@ -104,6 +104,9 @@
     <string name="fetch_token_failed">Failed to receive auth token</string>
     <string name="working_offline">Working off-line</string>
     
+    <string name="please_wait">Please wait</string>
+    <string name="no_items">No items</string>
+    
     <string name="ok_dialog_button_text">OK</string>
     <string name="yes_dialog_button_text">Yes</string>
     <string name="no_dialog_button_text">No</string>

=== modified file 'res/values/styles.xml'
--- res/values/styles.xml	2011-02-25 10:35:51 +0000
+++ res/values/styles.xml	2011-04-04 13:36:49 +0000
@@ -2,86 +2,6 @@
 <resources>
 	<style name="Theme" parent="android:Theme"></style>
 	
-	<style name="Theme.U1F" parent="android:style/Theme.Light">
-		<item name="android:windowNoTitle">true</item>
-		<item name="android:windowContentOverlay">@null</item>
-		<item name="android:fadeScrollbars">true</item>
-	</style>
-	
-	<style name="LauncherBackground" parent="Theme.U1F">
-		<item name="android:windowBackground">@drawable/loading</item>
-	
-	</style>
-	
-	<style name="TitleBar">
-		<item name="android:id">@id/title_bar</item>
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">@dimen/title_height</item>
-		<item name="android:orientation">horizontal</item>
-		<item name="android:background">@drawable/title_gradient</item>
-	</style>
-	
-	<style name="TitleBarAction">
-		<item name="android:layout_width">@dimen/title_height</item>
-		<item name="android:layout_height">fill_parent</item>
-		<item name="android:background">@drawable/title_button</item>
-	</style>
-	
-	<style
-		name="TitleBarProgressIndicator"
-		parent="@android:style/Widget.ProgressBar.Small">
-		
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginLeft">15dip</item>
-		<item name="android:layout_marginRight">15dip</item>
-		<item name="android:layout_marginTop">14dip</item>
-		<item name="android:indeterminate">true</item>		
-	</style>
-	
-	<style
-		name="HeaderProgressBar"
-		parent="@android:style/Widget.ProgressBar.Small.Inverse">
-		
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">center_vertical</item>
-		<item name="android:indeterminate">true</item>
-		<item name="android:layout_marginRight">6dip</item>
-		<item name="android:paddingRight">6dip</item>
-		
-		<item name="android:focusable">false</item>
-		<item name="android:focusableInTouchMode">false</item>
-	</style>
-	
-	<style name="TitleBarSeparator">
-		<item name="android:layout_width">1px</item>
-		<item name="android:layout_height">@dimen/title_height</item>
-		<item name="android:background">@color/title_separator</item>
-	</style>
-	
-	<style name="TitleBarLogo">
-		<item name="android:id">@+id/title_logo</item>
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">fill_parent</item>
-		<item name="android:clickable">true</item>
-	</style>
-	
-	<style name="TitleBarText">
-		<item name="android:id">@+id/title_text</item>
-		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_height">fill_parent</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:textSize">@dimen/text_size_medium</item>
-		<item name="android:paddingLeft">12dip</item>
-		<item name="android:paddingRight">12dip</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textColor">@color/title_text</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:ellipsize">end</item>		
-	</style>
-	
 	<style name="ListHeaderText">
 		<item name="android:layout_width">fill_parent</item>
 		<item name="android:layout_height">wrap_content</item>

=== added file 'res/values/themes.xml'
--- res/values/themes.xml	1970-01-01 00:00:00 +0000
+++ res/values/themes.xml	2011-04-04 13:36:49 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="Theme.U1F" parent="@style/Theme.GreenDroid.NoTitleBar">
+		<item name="gdActionBarTitleColor">@android:color/white</item>
+		<item name="gdActionBarBackground">@drawable/action_bar_background</item>
+		<item name="gdActionBarDividerDrawable">@drawable/action_bar_divider</item>
+		<item name="gdActionBarDividerWidth">2px</item>
+		<item name="gdActionBarApplicationDrawable">@drawable/launcher</item>
+	</style>
+	
+	<style name="Theme.Dashboard" parent="@style/Theme.U1F">
+		<item name="android:windowBackground">@drawable/loading</item>	
+	</style>
+	
+</resources>

=== modified file 'setup'
--- setup	2011-02-15 20:06:04 +0000
+++ setup	2011-04-04 13:36:49 +0000
@@ -24,6 +24,11 @@
 	return 1
 fi
 
+GITBIN=$(which git)
+if test -z "${GITBIN}"; then
+	echo "You need git to download GreenDroid lib." >&2
+fi
+
 trap "echo ' ====  Not Successful. ===='" EXIT
 set -e
 

=== modified file 'src/com/ubuntuone/android/files/Preferences.java'
--- src/com/ubuntuone/android/files/Preferences.java	2011-03-23 13:30:35 +0000
+++ src/com/ubuntuone/android/files/Preferences.java	2011-04-04 13:36:49 +0000
@@ -101,7 +101,7 @@
 		public static final String DEBUG = "debug";
 		public static final String SEND_LOGS = "send_logs";
 		public static final String CLEAR_LOGS = "clear_logs";
-		public static final String CRASH_FLAG = "crashed";
+		public static final String OOPS_FLAG = "oops_flag";
 	}
 	
 	public interface Url {
@@ -598,13 +598,13 @@
 		return prefs.getLong(Storage.STORAGE_LIMIT, -1L);
 	}
 	
-	public static void setCrashFlag(boolean flag) {
-		editor.putBoolean(Debug.CRASH_FLAG, flag);
+	public static void setOopsFlag(boolean flag) {
+		editor.putBoolean(Debug.OOPS_FLAG, flag);
 		editor.commit();
 	}
 	
 	public static boolean getCrashFlag() {
-		return getBoolean(Debug.CRASH_FLAG, false);
+		return getBoolean(Debug.OOPS_FLAG, false);
 	}
 	
 	public static boolean getIsManualLimits() {

=== modified file 'src/com/ubuntuone/android/files/UbuntuOneFiles.java'
--- src/com/ubuntuone/android/files/UbuntuOneFiles.java	2011-03-23 13:30:35 +0000
+++ src/com/ubuntuone/android/files/UbuntuOneFiles.java	2011-04-04 13:36:49 +0000
@@ -22,12 +22,13 @@
 
 package com.ubuntuone.android.files;
 
+import greendroid.app.GDApplication;
+
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import android.app.Activity;
 import android.app.AlarmManager;
-import android.app.Application;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
@@ -49,25 +50,25 @@
 import com.ubuntuone.android.files.syncdaemon.SyncDaemon;
 import com.ubuntuone.android.files.syncdaemon.states.Node;
 import com.ubuntuone.android.files.syncdaemon.states.StateManager;
+import com.ubuntuone.android.files.ui.DashboardActivity;
 import com.ubuntuone.android.files.util.DateUtilities;
 import com.ubuntuone.android.files.util.Util;
 import com.ubuntuone.android.files.util.OAuthUtilities.OAuthClient;
 import com.ubuntuone.android.util.log.Log;
 
-public final class UbuntuOneFiles extends Application {
+public final class UbuntuOneFiles extends GDApplication {
 	
 	private static final String TAG = UbuntuOneFiles.class.getSimpleName();
 	
 	private static UbuntuOneFiles sApplicationInstance;
 	
-	// TODO Remove this when sync logic moved to commands.
-	public static boolean sSyncInProgress;
+	private Handler mHandler;
 	
 	private EventQueue mEventQueue;
 	
 	private StateManager mStateManager;
 	
-	private Handler mHandler;
+	public static boolean sSyncInProgress;
 	
 	@Override
 	public void onCreate() {
@@ -88,7 +89,9 @@
 		}
 		Log.d(TAG, "starting application");
 		
-		Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler());
+		Thread.setDefaultUncaughtExceptionHandler(
+				new UncaughtExceptionHandler(
+						Thread.getDefaultUncaughtExceptionHandler()));
 		
 		// Initially, set storage limit equal to available SD storage.
 		long limit = Preferences.getStorageLimit();
@@ -137,6 +140,11 @@
 		return sApplicationInstance;
 	}
 	
+	@Override
+	public Class<?> getHomeActivityClass() {
+		return DashboardActivity.class;
+	}
+
 	public static EventQueue getEventQueue() {
 		return sApplicationInstance.mEventQueue;
 	}
@@ -463,19 +471,16 @@
 	
 	private class UncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
 		
-		private void killSelf() {
-			// Run any pending CRUD and close the database.
-			FilesDatabase.performBatchSqlExec();
-			FilesDatabase.closeDatabase();
-			// Close the logs cleanly.
-			Log.shutdown();
-			android.os.Process.killProcess(android.os.Process.myPid());
-			// TODO Implement re-start?
+		private Thread.UncaughtExceptionHandler mDefaultHandler;
+		
+		public UncaughtExceptionHandler(
+				Thread.UncaughtExceptionHandler defaultHandler) {
+			mDefaultHandler = defaultHandler;
 		}
 		
 		public void uncaughtException(Thread thread, Throwable ex) {
-			// Set the crash flag;
-			Preferences.setCrashFlag(true);
+			// Set the crash flag.
+			Preferences.setOopsFlag(true);
 			
 			// Log the problem.
 			Log.d(TAG, "UNHANDLED exception: " + ex.getMessage());
@@ -483,9 +488,14 @@
 			for (StackTraceElement stackTraceElement : stackTrace) {
 				Log.d(TAG, stackTraceElement.toString());
 			}
+			// Run any pending CRUD and close the database.
+			FilesDatabase.performBatchSqlExec();
+			FilesDatabase.closeDatabase();
+			// Close the logs cleanly.
+			Log.shutdown();
 			
-			// Don't continue, we might be unstable.
-			killSelf();
+			// Pass it to default uncaught exception handler.
+			mDefaultHandler.uncaughtException(thread, ex);
 		}
 	}
 	

=== modified file 'src/com/ubuntuone/android/files/provider/FilesUtilities.java'
--- src/com/ubuntuone/android/files/provider/FilesUtilities.java	2011-03-10 00:00:57 +0000
+++ src/com/ubuntuone/android/files/provider/FilesUtilities.java	2011-04-04 13:36:49 +0000
@@ -34,7 +34,6 @@
 import com.ubuntuone.android.files.provider.FilesContract.Files;
 import com.ubuntuone.android.files.provider.FilesContract.FilesStatus;
 import com.ubuntuone.android.files.syncdaemon.MsgArgs;
-import com.ubuntuone.android.files.util.PathTool;
 import com.ubuntuone.android.files.util.Util;
 import com.ubuntuone.android.util.log.Log;
 import com.ubuntuone.storageprotocol.StorageProtocol.FileInfo.FileType;
@@ -213,10 +212,11 @@
 		Cursor c = FilesDatabase.rawQuery("SELECT file_synced FROM files " +
 				"WHERE _id=?", new String[]{id.toString()});
 		if (c.moveToFirst()) {
-			syncable = c.getInt(c.getColumnIndex(Files.SYNCED)) != 0 ? true
-					: false;
+			Log.d(TAG, ">>>>>>>>>> " + c.getInt(c.getColumnIndex(Files.SYNCED)));
+			syncable = c.getString(c.getColumnIndex(Files.SYNCED)).equals("true");
 		}
 		c.close();
+		Log.d(TAG, ">>>>>>>>" + syncable);
 		return syncable;
 	}
 	
@@ -250,13 +250,8 @@
 	}
 	
 	public static void setPublicUrl(Long id, String url) {
-		if (url != null) {
-			FilesDatabase.execSQL("UPDATE files SET file_url=? WHERE _id=?",
-					new Object[]{url, id.toString()});
-		} else {
-			FilesDatabase.execSQL("UPDATE files SET file_url=? WHERE _id=?",
-					new Object[]{""});
-		}
+		FilesDatabase.execSQL("UPDATE files SET file_url=? WHERE _id=?",
+				new Object[] { (url == null) ? "" : url, id.toString() });
 	}
 	
 	private static final String[] sVolumeTypes = new String[]{

=== modified file 'src/com/ubuntuone/android/files/syncdaemon/EventQueue.java'
--- src/com/ubuntuone/android/files/syncdaemon/EventQueue.java	2011-03-10 00:00:57 +0000
+++ src/com/ubuntuone/android/files/syncdaemon/EventQueue.java	2011-04-04 13:36:49 +0000
@@ -80,7 +80,9 @@
 	 * @param h
 	 *            the handler object to remove from the queue.
 	 */
-	public void unsubscribe(final Handler h) {
+	public synchronized void unsubscribe(final Handler h) {
+		if (h == null)
+			return;
 		if (mListeners.contains(h)) {
 			mListeners.remove(h);
 			Log.v(TAG, "handler unsubscribed from EQ");
@@ -95,7 +97,9 @@
 	 * @param h
 	 *            the handler object to add to the listener queue.
 	 */
-	public void subscribe(final Handler h) {
+	public synchronized void subscribe(final Handler h) {
+		if (h == null)
+			return;
 		if (!mListeners.contains(h)) {
 			Log.v(TAG, "handler subscribed to EQ");
 			mListeners.add(h);
@@ -157,9 +161,11 @@
 	 * @param event
 	 *            the event to push.
 	 */
-	private void dispatch(final Message event) {
+	private synchronized void dispatch(final Message event) {
 		Iterator<Handler> iterator = mListeners.iterator();
 		Handler target;
+		if (iterator == null)
+			return;
 		while (iterator.hasNext()) {
 			target = iterator.next();
 			// Make sure we don't send a message to a dead Thread.

=== modified file 'src/com/ubuntuone/android/files/syncdaemon/SyncManager.java'
--- src/com/ubuntuone/android/files/syncdaemon/SyncManager.java	2011-03-10 00:00:57 +0000
+++ src/com/ubuntuone/android/files/syncdaemon/SyncManager.java	2011-04-04 13:36:49 +0000
@@ -89,15 +89,19 @@
 		case CanISync.NO_NETWORK:
 			args.setError(new Throwable("no network available"));
 			sync = false;
+			break;
 		case CanISync.NO_PREFERRED:
 			args.setError(new Throwable("not preferred sync network"));
 			sync = false;
+			break;
 		case CanISync.NO_BACKGROUND:
 			args.setError(new Throwable("background data disabled"));
 			sync = false;
+			break;
 		case CanISync.ROAMING:
 			args.setError(new Throwable("roaming"));
 			sync = false;
+			break;
 		}
 		
 		if (sync == false) {

=== modified file 'src/com/ubuntuone/android/files/syncdaemon/commands/Sync.java'
--- src/com/ubuntuone/android/files/syncdaemon/commands/Sync.java	2011-03-10 00:00:57 +0000
+++ src/com/ubuntuone/android/files/syncdaemon/commands/Sync.java	2011-04-04 13:36:49 +0000
@@ -54,15 +54,19 @@
 		case CanISync.NO_NETWORK:
 			args.setError(new Throwable("no network available"));
 			shouldBeQueued = false;
+			break;
 		case CanISync.NO_PREFERRED:
 			args.setError(new Throwable("not preferred sync network"));
 			shouldBeQueued = false;
+			break;
 		case CanISync.NO_BACKGROUND:
 			args.setError(new Throwable("background data disabled"));
 			shouldBeQueued = false;
+			break;
 		case CanISync.ROAMING:
 			args.setError(new Throwable("roaming"));
 			shouldBeQueued = false;
+			break;
 		}
 		
 		// Check if should not be queued because of connectivity/preferences.

=== removed file 'src/com/ubuntuone/android/files/ui/Actionbar.java'
--- src/com/ubuntuone/android/files/ui/Actionbar.java	2011-01-06 23:32:17 +0000
+++ src/com/ubuntuone/android/files/ui/Actionbar.java	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-/*
- * Ubuntu One Files - access Ubuntu One cloud storage on Android platform.
- * 
- * Copyright (C) 2010 Canonical Ltd.
- * Author: Michał Karnicki <[e-mail]>
- *   
- * This file is part of Ubuntu One Files.
- *  
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses 
- */
-
-package com.ubuntuone.android.files.ui;
-
-import android.app.Activity;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.ubuntuone.android.files.R;
-
-public class Actionbar implements IActionbar {
-	
-	private TextView mTitle;
-	
-	private ProgressBar mIndeterminate;
-	
-	private ImageButton mUpload;
-	
-	private ImageButton mSearch;
-	
-	public Actionbar(Activity activity) {
-		mTitle = (TextView) activity.findViewById(R.id.actionbar_title);
-		mIndeterminate = (ProgressBar) activity.findViewById(R.id.actionbar_indeterminate);
-		mUpload = (ImageButton) activity.findViewById(R.id.actionbar_upload);
-		mSearch = (ImageButton) activity.findViewById(R.id.actionbar_search);
-	}
-	
-	// Actionbar title TextView view.
-	
-	public void setActionbarTitle(CharSequence title) {
-		if (mTitle != null)
-			mTitle.setText(title);
-	}
-	
-	public void hideActionbarTitle() {
-		if (mTitle != null)
-			mTitle.setVisibility(View.GONE);
-	}
-	
-	public void showActionbarTitle() {
-		if (mTitle != null)
-			mTitle.setVisibility(View.VISIBLE);
-	}
-	
-	// Actionbar indeterminate ProgressBar view.
-	
-	public void setActionbarIndeterminateVisibility(int visibility) {
-		if (mIndeterminate != null)
-			mIndeterminate.setVisibility(visibility);
-	}
-	
-	public void hideActionbarIndeterminate() {
-		if (mIndeterminate != null)
-			mIndeterminate.setVisibility(View.GONE);
-	}
-	
-	public void showActionbarIndeterminate() {
-		if (mIndeterminate != null)
-			mIndeterminate.setVisibility(View.VISIBLE);
-	}
-	
-	// Actionbar upload ImageButton view.
-	
-	public void setActionbarUploadVisibility(int visibility) {
-		if (mUpload != null)
-			mUpload.setVisibility(visibility);
-	}
-	
-	public void hideActionbarUpload() {
-		if (mUpload != null)
-			mUpload.setVisibility(View.GONE);
-	}
-	
-	public void showActionbarUpload() {
-		if (mUpload != null)
-			mUpload.setVisibility(View.VISIBLE);
-	}
-	
-	// Actionbar search ImageButton view.
-	
-	public void setActionbarSearchVisibility(int visibility) {
-		if (mSearch != null)
-			mSearch.setVisibility(visibility);
-	}
-	
-	public void hideActionbarSearch() {
-		if (mSearch != null)
-			mSearch.setVisibility(View.GONE);
-	}
-	
-	public void showActionbarSearch() {
-		if (mSearch != null)
-			mSearch.setVisibility(View.VISIBLE);
-	}
-
-}

=== modified file 'src/com/ubuntuone/android/files/ui/CustomListActivity.java'
--- src/com/ubuntuone/android/files/ui/CustomListActivity.java	2011-03-24 14:09:46 +0000
+++ src/com/ubuntuone/android/files/ui/CustomListActivity.java	2011-04-04 13:36:49 +0000
@@ -22,12 +22,28 @@
 
 package com.ubuntuone.android.files.ui;
 
+import greendroid.app.GDListActivity;
+import greendroid.widget.ActionBar;
+import greendroid.widget.ActionBarItem;
+import greendroid.widget.LoaderActionBarItem;
+import greendroid.widget.NormalActionBarItem;
+import greendroid.widget.QuickAction;
+import greendroid.widget.QuickActionBar;
+import greendroid.widget.QuickActionGrid;
+import greendroid.widget.QuickActionWidget;
+import greendroid.widget.QuickActionWidget.OnQuickActionClickListener;
+
 import java.io.File;
 
-import android.app.ListActivity;
+import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.LightingColorFilter;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -40,9 +56,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
-import android.widget.ImageButton;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -71,13 +85,56 @@
 import com.ubuntuone.storageprotocol.StorageProtocol.FileInfo.FileType;
 import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 
-public abstract class CustomListActivity extends ListActivity implements IActionbar {
+public class CustomListActivity extends GDListActivity {
 	private static final String TAG = CustomListActivity.class.getSimpleName();
 	
-	private Actionbar mActionbar;
+	private LoaderActionBarItem mLoaderItem;
+	
+	private NormalActionBarItem mUploadItem;
+	
+	private QuickActionWidget mUploadGrid;
+	
+	private QuickActionWidget mQuickActionBar;
+	
+	
+	private static final int ACTION_BAR_SYNC = 0;
+	
+	private static final int ACTION_BAR_UPLOAD = 1;
+	
+	
+	private static final int QUICK_ACTION_UPLOAD_IMAGE = 0;
+	
+	private static final int QUICK_ACTION_UPLOAD_VIDEO = 1;
+	
+	private static final int QUICK_ACTION_UPLOAD_AUDIO = 2;
+	
+	
+	private static final int QUICK_ACTION_DIRECTORY_OPEN = 0;
+	
+	private static final int QUICK_ACTION_DIRECTORY_SYNC = 1;
+	
+	private static final int QUICK_ACTION_DIRECTORY_DOWNLOAD = 2;
+	
+	private static final int QUICK_ACTION_DIRECTORY_SHARE = 3;
+	
+	private static final int QUICK_ACTION_DIRECTORY_MANAGE = 4;
+	
+	private static final int QUICK_ACTION_FILE_OPEN = 0;
+	
+	private static final int QUICK_ACTION_FILE_DOWNLOAD = 1;
+	
+	private static final int QUICK_ACTION_FILE_SYNC = 2;
+	
+	private static final int QUICK_ACTION_FILE_PUBLISH = 3;
+	
+	private static final int QUICK_ACTION_FILE_COPY_URL = 4;
+	
+	private ViewHolder mContextMenuSourceViewHolder;
+	
 	
 	private TextView mListHeader;
 	
+	private TextView mEmptyTextView;
 	
 	protected CustomListActivityAdapter mAdapter;
 	
@@ -89,37 +146,172 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_list);
+		setActionBarContentView(R.layout.activity_list);
+		mLoaderItem = (LoaderActionBarItem) addActionBarItem(getActionBar()
+				.newActionBarItem(LoaderActionBarItem.class)
+				.setDrawable(R.drawable.gd_action_bar_refresh),
+				ActionBar.NONE);
+		mUploadItem = (NormalActionBarItem) addActionBarItem(getActionBar()
+				.newActionBarItem(NormalActionBarItem.class)
+				.setDrawable(R.drawable.gd_action_bar_export), 
+				ActionBar.NONE);
+		prepareUploadQuickActionGrid();
+		
+		mListHeader = (TextView) findViewById(R.id.list_header_text);
+		mEmptyTextView = (TextView) findViewById(android.R.id.empty);
+		
+		ListView listView = getListView();
+		listView.setItemsCanFocus(true);
+		listView.setEmptyView(mEmptyTextView);
+		listView.setSelector(R.drawable.list_selector);
+		
+		registerForContextMenu(getListView());
+		
 		mEventQueue = UbuntuOneFiles.getEventQueue();
 		mHandler = new Handler(mHandlerCallback);
-		mActionbar = new Actionbar(this);
-		mActionbar.setActionbarTitle(getActionBarTitle());
-		
-		getListView().setItemsCanFocus(true);
-		getListView().setFastScrollEnabled(true);
-		
-		mListHeader = (TextView) findViewById(R.id.list_header_text);
-		
-		registerForContextMenu(getListView());
-		
-		ImageButton upload = (ImageButton) findViewById(R.id.actionbar_upload);
-		upload.setOnClickListener(new OnClickListener() {
-			public void onClick(View v) {
-				// FIXME Execute upload file menu directly.
-				CustomListActivity.this.openOptionsMenu();
-			}
-		});
-	}
-	
+	}
+	
+	@Override
+	public boolean onHandleActionBarItemClick(ActionBarItem item, int position) {
+		switch (position) {
+		case ACTION_BAR_SYNC:
+			// TODO karni: sync only currently visible volume
+			mEventQueue.push(Message.obtain(null, R.string.CMD_SYNC));
+			break;
+		case ACTION_BAR_UPLOAD:
+			onShowUploadBar(item.getItemView());
+			break;
+
+		default:
+			Log.w(TAG, "unknown action bar action");
+			break;
+		}
+		return super.onHandleActionBarItemClick(item, position);
+	}
+	
+	private void prepareUploadQuickActionGrid() {
+		mUploadGrid = new QuickActionGrid(this);
+		// XXX karni: We need icons for: image, video and audio.
+		mUploadGrid.addQuickAction(new MyQuickAction(this,
+				R.drawable.gd_action_bar_gallery,
+				R.string.action_bar_image));
+		mUploadGrid.addQuickAction(new MyQuickAction(this,
+				R.drawable.gd_action_bar_take_photo,
+				R.string.action_bar_video));
+		mUploadGrid.addQuickAction(new MyQuickAction(this,
+				R.drawable.gd_action_bar_talk,
+				R.string.action_bar_image));
+		mUploadGrid.setOnQuickActionClickListener(mUploadQuickActionListener);
+	}
+	
+	private void onShowUploadBar(View v) {
+		mUploadGrid.show(v);
+	}
+	
+	private OnQuickActionClickListener mUploadQuickActionListener =
+			new OnQuickActionClickListener() {
+		
+		public void onQuickActionClicked(QuickActionWidget widget, int position) {
+			switch (position) {
+			case QUICK_ACTION_UPLOAD_IMAGE:
+				onUploadImage();
+				break;
+			case QUICK_ACTION_UPLOAD_VIDEO:
+				onUploadVideo();
+				break;
+			case QUICK_ACTION_UPLOAD_AUDIO:
+				onUploadAudio();
+				break;
+				
+			default:
+				Log.w(TAG, "unknown upload quick action");
+				break;
+			}
+		}
+		
+	};
+	
+	private OnQuickActionClickListener mOnDirectoryQuickActionBarClickListener =
+			new OnQuickActionClickListener() {
+		
+		public void onQuickActionClicked(QuickActionWidget widget, int position) {
+			final Activity activity = CustomListActivity.this;
+			final ViewHolder holder = mContextMenuSourceViewHolder;
+			
+			switch (position) {
+			case QUICK_ACTION_DIRECTORY_OPEN:
+				mAdapter.cd(activity, holder.id);
+				break;
+			case QUICK_ACTION_DIRECTORY_SYNC:
+				holder.star.performClick();
+				break;
+			case QUICK_ACTION_DIRECTORY_DOWNLOAD:
+				// TODO karni: implement full folder download
+				break;
+			case QUICK_ACTION_DIRECTORY_SHARE:
+				// TODO karni: impelement folder sharing
+				break;
+			case QUICK_ACTION_DIRECTORY_MANAGE:
+				// TODO karni: implement folder sharing management
+				break;
+			
+			default:
+				Log.w(TAG, "unknown folder quick action");
+				break;
+			}
+		}
+		
+	};
+
+	private OnQuickActionClickListener mOnFileQuickActionBarClickListener =
+			new OnQuickActionClickListener() {
+		
+		public void onQuickActionClicked(QuickActionWidget widget, int position) {
+			final ViewHolder holder = mContextMenuSourceViewHolder;
+			final long id = holder.id;
+			
+			switch (position) {
+			case QUICK_ACTION_FILE_OPEN:
+				openFile(id);
+				break;
+			case QUICK_ACTION_FILE_DOWNLOAD:
+				downloadFile(id);
+				break;
+			case QUICK_ACTION_FILE_SYNC:
+				holder.star.performClick();
+				break;
+			case QUICK_ACTION_FILE_PUBLISH:
+				String url = FilesUtilities.getPublicUrl(id);
+				if (url == null || "".equals(url)) {
+					publishFile(id);
+				} else {
+					unpublishFile(id);
+				}
+				break;
+			case QUICK_ACTION_FILE_COPY_URL:
+				copyPublicLink(id);
+				break;
+
+			default:
+				Log.w(TAG, "unknown file quick action");
+				break;
+			}
+		}
+		
+	};
+
 	private Handler.Callback mHandlerCallback = new Handler.Callback() {
 		
 		public boolean handleMessage(Message msg) {
 			switch (msg.what) {
 			case R.string.QM_WORKING:
-				mActionbar.showActionbarIndeterminate();
+				showProgress();
+				awaitWithListEmptyTextView();
 				break;
 			case R.string.QM_IDLE:
-				mActionbar.hideActionbarIndeterminate();
+				maybeHideProgress();
+				resetListEmptyTextView();
+				refreshListAdapter();
 				break;
 			case R.string.SYS_SYNCING:
 				showHeader();
@@ -127,12 +319,9 @@
 			case R.string.SYS_SYNC_ERROR:
 				//$FALL-THROUGH$
 			case R.string.SYS_SYNCED:
-				 // this hide() can cause problems before we move sync to AQ 
 				hideHeader();
 				refreshListAdapter();
 				break;
-			case R.string.AQ_UPLOAD_STARTED:
-				break;
 			case R.string.AQ_UPLOAD_FINISHED:				
 				refreshListAdapter();
 				break;
@@ -157,7 +346,6 @@
 				break;
 			case R.string.AQ_DOWNLOAD_ERROR:
 				refreshListAdapter();
-				// TODO Add problem description from msg.obj
 				Util.showLongToast(CustomListActivity.this,
 						"Problem while downloading");
 				break;
@@ -167,32 +355,32 @@
 			}
 			return false;
 		}
+		
 	};
 	
-	private int mInForeground = -1;
+	private int mInForegroundToken = -1;
 	
 	@Override
 	protected void onStart() {
 		super.onStart();
 		mEventQueue.subscribe(mHandler);
-		mInForeground = UbuntuOneFiles.setForegroundActivity(this);
+		mInForegroundToken = UbuntuOneFiles.setForegroundActivity(this);
 	}
 
 	@Override
 	protected void onResume() {
-		super.onResume();		
+		super.onResume();	
 		if (UbuntuOneFiles.isQueueWorking()) {
-			mActionbar.showActionbarIndeterminate();
+			showProgress();
 		} else {
-			if (!UbuntuOneFiles.sSyncInProgress)
-				mActionbar.hideActionbarIndeterminate();
+			maybeHideProgress();
 		}
 	}
 
 	@Override
 	protected void onStop() {
 		mEventQueue.unsubscribe(mHandler);
-		UbuntuOneFiles.clearForegroundActivity(mInForeground);
+		UbuntuOneFiles.clearForegroundActivity(mInForegroundToken);
 		super.onStop();
 	}
 	
@@ -203,9 +391,16 @@
 		
 		// This condition is here, as adapter needs to be set before showHeader()
 		if (UbuntuOneFiles.sSyncInProgress) {
-			mActionbar.showActionbarIndeterminate();
+			showProgress();
 			showHeader();
 		}
+		
+		if (mAdapter.isAtRoot() && !VolumeType.ROOT.equals(
+				mAdapter.getPathTool().getType())) {
+			hideUpload();
+		} else {
+			showUpload();
+		}
 	}
 	
 	public void refreshListAdapter() {
@@ -226,13 +421,13 @@
 
 	@Override
 	public boolean onPrepareOptionsMenu(Menu menu) {
-		MenuItem upload = menu.findItem(R.id.option_upload);
+		MenuItem uploadMenuItem = menu.findItem(R.id.option_upload);
 		if (mAdapter.getPathTool().isAtRoot() &&
 				!VolumeType.ROOT.equals(mAdapter.getPathTool().getType())) {
-			upload.setEnabled(false);
+			uploadMenuItem.setEnabled(false);
 		} else {
-			// TODO Disable upload in case of no connection.
-			upload.setEnabled(true);
+			// TODO karni: disable upload in case of no connection.
+			uploadMenuItem.setEnabled(true);
 		}
 		return super.onPrepareOptionsMenu(menu);
 	}
@@ -242,13 +437,13 @@
 		Log.d(TAG, "onOptionsItemSelected");
 		switch (item.getItemId()) {
 		case R.id.option_upload_image:
-			onMenuUploadImage();
+			onUploadImage();
 			return true;
 		case R.id.option_upload_video:
-			onMenuUploadVideo();
+			onUploadVideo();
 			return true;
 		case R.id.option_upload_audio:
-			onMenuUploadAudio();
+			onUploadAudio();
 			return true;
 
 		default:
@@ -256,7 +451,7 @@
 		}
 	}
 	
-	public void onMenuUploadImage() {
+	public void onUploadImage() {
 		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
 		intent.setType("image/*");
 		
@@ -265,7 +460,7 @@
 		startActivityForResult(chooser, REQUEST_GET_FILE);
 	}
 	
-	public void onMenuUploadVideo() {
+	public void onUploadVideo() {
 		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
 		intent.setType("video/*");
 		
@@ -274,7 +469,7 @@
 		startActivityForResult(chooser, REQUEST_GET_FILE);
 	}
 	
-	public void onMenuUploadAudio() {
+	public void onUploadAudio() {
 		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
 		intent.setType("audio/*");
 		
@@ -314,8 +509,6 @@
 		}
 	}
 	
-	protected abstract CharSequence getActionBarTitle();
-	
 	private void showHeader() {
 		runOnUiThread(new Runnable() {
 			public void run() {
@@ -329,7 +522,7 @@
 				mListHeader.startAnimation(AnimationUtils.makeInAnimation(
 						CustomListActivity.this, false));
 				mListHeader.setVisibility(View.VISIBLE);
-				mActionbar.showActionbarIndeterminate();
+				showProgress();
 			}
 		});
 	}
@@ -340,7 +533,7 @@
 				mListHeader.startAnimation(AnimationUtils.makeOutAnimation(
 						CustomListActivity.this, false));
 				mListHeader.setVisibility(View.GONE);
-				mActionbar.hideActionbarIndeterminate();
+				hideProgress();
 			}
 		});
 	}
@@ -416,80 +609,66 @@
 			break;
 		}
 	}
-	
+
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v,
 			ContextMenuInfo menuInfo) {
-		super.onCreateContextMenu(menu, v, menuInfo);
+		// Use this method as a hook, but don't show the default context menu.
+		closeContextMenu();
 		
 		final AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
+		mContextMenuSourceViewHolder = (ViewHolder) info.targetView.getTag();
 		final String type = (String) info.targetView.getTag(R.string.tag_type);
-		// inflate proper context menu for selected element
-		MenuInflater inflater = getMenuInflater();
-		if (FileType.DIRECTORY.toString().equals(type))
-			// It's a directory.	
-			inflater.inflate(R.menu.context_menu_directory, menu);
-		else {
-			// It's a file.
-			inflater.inflate(R.menu.context_menu_file, menu);
+		
+		mQuickActionBar = new QuickActionBar(this);
+		
+		if (FileType.DIRECTORY.toString().equals(type)) {
+			mQuickActionBar.addQuickAction(new MyQuickAction(this,
+					R.drawable.gd_action_bar_list,
+					R.string.context_open));
+			mQuickActionBar.addQuickAction(new MyQuickAction(this,
+					R.drawable.gd_action_bar_star,
+					R.string.context_sync));
+			
+			mQuickActionBar.setOnQuickActionClickListener(
+					mOnDirectoryQuickActionBarClickListener);
+		} else if (FileType.FILE.toString().equals(type)) {
+			mQuickActionBar.addQuickAction(new MyQuickAction(this,
+					R.drawable.gd_action_bar_list,
+					R.string.context_open));
+			mQuickActionBar.addQuickAction(new MyQuickAction(this,
+					R.drawable.gd_action_bar_info,
+					R.string.context_download));
 			
 			if (!FilesUtilities.getIsNodeSyncable(info.id)) {
-				menu.findItem(R.id.file_sync).setVisible(true);
-				menu.findItem(R.id.file_dont_sync).setVisible(false);
+				mQuickActionBar.addQuickAction(new MyQuickAction(this,
+						R.drawable.gd_action_bar_star,
+						R.string.context_sync));
 			} else {
-				menu.findItem(R.id.file_sync).setVisible(false);
-				menu.findItem(R.id.file_dont_sync).setVisible(true);
+				mQuickActionBar.addQuickAction(new MyQuickAction(this,
+						R.drawable.gd_action_bar_star,
+						R.string.context_dont_sync));
 			}
 			
 			String url = FilesUtilities.getPublicUrl(info.id);
-			if (url != null && !"".equals(url)) {
-				menu.findItem(R.id.file_publish).setVisible(false);
-				menu.findItem(R.id.file_copy_link).setVisible(true);
-				menu.findItem(R.id.file_unpublish).setVisible(true);
+			if (!(url == null || "".equals(url))) {
+				mQuickActionBar.addQuickAction(new MyQuickAction(this,
+						R.drawable.gd_action_bar_star,
+						R.string.context_unpublish));
+				mQuickActionBar.addQuickAction(new MyQuickAction(this,
+						R.drawable.gd_action_bar_export,
+						R.string.context_copy_link));
 			} else {
-				menu.findItem(R.id.file_publish).setVisible(true);
-				menu.findItem(R.id.file_copy_link).setVisible(false);
-				menu.findItem(R.id.file_unpublish).setVisible(false);
+				mQuickActionBar.addQuickAction(new MyQuickAction(this,
+						R.drawable.gd_action_bar_star,
+						R.string.context_publish));
 			}
-		}
-		menu.setHeaderTitle(
-				(CharSequence) info.targetView.getTag(R.string.tag_filename));
-	}
-
-	@Override
-	public boolean onContextItemSelected(MenuItem item) {
-		AdapterContextMenuInfo info =
-				(AdapterContextMenuInfo) item.getMenuInfo();
-		ViewHolder holder = (ViewHolder) info.targetView.getTag();
-		switch (item.getItemId()) {
-		case R.id.file_open:
-			openFile(info.id);
-			return true;
-		case R.id.file_download:
-			downloadFile(info.id);
-			return true;
-		case R.id.directory_open:
-			mAdapter.cd(this, info.id);
-			return true;
-		case R.id.file_sync:
-			holder.star.performClick();
-			break;
-		case R.id.file_dont_sync:
-			holder.star.performClick();
-			break;
-		case R.id.file_publish:
-			publishFile(info.id);
-			break;
-		case R.id.file_copy_link:
-			copyPublicLink(info.id);
-			break;
-		case R.id.file_unpublish:
-			unpublishFile(info.id);
-			break;
-		default:
-			break;
-		}
-		return super.onContextItemSelected(item);
+			
+			mQuickActionBar.setOnQuickActionClickListener(
+					mOnFileQuickActionBarClickListener);
+		}
+		
+		mQuickActionBar.show(info.targetView);
 	}
 	
 	private void copyPublicLink(final Long id) {
@@ -506,8 +685,9 @@
 	
 	private void publishFile(final Long id) {
 		String volumeId = null, nodeId = null;
-		Cursor c = FilesDatabase.rawQuery("SELECT file_volume, file_node FROM files " +
-				"WHERE _id=?", new String[]{id.toString()});
+		Cursor c = FilesDatabase.rawQuery(
+				"SELECT file_volume, file_node FROM files WHERE _id=?",
+				new String[]{id.toString()});
 		if (c.moveToFirst()) {
 			volumeId = c.getString(c.getColumnIndex(Files.VOLUME));
 			nodeId = c.getString(c.getColumnIndex(Files.NODE));
@@ -521,6 +701,7 @@
 				Util.save2Clipboard(CustomListActivity.this, publicUrl);
 				runOnUiThread(new Runnable() {
 					public void run() {
+						mAdapter.getCursor().requery();
 						Toast.makeText(CustomListActivity.this,
 								"Copied to clipboard", Toast.LENGTH_SHORT)
 								.show();
@@ -540,8 +721,9 @@
 	
 	private void unpublishFile(final Long id) {
 		String volumeId = null, nodeId = null;
-		Cursor c = FilesDatabase.rawQuery("SELECT file_volume, file_node FROM files " +
-				"WHERE _id=?", new String[]{id.toString()});
+		Cursor c = FilesDatabase.rawQuery(
+				"SELECT file_volume, file_node FROM files WHERE _id=?",
+				new String[]{id.toString()});
 		if (c.moveToFirst()) {
 			volumeId = c.getString(c.getColumnIndex(Files.VOLUME));
 			nodeId = c.getString(c.getColumnIndex(Files.NODE));
@@ -551,9 +733,10 @@
 				nodeId, false).getDeferred();
 		d.addCallbacks(new Callback<String>() {
 			public Object callback(String publicUrl) throws Exception {
-				FilesUtilities.setPublicUrl(id, "");
+				FilesUtilities.setPublicUrl(id, null);
 				runOnUiThread(new Runnable() {
 					public void run() {
+						mAdapter.getCursor().requery();
 						Toast.makeText(CustomListActivity.this, "Unpublished",
 								Toast.LENGTH_SHORT).show();
 					}
@@ -573,10 +756,10 @@
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
-		Log.d(TAG, "onListItemClick");
 		try {
 			if (FilesUtilities.isDirectory(id)) {
 				mAdapter.cd(this, id);
+				mUploadItem.getItemView().setVisibility(View.VISIBLE);
 			} else {
 				openFile(id);
 			}
@@ -630,7 +813,8 @@
 
 		@Override
 		protected void onPostExecute(Void result) {
-			mProgressDialog.dismiss();
+			if (mProgressDialog != null && mProgressDialog.isShowing())
+				mProgressDialog.dismiss();
 			if (!mResult)
 				Util.showLongToast(CustomListActivity.this,
 						"Uncheck the parent folder first.");
@@ -645,27 +829,91 @@
 		if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
 			if (mAdapter.cd(this)) {
 				// but it wasn't at root, so changed to directory up
+				if (mAdapter.getPathTool().isAtRoot()
+						&& !VolumeType.ROOT.equals(mAdapter.getPathTool()
+								.getType())) {
+					hideUpload();
+				} else {
+					// TODO Disable upload in case of no connection.
+					showUpload();
+				}
 				return true;
 			}
 		}
 		return super.onKeyDown(keyCode, event);
 	}
 	
-	// Action bar stuff:
-	
-	public void setActionbarIndeterminateVisibility(int visibility) {
-		mActionbar.setActionbarIndeterminateVisibility(visibility);
-	}
-
-	public void setActionbarSearchVisibility(int visibility) {
-		mActionbar.setActionbarSearchVisibility(visibility);
-	}
-
-	public void setActionbarTitle(CharSequence title) {
-		mActionbar.setActionbarTitle(title);
-	}
-
-	public void setActionbarUploadVisibility(int visibility) {
-		mActionbar.setActionbarUploadVisibility(visibility);
-	}
+	private void showProgress() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mLoaderItem != null)
+					mLoaderItem.setLoading(true);
+			}
+		});
+    }
+    
+    private void hideProgress() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mLoaderItem != null)
+					mLoaderItem.setLoading(false);
+			}
+		});
+    }
+    
+    private void maybeHideProgress() {
+    	if (!UbuntuOneFiles.sSyncInProgress)
+			hideProgress();
+    }
+    
+    private void showUpload() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mUploadItem != null)
+					mUploadItem.getItemView().setVisibility(View.VISIBLE);
+			}
+		});
+    }
+    
+    private void hideUpload() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mUploadItem != null)
+					mUploadItem.getItemView().setVisibility(View.GONE);
+			}
+		});
+    }
+    
+    private void awaitWithListEmptyTextView() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				mEmptyTextView.setText(getString(R.string.please_wait));
+			}
+		});
+    }
+    
+    private void resetListEmptyTextView() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				mEmptyTextView.setText(getText(R.string.no_items));
+			}
+		});
+    }
+    
+    private static class MyQuickAction extends QuickAction {
+        
+        private static final ColorFilter BLACK_CF =
+        		new LightingColorFilter(Color.BLACK, Color.BLACK);
+
+        public MyQuickAction(Context ctx, int drawableId, int titleId) {
+            super(ctx, buildDrawable(ctx, drawableId), titleId);
+        }
+        
+        private static Drawable buildDrawable(Context ctx, int drawableId) {
+            Drawable d = ctx.getResources().getDrawable(drawableId);
+            d.setColorFilter(BLACK_CF);
+            return d;
+        }
+        
+    }
 }

=== modified file 'src/com/ubuntuone/android/files/ui/DashboardActivity.java'
--- src/com/ubuntuone/android/files/ui/DashboardActivity.java	2011-03-08 00:40:29 +0000
+++ src/com/ubuntuone/android/files/ui/DashboardActivity.java	2011-04-04 13:36:49 +0000
@@ -22,7 +22,11 @@
 
 package com.ubuntuone.android.files.ui;
 
-import android.app.Activity;
+import greendroid.app.GDActivity;
+import greendroid.widget.ActionBar;
+import greendroid.widget.ActionBarItem;
+import greendroid.widget.LoaderActionBarItem;
+import greendroid.widget.ActionBarItem.Type;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -53,7 +57,7 @@
 import com.ubuntuone.android.files.util.Util;
 import com.ubuntuone.android.util.log.Log;
 
-public class DashboardActivity extends Activity implements IActionbar {
+public class DashboardActivity extends GDActivity {
 	
 	private static final String TAG = DashboardActivity.class.getSimpleName();
 	
@@ -61,7 +65,13 @@
 	
 	private Handler mHandler;
 	
-	private Actionbar mActionbar;
+	private LoaderActionBarItem mLoaderItem;
+	
+	
+	private static final int ACTION_BAR_SYNC = 0;
+	
+	private static final int ACTION_BAR_SETTINGS = 1;
+	
 	
     /** Called when the activity is first created. */
     @Override
@@ -82,16 +92,12 @@
         }
         
         setTheme(R.style.Theme_U1F);
-		setContentView(R.layout.activity_dashboard);
-		mActionbar = new Actionbar(this);
-		
-		// XXX Setup onClickListeners for backward compatibility? Now using XML.
-		Button filesButton = (Button) findViewById(R.id.home_btn_files);
-		filesButton.setOnClickListener(new OnClickListener() {
-			public void onClick(View v) {
-				onFilesClick(v);
-			}
-		});
+		setActionBarContentView(R.layout.activity_dashboard);
+		mLoaderItem = (LoaderActionBarItem) addActionBarItem(getActionBar()
+				.newActionBarItem(LoaderActionBarItem.class)
+				.setDrawable(R.drawable.gd_action_bar_refresh),
+				ActionBar.NONE);
+		addActionBarItem(Type.Settings);
     }
     
     private class DashboardHandlerCallback implements Handler.Callback {
@@ -111,20 +117,18 @@
 					dismissDialog(DIALOG_INIT);
 				break;
 			case R.string.QM_WORKING:
-				mActionbar.showActionbarIndeterminate();
+				showProgress();
 				break;
 			case R.string.QM_IDLE:
-				if (!UbuntuOneFiles.sSyncInProgress)
-					mActionbar.hideActionbarIndeterminate();
+				maybeHideProgress();
 				break;
 			case R.string.SYS_SYNCING:
-				mActionbar.showActionbarIndeterminate();
+				showProgress();
 				break;
 			case R.string.SYS_SYNC_ERROR:
+				//$FALL-THROUGH$
 			case R.string.SYS_SYNCED:
-				 // this hide() can cause problems before we move sync to AQ 
-				if (!UbuntuOneFiles.isQueueWorking())
-					mActionbar.hideActionbarIndeterminate();
+				maybeHideProgress();
 				break;
 			default:
 				break;
@@ -134,7 +138,25 @@
 		
     }
     
-    private int mInForeground = -1;
+    @Override
+	public boolean onHandleActionBarItemClick(ActionBarItem item, int position) {
+		switch (position) {
+		case ACTION_BAR_SYNC:
+			mEventQueue.push(Message.obtain(null, R.string.CMD_SYNC));
+			break;
+		case ACTION_BAR_SETTINGS:
+			Intent intent = new Intent(this, Preferences.class);
+			startActivity(intent);
+			break;
+			
+		default:
+			Log.w(TAG, "unknown dashboard quick action");
+			break;
+		}
+		return super.onHandleActionBarItemClick(item, position);
+	}
+
+	private int mInForegroundToken = -1;
     
     @Override
 	protected void onStart() {
@@ -143,7 +165,7 @@
 				&& UbuntuOneFiles.hasValidTokens()) {
 			Toast.makeText(this, "Working off-line", Toast.LENGTH_LONG).show();
 		}
-		mInForeground = UbuntuOneFiles.setForegroundActivity(this);
+		mInForegroundToken = UbuntuOneFiles.setForegroundActivity(this);
 		mEventQueue.subscribe(mHandler);
 		
 		handleAnyCrash();
@@ -161,17 +183,17 @@
 		}
 		
 		if (UbuntuOneFiles.isQueueWorking() || UbuntuOneFiles.sSyncInProgress) {
-			mActionbar.showActionbarIndeterminate();
+			showProgress();
 		} else {
 			if (!UbuntuOneFiles.sSyncInProgress)
-				mActionbar.hideActionbarIndeterminate();
+				hideProgress();
 		}
 	}
     
     @Override
 	protected void onStop() {
     	mEventQueue.unsubscribe(mHandler);
-    	UbuntuOneFiles.clearForegroundActivity(mInForeground);
+    	UbuntuOneFiles.clearForegroundActivity(mInForegroundToken);
 		super.onStop();
 	}
 
@@ -269,7 +291,7 @@
 						Log.submitLogs(DashboardActivity.this);
 					}
 					dialog.dismiss();
-					Preferences.setCrashFlag(false);
+					Preferences.setOopsFlag(false);
 				}
 			};
     
@@ -328,8 +350,8 @@
     	
     	if (!tokensAvailable) {
 			// Load login UI.
-			setContentView(R.layout.activity_login);
-			mActionbar = new Actionbar(this);
+			setActionBarContentView(R.layout.activity_login);
+			
 			Button loginButton = (Button) findViewById(R.id.loginButton);
 			
 			boolean isNetworkAvailable = ConfigUtilities.isNetworkAvailable(this); 
@@ -353,7 +375,7 @@
 					}
 					
 					v.setEnabled(false);
-					setActionbarIndeterminateVisibility(View.VISIBLE);
+					showProgress();
 					Toast.makeText(DashboardActivity.this, "Launching browser",
 							Toast.LENGTH_LONG).show();
 					
@@ -392,20 +414,28 @@
 		}
 		return super.onKeyDown(keyCode, event);
 	}
-
-	public void setActionbarIndeterminateVisibility(int visibility) {
-		mActionbar.setActionbarIndeterminateVisibility(visibility);
-	}
-
-	public void setActionbarSearchVisibility(int visibility) {
-		mActionbar.setActionbarSearchVisibility(visibility);
-	}
-
-	public void setActionbarTitle(CharSequence title) {
-		mActionbar.setActionbarTitle(title);
-	}
-
-	public void setActionbarUploadVisibility(int visibility) {
-		mActionbar.setActionbarUploadVisibility(visibility);
-	}
+	
+    private void showProgress() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mLoaderItem != null)
+					mLoaderItem.setLoading(true);
+			}
+		});
+    }
+    
+    private void hideProgress() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mLoaderItem != null)
+					mLoaderItem.setLoading(false);
+			}
+		});
+    }
+    
+    private void maybeHideProgress() {
+    	if (!UbuntuOneFiles.sSyncInProgress)
+			hideProgress();
+    }
+	
 }
\ No newline at end of file

=== modified file 'src/com/ubuntuone/android/files/ui/FilesActivity.java'
--- src/com/ubuntuone/android/files/ui/FilesActivity.java	2011-01-29 16:22:20 +0000
+++ src/com/ubuntuone/android/files/ui/FilesActivity.java	2011-04-04 13:36:49 +0000
@@ -23,9 +23,7 @@
 package com.ubuntuone.android.files.ui;
 
 import android.os.Bundle;
-import android.view.View;
 
-import com.ubuntuone.android.files.R;
 import com.ubuntuone.android.files.util.CustomListActivityAdapter;
 import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 
@@ -34,14 +32,9 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setActionbarUploadVisibility(View.GONE);
+		// TODO karni AB: setActionbarUploadVisibility(View.GONE);
 		setListAdapter(CustomListActivityAdapter.buildAdapter(
 				this, VolumeType.ROOT));
 	}
-
-	@Override
-	protected CharSequence getActionBarTitle() {
-		return getResources().getText(R.string.title_files);
-	}
 	
 }

=== modified file 'src/com/ubuntuone/android/files/ui/SharesActivity.java'
--- src/com/ubuntuone/android/files/ui/SharesActivity.java	2011-01-29 16:22:20 +0000
+++ src/com/ubuntuone/android/files/ui/SharesActivity.java	2011-04-04 13:36:49 +0000
@@ -23,9 +23,7 @@
 package com.ubuntuone.android.files.ui;
 
 import android.os.Bundle;
-import android.view.View;
 
-import com.ubuntuone.android.files.R;
 import com.ubuntuone.android.files.util.CustomListActivityAdapter;
 import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 
@@ -34,15 +32,8 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		// At top level, upload button invisible.
-		setActionbarUploadVisibility(View.GONE);
 		setListAdapter(CustomListActivityAdapter.buildAdapter(
 				this, VolumeType.SHARE));
 	}
-
-	@Override
-	protected CharSequence getActionBarTitle() {
-		return getResources().getText(R.string.title_shares);
-	}
 	
 }

=== modified file 'src/com/ubuntuone/android/files/ui/StatusActivity.java'
--- src/com/ubuntuone/android/files/ui/StatusActivity.java	2011-02-21 01:32:08 +0000
+++ src/com/ubuntuone/android/files/ui/StatusActivity.java	2011-04-04 13:36:49 +0000
@@ -22,12 +22,16 @@
 
 package com.ubuntuone.android.files.ui;
 
+import greendroid.app.GDActivity;
+import greendroid.widget.ActionBar;
+import greendroid.widget.LoaderActionBarItem;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import android.app.Activity;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -39,9 +43,11 @@
 import com.ubuntuone.android.files.util.ServicesStatus.ServiceNames;
 import com.ubuntuone.android.files.util.ServicesStatus.ServiceTags;
 
-public class StatusActivity extends Activity implements IActionbar {
-	
-	private Actionbar mActionbar;
+public class StatusActivity extends GDActivity {
+	
+	private Handler mHandler;
+	
+	private LoaderActionBarItem mLoaderItem;
 	
 	private ListView listView;
 	
@@ -56,8 +62,13 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_status);
-		mActionbar = new Actionbar(this);
+		setActionBarContentView(R.layout.activity_status);
+		mLoaderItem = (LoaderActionBarItem) addActionBarItem(getActionBar()
+				.newActionBarItem(LoaderActionBarItem.class)
+				.setDrawable(R.drawable.gd_action_bar_refresh),
+				ActionBar.NONE);
+		
+		mHandler = new Handler();
 		
 		services = new ArrayList<ServicesStatus.ServiceStatusRecord>();
 		listView = (ListView)findViewById(R.id.service_list);
@@ -104,7 +115,7 @@
 			super.onPreExecute();
 			Toast.makeText(StatusActivity.this, "Refreshing",
 					Toast.LENGTH_SHORT).show();
-			setActionbarIndeterminateVisibility(View.VISIBLE);
+			showProgress();
 		}
 		
 		@Override
@@ -123,7 +134,7 @@
 		@Override
 		protected void onPostExecute(HashMap<String, Integer> result) {
 			super.onPostExecute(result);
-			setActionbarIndeterminateVisibility(View.INVISIBLE);
+			hideProgress();
 			if (exceptionMsg != null) {
 				Toast.makeText(StatusActivity.this, exceptionMsg, 
 						Toast.LENGTH_SHORT).show();
@@ -194,20 +205,22 @@
 		
 	};
 	
-	public void setActionbarIndeterminateVisibility(int visibility) {
-		mActionbar.setActionbarIndeterminateVisibility(visibility);
-	}
-
-	public void setActionbarSearchVisibility(int visibility) {
-		mActionbar.setActionbarSearchVisibility(visibility);
-	}
-
-	public void setActionbarTitle(CharSequence title) {
-		mActionbar.setActionbarTitle(title);
-	}
-
-	public void setActionbarUploadVisibility(int visibility) {
-		mActionbar.setActionbarUploadVisibility(visibility);
-	}
+    private void showProgress() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mLoaderItem != null)
+					mLoaderItem.setLoading(true);
+			}
+		});
+    }
+    
+    private void hideProgress() {
+    	mHandler.post(new Runnable() {
+			public void run() {
+				if (mLoaderItem != null)
+					mLoaderItem.setLoading(false);
+			}
+		});
+    }
 
 }

=== modified file 'src/com/ubuntuone/android/files/ui/UdfsActivity.java'
--- src/com/ubuntuone/android/files/ui/UdfsActivity.java	2011-01-29 16:22:20 +0000
+++ src/com/ubuntuone/android/files/ui/UdfsActivity.java	2011-04-04 13:36:49 +0000
@@ -23,9 +23,7 @@
 package com.ubuntuone.android.files.ui;
 
 import android.os.Bundle;
-import android.view.View;
 
-import com.ubuntuone.android.files.R;
 import com.ubuntuone.android.files.util.CustomListActivityAdapter;
 import com.ubuntuone.storageprotocol.StorageProtocol.Volumes.VolumeType;
 
@@ -34,15 +32,8 @@
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		// At top level, upload button invisible.
-		setActionbarUploadVisibility(View.GONE);
 		setListAdapter(CustomListActivityAdapter.buildAdapter(
 				this, VolumeType.UDF));
 	}
-
-	@Override
-	protected CharSequence getActionBarTitle() {
-		return getResources().getText(R.string.title_udfs);
-	}
 	
 }

=== modified file 'src/com/ubuntuone/android/files/util/ConfigUtilities.java'
--- src/com/ubuntuone/android/files/util/ConfigUtilities.java	2011-03-11 00:21:09 +0000
+++ src/com/ubuntuone/android/files/util/ConfigUtilities.java	2011-04-04 13:36:49 +0000
@@ -97,12 +97,18 @@
 				.isBackgroundDataAllowed(ctx);
 		
 		if (!wifiConnected && !mobileConnected) {
+			Log.i(TAG, "can not sync, no network");
 			return CanISync.NO_NETWORK;
 		}
 		
+		if (!syncInBackground) {
+			Log.i(TAG, "can not sync, background data disabled");
+			return CanISync.NO_BACKGROUND;
+		}
+		
 		int preferredNetwork = -1;
 		
-		if (mobileConnected && syncOnMobile && !isRoaming)
+		if (mobileConnected && syncOnMobile)
 			preferredNetwork = ConnectivityManager.TYPE_MOBILE;
 		
 		// Prever wifi over mobile.
@@ -114,15 +120,13 @@
 			return CanISync.NO_PREFERRED;
 		}
 		
+		if (preferredNetwork == ConnectivityManager.TYPE_MOBILE && isRoaming) {
+			Log.i(TAG, "can not sync, roaming!");
+			return CanISync.ROAMING;
+		}
+		
 		// We are connected and can sync on preferredNetwork.
 		
-		if (!syncInBackground) {
-			Log.i(TAG, "can not sync, background data disabled");
-			return CanISync.NO_BACKGROUND;
-		}
-		
-		// Background data is on, so we're safe to continue.
-		
 		return CanISync.CAN_SYNC;
 	}
 	

=== modified file 'src/com/ubuntuone/android/files/util/CustomListActivityAdapter.java'
--- src/com/ubuntuone/android/files/util/CustomListActivityAdapter.java	2011-03-25 10:22:25 +0000
+++ src/com/ubuntuone/android/files/util/CustomListActivityAdapter.java	2011-04-04 13:36:49 +0000
@@ -59,8 +59,6 @@
 	
 	private LayoutInflater mInflater;
 	
-	private static String[] sFilesDefaultProjection;
-	
 	
 	private static int sRemoteFileBackgroundColor;
 
@@ -95,6 +93,13 @@
 				holder.icon.setImageResource(R.drawable.file);
 		}
 		
+		final String url = cursor.getString(cursor.getColumnIndex(Files.URL));
+		final boolean isPublished = !(url == null || "".equals(url));
+		int filenameColor = isPublished
+				? context.getResources().getColor(R.color.file_published_text_fg)
+				: context.getResources().getColor(R.color.file_text_fg);
+		holder.filename.setTextColor(filenameColor);
+		
 		// Filename.
 		final String filename = cursor.getString(cursor.getColumnIndex(Files.NAME));
 		holder.filename.setText(filename);
@@ -227,10 +232,8 @@
 	public static CustomListActivityAdapter buildAdapter(
 			final Context context, VolumeType type) {
 		Resources r = context.getResources();
-		sRemoteFileBackgroundColor = r.getColor(R.color.remote_file_background);
+		sRemoteFileBackgroundColor = r.getColor(R.color.remote_file_bg);
 		
-		if (sFilesDefaultProjection == null)
-			sFilesDefaultProjection = Files.getDefaultProjection();
 		if (VolumeType.ROOT.equals(type)) {
 			Log.d(TAG, "building ROOT CustomListActivityAdapter");
 			// Files cursor pointing at the nodes being *content* of Root

=== modified file 'src/com/ubuntuone/android/files/util/MediaUtilities.java'
--- src/com/ubuntuone/android/files/util/MediaUtilities.java	2011-02-25 10:35:51 +0000
+++ src/com/ubuntuone/android/files/util/MediaUtilities.java	2011-04-04 13:36:49 +0000
@@ -43,6 +43,7 @@
 		return count;
 	}
 	
+	@SuppressWarnings("unused")
 	private void uploadImages(Context context, EventQueue eventQueue, long since) {
 		uploadMedia(context, eventQueue, since, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
 	}

=== modified file 'src/com/ubuntuone/android/files/util/SeekbarPreference.java'
--- src/com/ubuntuone/android/files/util/SeekbarPreference.java	2011-03-01 19:36:58 +0000
+++ src/com/ubuntuone/android/files/util/SeekbarPreference.java	2011-04-04 13:36:49 +0000
@@ -8,8 +8,6 @@
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 
-import com.ubuntuone.android.files.R;
-
 public class SeekbarPreference extends Preference implements
 		OnSeekBarChangeListener {
 	

=== modified file 'src/com/ubuntuone/android/storageprotocol/request/RequestHandler.java'
--- src/com/ubuntuone/android/storageprotocol/request/RequestHandler.java	2011-02-05 19:09:58 +0000
+++ src/com/ubuntuone/android/storageprotocol/request/RequestHandler.java	2011-04-04 13:36:49 +0000
@@ -158,6 +158,7 @@
 		requests.remove(id);
 	}
 	
+	@SuppressWarnings("unchecked")
 	public void registerProducer(Callable producer) {
 		this.executor.schedule(producer, 0, TimeUnit.SECONDS);
 	}

=== modified file 'src/com/ubuntuone/android/util/log/ILog.java'
--- src/com/ubuntuone/android/util/log/ILog.java	2010-12-27 14:48:13 +0000
+++ src/com/ubuntuone/android/util/log/ILog.java	2011-04-04 13:36:49 +0000
@@ -27,7 +27,6 @@
 public interface ILog {
 	
 	public void init(Context ctx, String... args);
-	public void register();
 	public void shutdown();
 	public void e(final String tag, final String msg);
 	public void e(final String tag, final String msg, final Throwable tr);

=== modified file 'src/com/ubuntuone/android/util/log/Log.java'
--- src/com/ubuntuone/android/util/log/Log.java	2011-02-21 12:49:15 +0000
+++ src/com/ubuntuone/android/util/log/Log.java	2011-04-04 13:36:49 +0000
@@ -25,7 +25,6 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.PrintStream;
-import java.lang.Thread.UncaughtExceptionHandler;
 
 import android.content.Context;
 import android.content.Intent;
@@ -90,10 +89,6 @@
 		}
 	}
 	
-	public static void register() {
-		sLogger.register();
-	}
-	
 	/**
 	 * This should be called and the end of Log usage, to properly shut it down.
 	 */
@@ -150,8 +145,7 @@
 	 * 
 	 * It will strip any DEBUG or VERBOSE messages.
 	 */
-	public static class ProductionLogger 
-			implements ILog, UncaughtExceptionHandler {
+	public static class ProductionLogger implements ILog {
 		
 		public static final boolean LOGE = 
 			android.util.Log.isLoggable(APP_TAG, android.util.Log.ERROR);
@@ -160,20 +154,13 @@
 		public static final boolean LOGI = 
 			android.util.Log.isLoggable(APP_TAG, android.util.Log.INFO);
 		
-		private static UncaughtExceptionHandler uncaughtExceptionHandler;
-		
 		public void init(Context ctx, String... args) {
 			android.util.Log.i(TAG, "initializing " + 
 					this.getClass().getSimpleName());
-			uncaughtExceptionHandler = this;
-		}
-
-		public void register() {
-			Thread.setDefaultUncaughtExceptionHandler(uncaughtExceptionHandler);
 		}
 
 		public void uncaughtException(Thread thread, Throwable ex) {
-			e(APP_TAG, "uncaught exception!", ex);
+			e(APP_TAG, "uncaught exception!!!", ex);
 		}
 
 		public void shutdown() {
@@ -234,8 +221,7 @@
 	 * 
 	 * It uses static finals to make use of compile time optimization.
 	 */
-	public static class DebugLogger 
-			implements ILog, UncaughtExceptionHandler {
+	public static class DebugLogger implements ILog {
 		
 		private static PrintStream sOutput;
 		
@@ -245,14 +231,9 @@
 		public static final boolean LOGD = true;
 		public static final boolean LOGV = true;
 		
-		private static UncaughtExceptionHandler uncaughtExceptionHandler;
-		
 		public void init(Context ctx, String... args) {
 			android.util.Log.i(TAG, "initializing " + 
 					this.getClass().getSimpleName());
-			uncaughtExceptionHandler = this;
-//			String logsPath = ctx.getFilesDir().getAbsolutePath()
-//					.concat(LOG_DIR);
 			
 			String dataDir = "/sdcard/Android/data"; 
 			android.util.Log.d(TAG, "data dir: " + dataDir);
@@ -268,15 +249,7 @@
 				sOutput = new PrintStream(fout);
 			} catch (Exception e) {
 				android.util.Log.e(TAG, e.getMessage());
-			}  
-		}
-		
-		public void register() {
-			Thread.setDefaultUncaughtExceptionHandler(uncaughtExceptionHandler);
-		}
-		
-		public void uncaughtException(Thread thread, Throwable ex) {
-			e(APP_TAG, "uncaught exception!", ex);
+			}
 		}
 
 		public void shutdown() {
@@ -394,7 +367,7 @@
 		// Unused.
 	}
 	
-	private static final String EMAIL_TARGET = "[e-mail]";
+	private static final String EMAIL_TARGET = "[e-mail]";
 	
 	private static final String EMAIL_SUBJECT = "U1F logs";
 	
@@ -472,7 +445,7 @@
 		deleteLogs(ctx, true);
 	}
 	
-	final static long KB_500 = 1024*1024;
+	final static long MAX_LOG_BYTES = 1024*1024;
 	
 	public static final void deleteLogs(Context ctx, boolean force) {
 		
@@ -494,7 +467,7 @@
 			for (File file : logFiles)
 				size += file.length();
 			
-			if (size > KB_500) {
+			if (size > MAX_LOG_BYTES) {
 				for (File file : logFiles)
 					file.delete();
 			}