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

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

diff --combined res/values/styles.xml
index 765ee44,54e5225..7df7639
--- 1/res/values/styles.xml
--- 2/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 13fdb9e,47985ce..3db9b7a
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/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
          \r
          /// initialize general UI elements\r
          initOverallUi();\r
+ \r
+         mOkButton = findViewById(R.id.buttonOK);\r
+         mOkButton.setOnClickListener(new View.OnClickListener() {\r
+ \r
+             @Override\r
+             public void onClick(View v) {\r
+                 onOkClick();\r
+             }\r
+         });\r
+ \r
+         mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
+         mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
+ \r
+             @Override\r
+             public void onClick(View v) {\r
+                 checkOcServer();\r
+             }\r
+         });\r
          \r
          mOkButton = findViewById(R.id.buttonOK);\r
 +        mOkButton.setOnClickListener(new View.OnClickListener() {\r
 +\r
 +            @Override\r
 +            public void onClick(View v) {\r
 +                onOkClick();\r
 +            }\r
 +        });\r
 +\r
 +        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
 +        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
 +\r
 +            @Override\r
 +            public void onClick(View v) {\r
 +                checkOcServer();\r
 +            }\r
 +        });\r
 +\r
  \r
          /// initialize block to be moved to single Fragment to check server and get info about it \r
          initServerPreFragment(savedInstanceState);\r
@@@ -701,7 -702,7 +719,7 @@@
          \r
          mHostUrlInput.removeTextChangedListener(mHostUrlInputWatcher);\r
          mHostUrlInput.setOnFocusChangeListener(null);\r
 -        \r
 +\r
          super.onPause();\r
      }\r
      \r
@@@ -810,8 -811,8 +828,8 @@@
              Intent getServerInfoIntent = new Intent();\r
              getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);\r
              getServerInfoIntent.putExtra(\r
 -                OperationsService.EXTRA_SERVER_URL,\r
 -                normalizeUrlSuffix(uri)\r
 +                    OperationsService.EXTRA_SERVER_URL,\r
 +                    normalizeUrlSuffix(uri)\r
              );\r
              if (mOperationsServiceBinder != null) {\r
                  mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);\r
@@@ -1623,6 -1624,18 +1641,6 @@@
      }\r
  \r
      /**\r
 -     * Called when the refresh button in the input field for ownCloud host is clicked.\r
 -     * \r
 -     * Performs a new check on the URL in the input field.\r
 -     * \r
 -     * @param view      Refresh 'button'\r
 -     */\r
 -    public void onRefreshClick(View view) {\r
 -        checkOcServer();\r
 -    }\r
 -\r
 -\r
 -    /**\r
       * Called when the eye icon in the password field is clicked.\r
       * \r
       * Toggles the visibility of the password in the field. \r