mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andy Scherzinger 2015-08-14 15:29:22 +02:00
parent 607fb6f587
commit abb6e2dbd5
13 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
res/values/styles.xml
View file

@ -28,6 +28,7 @@
<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>
</style>
<!-- seperate action bar style for activities without an action bar -->
@ -38,12 +39,22 @@
<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>
</style>
<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
<item name="colorAccent">@color/white</item>
</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">
<item name="colorButtonNormal">@color/primary</item>
</style>

2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

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

4
src/com/owncloud/android/ui/activity/Uploader.java
View file

@ -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;

2
src/com/owncloud/android/ui/dialog/ChangelogDialog.java
View file

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

2
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
View file

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

2
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
View file

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

4
src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
View file

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

2
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
View file

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

2
src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
View file

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

2
src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
View file

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

2
src/com/owncloud/android/ui/dialog/UploadSourceDialogFragment.java
View file

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

2
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

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

2
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
View file

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