projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a82db4
)
visual fix for Progress DialogFragment(s)
author
Andy Scherzinger
<info@andy-scherzinger.de>
Tue, 18 Aug 2015 11:08:58 +0000
(13:08 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Tue, 18 Aug 2015 11:08:58 +0000
(13:08 +0200)
res/values/styles.xml
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/Uploader.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
patch
|
blob
|
blame
|
history
diff --git
a/res/values/styles.xml
b/res/values/styles.xml
index
8d9a275
..
e9b486b
100644
(file)
--- a/
res/values/styles.xml
+++ b/
res/values/styles.xml
@@
-61,6
+61,11
@@
<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog" />
<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog" />
+ <style name="ProgressDialogTheme" parent="ownCloud.Dialog">
+ <item name="android:windowFrame">@null</item>
+ <item name="android:windowBackground">@null</item>
+ </style>
+
<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
<item name="colorButtonNormal">@color/primary</item>
<item name="colorControlActivated">@color/primary_dark</item>
<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
<item name="colorButtonNormal">@color/primary</item>
<item name="colorControlActivated">@color/primary_dark</item>
diff --git
a/src/com/owncloud/android/ui/activity/Uploader.java
b/src/com/owncloud/android/ui/activity/Uploader.java
index
8ff505b
..
7f8ac9d
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/Uploader.java
+++ b/
src/com/owncloud/android/ui/activity/Uploader.java
@@
-201,7
+201,7
@@
public class Uploader extends FileActivity
final AlertDialog.Builder builder = new Builder(this);
switch (id) {
case DIALOG_WAITING:
final AlertDialog.Builder builder = new Builder(this);
switch (id) {
case DIALOG_WAITING:
- ProgressDialog pDialog = new ProgressDialog(this);
+ ProgressDialog pDialog = new ProgressDialog(this
, R.style.ProgressDialogTheme
);
pDialog.setIndeterminate(false);
pDialog.setCancelable(false);
pDialog.setMessage(getResources().getString(R.string.uploader_info_uploading));
pDialog.setIndeterminate(false);
pDialog.setCancelable(false);
pDialog.setMessage(getResources().getString(R.string.uploader_info_uploading));
diff --git
a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
index
6f4b680
..
442e706
100644
(file)
--- a/
src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/
src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
@@
-59,7
+59,7
@@
public class IndeterminateProgressDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
/// create indeterminate progress dialog
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
/// create indeterminate progress dialog
- final ProgressDialog dialog = new ProgressDialog(getActivity());
+ final ProgressDialog dialog = new ProgressDialog(getActivity()
, R.style.ProgressDialogTheme
);
dialog.setIndeterminate(true);
/// set message
dialog.setIndeterminate(true);
/// set message