From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 18 Aug 2015 21:20:01 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~43
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7f13b98cc06723b129c7fff05fed188612a9f100?ds=inline;hp=-c

Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
---

7f13b98cc06723b129c7fff05fed188612a9f100
diff --combined res/values/styles.xml
index 765ee448,54e52257..7df7639e
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@@ -24,15 -24,20 +24,15 @@@
  	<style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
      	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
      	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
 -    	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
  		<item name="colorPrimary">@color/primary</item>
  		<item name="colorPrimaryDark">@color/primary_dark</item>
  		<item name="colorAccent">@color/color_accent</item>
  		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
  		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 -		<item name="colorButtonNormal">@color/background_color</item>
 -		<item name="colorControlActivated">@color/primary_dark</item>
 -		<item name="colorControlHighlight">@color/color_accent</item>
  	</style>
  
  	<!-- seperate action bar style for activities without an action bar -->
  	<style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
 -		<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
  		<item name="windowNoTitle">true</item>
  		<item name="windowActionBar">false</item>
  		<item name="colorPrimary">@color/primary</item>
@@@ -40,6 -45,9 +40,6 @@@
  		<item name="colorAccent">@color/color_accent</item>
  		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
  		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 -		<item name="colorButtonNormal">@color/background_color</item>
 -		<item name="colorControlActivated">@color/primary_dark</item>
 -		<item name="colorControlHighlight">@color/color_accent</item>
      </style>
  
  	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
@@@ -53,6 -61,14 +53,14 @@@
  
  	<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog" />
  
+ 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
+ 		<item name="colorAccent">@color/color_accent</item>
+ 		<item name="android:textColorPrimary">@color/primary</item>
+ 		<item name="android:windowFrame">@color/transparent</item>
+ 		<item name="android:windowBackground">@color/transparent</item>
+ 		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
+ 	</style>
+ 
  	<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
  		<item name="colorButtonNormal">@color/primary</item>
  	</style>
diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 13fdb9eb,47985ce4..3db9b7a3
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -251,25 -251,26 +251,43 @@@ public class AuthenticatorActivity exte
          
          /// initialize general UI elements
          initOverallUi();
+ 
+         mOkButton = findViewById(R.id.buttonOK);
+         mOkButton.setOnClickListener(new View.OnClickListener() {
+ 
+             @Override
+             public void onClick(View v) {
+                 onOkClick();
+             }
+         });
+ 
+         mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);
+         mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {
+ 
+             @Override
+             public void onClick(View v) {
+                 checkOcServer();
+             }
+         });
          
          mOkButton = findViewById(R.id.buttonOK);
 +        mOkButton.setOnClickListener(new View.OnClickListener() {
 +
 +            @Override
 +            public void onClick(View v) {
 +                onOkClick();
 +            }
 +        });
 +
 +        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);
 +        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {
 +
 +            @Override
 +            public void onClick(View v) {
 +                checkOcServer();
 +            }
 +        });
 +
  
          /// initialize block to be moved to single Fragment to check server and get info about it 
          initServerPreFragment(savedInstanceState);
@@@ -701,7 -702,7 +719,7 @@@
          
          mHostUrlInput.removeTextChangedListener(mHostUrlInputWatcher);
          mHostUrlInput.setOnFocusChangeListener(null);
 -        
 +
          super.onPause();
      }
      
@@@ -810,8 -811,8 +828,8 @@@
              Intent getServerInfoIntent = new Intent();
              getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);
              getServerInfoIntent.putExtra(
 -                OperationsService.EXTRA_SERVER_URL,
 -                normalizeUrlSuffix(uri)
 +                    OperationsService.EXTRA_SERVER_URL,
 +                    normalizeUrlSuffix(uri)
              );
              if (mOperationsServiceBinder != null) {
                  mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);
@@@ -1623,6 -1624,18 +1641,6 @@@
      }
  
      /**
 -     * Called when the refresh button in the input field for ownCloud host is clicked.
 -     * 
 -     * Performs a new check on the URL in the input field.
 -     * 
 -     * @param view      Refresh 'button'
 -     */
 -    public void onRefreshClick(View view) {
 -        checkOcServer();
 -    }
 -
 -
 -    /**
       * Called when the eye icon in the password field is clicked.
       * 
       * Toggles the visibility of the password in the field.