From a257935b8c81c3d6d4672290e38d1f3b98cca392 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 6 Aug 2015 17:13:00 +0200 Subject: [PATCH] =?utf8?q?Bugfix=20f=C3=BCr=20Lollipop=20AlertDialog=20Bug?= =?utf8?q?=20(see=20styles),=20moved=20away=20from=20android=20referenced?= =?utf8?q?=20icon=20to=20self-shipped=20version=20for=20design=20consisten?= =?utf8?q?cy?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/ic_warning.png | Bin 0 -> 562 bytes res/drawable-xhdpi/ic_warning.png | Bin 0 -> 477 bytes res/drawable-xxhdpi/ic_warning.png | Bin 0 -> 769 bytes res/values-de-rDE/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values/styles.xml | 26 +++++++++++++++++++++ .../ui/dialog/ConfirmationDialogFragment.java | 2 +- 7 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 res/drawable-hdpi/ic_warning.png create mode 100644 res/drawable-xhdpi/ic_warning.png create mode 100644 res/drawable-xxhdpi/ic_warning.png diff --git a/res/drawable-hdpi/ic_warning.png b/res/drawable-hdpi/ic_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..14590e5b110081c2c66bde91c2221026ca79a069 GIT binary patch literal 562 zcmV-20?qx2P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00F8=L_t(o!|m8FOafsX#_@yQ*w_dJ3PBS^8;wYWrcoP4 zY`Q0D!>CQ8HjEmH+B9jBqD6xS-E`CGnBva@jJtdP-Mzo}W?)ae?LHfK_ikT2cRY*kAU2rC>|9uG#?J@WS0cIc+l*Me8JY_T#vjIno=?XaWB&n3qQ zhc;Lh!&ul5)#TW@;6+ejgtMgBvhb}_V}zw7SPplIuv_HfW1EuiNrw?O;$kJdCB|M+ ziiaIYPYOLo*pGuP;>Qa6#)3K4Q=EY&7@=p1HH{8l-5MsCk3I_~=p0$2aICGv#*Je8 z%!HjIZxnkh(mC=*;lM(jqiPg;EYvybMzO~Nouh6P4s5D(bdAEXRv42t3dbg$qi+@qi}50IVO$5vF;eFIj2UQGy4m0hW#Jx51!OOzBV@2qyPW_07*qoM6N<$g5E3T AH2?qr literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_warning.png b/res/drawable-xhdpi/ic_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..08177e7b48d78d59daf78f6c64cc4b73b82b4961 GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=14Fw zFot@%IEF+VetUhd@8JNEqlMZ*T_GzMGz(>|NMzJ^VB_F!@Z;rfVN76@P>@u(65z}! z8?rLUrHjvZL(+c!`>)I6)90Q$`q#7U<8*G3%J44@rU8r2aPoZY<=TgJ#7nMyjmN6v%*~VlqQO+(Wb^PD_ z>+{d;Vp@Kqqk-3N7bExc(jSaT_gFP--&?a7$Xtq$F?BFl^3mc{V}i%y!Yd4o6Sf@< z^9p^Cgm4Qn^o9_UT}RR&~VO#1xKeGhxiH}*dndI@R98PdQ| OXYh3Ob6Mw<&;$Ur{;iJy literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_warning.png b/res/drawable-xxhdpi/ic_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..dc007ee65fa59e361e5cd520f1e7046e5e7ca427 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s zR8i^a;uw-~@9iwxd|^j{Hu?TF9Nu~{6PRWN9GMspG*M6WWr6#PNnIBvgt#zCX*daL ziisKik@?3a^k}i?RHiNw506Zrhuu$$^S*yee&_t?UiO>aS6_X7^XASQIe+IW@0PxZrRTYOS4MHQe$>1Ff~h{@@ghD!sY|R2PH*7z z-gfleo6maDq0&NjXVn?xlhb=lzx1%Ld_Vh5_{=M|bp_QA@9AILu|~`3ecp}6)V|eG zn|SA?-?LBHE9IQ*JU8EX-JuJ@a#HhiHwSN9$oGEjdH0f2re9`>zWyv4H+ARR_aCQ5 zTPFW2n*Vu|lF6y9%(8B&x;M@G=N@|-aVhTNg!9Yfew#P^YvZ#$b&rkRRsE~c{g;(J z`yiG**0I}9{p`)bG;Z4@q23C!w}xLlG0bgie}Ebvsa0y)RMPO zaK74chEV7Hox+6yRg3q&{aurIa#C!tZ;$f2i08}GTF&W|#qi(m@-}-A7-`{TQXkuA zx5MS;(F=mBwc6$sxYPy3FJ`GedB*$IN*N%prR|;Rk%iNElc(p%sb*-1yLUXR_IO;Y z5vSqkY-w?5+LcHRMZJ}>1uYeeT5^0Ro!O$Hz~U7=cRNWE35N z6dR11xb$>Xt*H1Lx6fKKBkLuL~D=V3g1Hy|SuP7PGi_aCuz_C`!mz oS6E<{^{?lWL>ABA^0t4BCk|znh)rZT3QU;{p00i_>zopr0IgmNur lokal Nur lokale Inhalte Vom Server entfernen - Lokal und auf dem Server + Lokal und auf Server Erfolgreich gelöscht Der Löschvorgang konnte nicht beendet werden Geben Sie einen neuen Namen ein diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c9defa97..3ce2b69d 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -202,7 +202,7 @@ Nur lokal Nur lokale Inhalte Vom Server entfernen - Lokal und auf dem Server + Lokal und auf Server Erfolgreich gelöscht Der Löschvorgang konnte nicht beendet werden Gib einen neuen Namen ein diff --git a/res/values/styles.xml b/res/values/styles.xml index 3282a8df..564278ec 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,6 +28,7 @@ @color/primary @color/primary_dark @color/color_accent + @style/Theme.ownCloud.Dialog @@ -65,6 +67,30 @@ + + + + + diff --git a/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java index 81561b35..1be319fc 100644 --- a/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java @@ -83,7 +83,7 @@ public class ConfirmationDialogFragment extends DialogFragment { } AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog) - .setIcon(android.R.drawable.ic_dialog_alert) + .setIcon(R.drawable.ic_warning) .setMessage(String.format(getString(resourceId), confirmationTarget)) .setTitle(android.R.string.dialog_alert_title); if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) { -- 2.11.0