Merge branch 'master' into create_folder_button_on_action_bar_for_uploader

Conflicts:
	res/layout/uploader_layout.xml

diff --combined res/layout/uploader_layout.xml
index 6245c8b,2ba4a0b..79b077d
--- 1/res/layout/uploader_layout.xml
--- 2/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@@ -52,16 -52,18 +52,18 @@@
            android:layout_alignParentBottom="true"
            android:orientation="horizontal" >
  
-               <Button
+               <android.support.v7.widget.AppCompatButton
 -                  android:id="@+id/uploader_new_folder"
 +                  android:id="@+id/uploader_cancel"
+                       style="@style/ownCloud.Button"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"
 -                  android:text="@string/uploader_btn_new_folder_text" />
 +                  android:text="@string/common_cancel" />
-               
-               <Button
+ 
+               <android.support.v7.widget.AppCompatButton
                    android:id="@+id/uploader_choose_folder"
+                       style="@style/ownCloud.Button"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"

diff --combined src/com/owncloud/android/ui/activity/Uploader.java
index 8b5be06,7bea4bb..d221bc9
--- 1/src/com/owncloud/android/ui/activity/Uploader.java
--- 2/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@@ -33,8 -33,8 +33,8 @@@ import java.util.Vector
  
  import android.accounts.Account;
  import android.accounts.AccountManager;
- import android.app.AlertDialog;
- import android.app.AlertDialog.Builder;
+ import android.support.v7.app.AlertDialog;
+ import android.support.v7.app.AlertDialog.Builder;
  import android.app.Dialog;
  import android.app.ProgressDialog;
  import android.content.Context;
@@@ -57,8 -57,6 +57,8 @@@ import android.support.v4.app.Fragment
  import android.support.v4.app.FragmentManager;
  import android.support.v4.app.FragmentTransaction;
  import android.support.v7.app.ActionBar;
 +import android.view.Menu;
 +import android.view.MenuInflater;
  import android.view.MenuItem;
  import android.view.View;
  import android.widget.AdapterView;
@@@ -66,6 -64,7 +66,7 @@@ import android.widget.AdapterView.OnIte
  import android.widget.Button;
  import android.widget.EditText;
  import android.widget.ListView;
+ import android.widget.ProgressBar;
  import android.widget.SimpleAdapter;
  import android.widget.Toast;
  
@@@ -148,11 -147,6 +149,6 @@@ public class Uploader extends FileActiv
          if (mAccountSelected) {
              setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
          }
- 
- 
-         ActionBar actionBar = getSupportActionBar();
-         actionBar.setIcon(DisplayUtils.getSeasonalIconId());
- 
      }
  
      @Override
@@@ -208,10 -202,19 +204,19 @@@
          final AlertDialog.Builder builder = new Builder(this);
          switch (id) {
          case DIALOG_WAITING:
-             ProgressDialog pDialog = new ProgressDialog(this);
+             final ProgressDialog pDialog = new ProgressDialog(this, R.style.ProgressDialogTheme);
              pDialog.setIndeterminate(false);
              pDialog.setCancelable(false);
              pDialog.setMessage(getResources().getString(R.string.uploader_info_uploading));
+             pDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+                 @Override
+                 public void onShow(DialogInterface dialog) {
+                     ProgressBar v = (ProgressBar) pDialog.findViewById(android.R.id.progress);
+                     v.getIndeterminateDrawable().setColorFilter(getResources().getColor(R.color.color_accent),
+                             android.graphics.PorterDuff.Mode.MULTIPLY);
+ 
+                 }
+             });
              return pDialog;
          case DIALOG_NO_ACCOUNT:
              builder.setIcon(android.R.drawable.ic_dialog_alert);
@@@ -358,8 -361,9 +363,8 @@@
  
              break;
              
 -        case R.id.uploader_new_folder:
 -            CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(mFile);
 -            dialog.show(getSupportFragmentManager(), "createdirdialog");
 +        case R.id.uploader_cancel:
 +            finish();
              break;
              
              
@@@ -433,7 -437,7 +438,7 @@@
              Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);
              btnChooseFolder.setOnClickListener(this);
              
 -            Button btnNewFolder = (Button) findViewById(R.id.uploader_new_folder);
 +            Button btnNewFolder = (Button) findViewById(R.id.uploader_cancel);
              btnNewFolder.setOnClickListener(this);
              
              mListView.setOnItemClickListener(this);
@@@ -649,26 -653,11 +654,26 @@@
          }
      }
  
 +    @Override
 +    public boolean onCreateOptionsMenu(Menu menu) {
 +        MenuInflater inflater = getMenuInflater();
 +        inflater.inflate(R.menu.main_menu, menu);
 +        menu.findItem(R.id.action_upload).setVisible(false);
 +        menu.findItem(R.id.action_sort).setVisible(false);
 +        menu.findItem(R.id.action_sync_account).setVisible(false);
 +        return true;
 +    }
      
      @Override
      public boolean onOptionsItemSelected(MenuItem item) {
          boolean retval = true;
          switch (item.getItemId()) {
 +            case R.id.action_create_dir:
 +                CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(mFile);
 +                dialog.show(
 +                        getSupportFragmentManager(),
 +                        CreateFolderDialogFragment.CREATE_FOLDER_FRAGMENT);
 +                break;
              case android.R.id.home:
                  if((mParents.size() > 1)) {
                      onBackPressed();