浏览代码

Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices

Andy Scherzinger 9 年之前
父节点
当前提交
abb6e2dbd5

+ 11 - 0
res/values/styles.xml

@@ -28,6 +28,7 @@
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
+		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 	</style>
 	</style>
 
 
 	<!-- seperate action bar style for activities without an action bar -->
 	<!-- seperate action bar style for activities without an action bar -->
@@ -38,12 +39,22 @@
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
+		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
     </style>
     </style>
 
 
 	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
 	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
 		<item name="colorAccent">@color/white</item>
 		<item name="colorAccent">@color/white</item>
 	</style>
 	</style>
 
 
+	<style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+		<item name="colorAccent">@color/color_accent</item>
+		<item name="android:textColorPrimary">@color/primary</item>
+	</style>
+
+	<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog">
+		
+	</style>
+
 	<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
 	<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
 		<item name="colorButtonNormal">@color/primary</item>
 		<item name="colorButtonNormal">@color/primary</item>
 	</style>
 	</style>

+ 1 - 1
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -26,7 +26,7 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.AuthenticatorException;
 import android.annotation.TargetApi;
 import android.annotation.TargetApi;
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentResolver;

+ 2 - 2
src/com/owncloud/android/ui/activity/Uploader.java

@@ -33,8 +33,8 @@ import java.util.Vector;
 
 
 import android.accounts.Account;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 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.Dialog;
 import android.app.ProgressDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Context;

+ 1 - 1
src/com/owncloud/android/ui/dialog/ChangelogDialog.java

@@ -19,7 +19,7 @@
 
 
 package com.owncloud.android.ui.dialog;
 package com.owncloud.android.ui.dialog;
 
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Bundle;

+ 1 - 1
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java

@@ -21,7 +21,7 @@
 
 
 package com.owncloud.android.ui.dialog;
 package com.owncloud.android.ui.dialog;
 
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Bundle;

+ 1 - 1
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java

@@ -25,7 +25,7 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Bundle;

+ 2 - 2
src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java

@@ -22,9 +22,9 @@ package com.owncloud.android.ui.dialog;
 import com.owncloud.android.R;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
-import android.app.AlertDialog.Builder;
+import android.support.v7.app.AlertDialog.Builder;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.DialogFragment;

+ 1 - 1
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java

@@ -25,7 +25,7 @@ package com.owncloud.android.ui.dialog;
  * 
  * 
  *  Triggers the rename operation. 
  *  Triggers the rename operation. 
  */
  */
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Bundle;

+ 1 - 1
src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java

@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.ComponentName;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Context;

+ 1 - 1
src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java

@@ -18,7 +18,7 @@
  */
  */
 package com.owncloud.android.ui.dialog;
 package com.owncloud.android.ui.dialog;
 
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Intent;

+ 1 - 1
src/com/owncloud/android/ui/dialog/UploadSourceDialogFragment.java

@@ -20,7 +20,7 @@
 package com.owncloud.android.ui.dialog;
 package com.owncloud.android.ui.dialog;
 
 
 import android.accounts.Account;
 import android.accounts.Account;
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Intent;

+ 1 - 1
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -21,7 +21,7 @@ package com.owncloud.android.ui.preview;
 
 
 import android.accounts.Account;
 import android.accounts.Account;
 import android.app.Activity;
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface;

+ 1 - 1
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java

@@ -26,7 +26,7 @@ import com.owncloud.android.media.MediaService;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileActivity;
 
 
 import android.accounts.Account;
 import android.accounts.Account;
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer;