diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 844c8d54..14603c70 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,8 @@ - + diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png index a6d85dfb..7668a2c1 100644 Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png index 332198f2..c117e78a 100644 Binary files a/res/drawable-ldpi/icon.png and b/res/drawable-ldpi/icon.png differ diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png index 09fbfcef..0431061d 100644 Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ diff --git a/res/drawable/logo.png b/res/drawable/logo.png new file mode 100644 index 00000000..e7bd1e47 Binary files /dev/null and b/res/drawable/logo.png differ diff --git a/res/layout/about.xml b/res/layout/about.xml index 8b1ba200..e329cf31 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -12,9 +12,20 @@ a:layout_height="match_parent" a:background="#ff000000"> + + \ No newline at end of file diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index c7268b3c..46080ae6 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1,6 +1,7 @@ Калькулятор++ + Кальк++ Настройки Ошибка Результат скопирован в буфер! diff --git a/res/values/strings.xml b/res/values/strings.xml index a275833a..d2f5948f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,7 @@ Calculator++ + Calc++ Settings Syntax error Result copied to clipboard! diff --git a/src/main/java/org/solovyev/android/view/widgets/DragButton.java b/src/main/java/org/solovyev/android/view/widgets/DragButton.java index 289ea360..66de089a 100644 --- a/src/main/java/org/solovyev/android/view/widgets/DragButton.java +++ b/src/main/java/org/solovyev/android/view/widgets/DragButton.java @@ -92,7 +92,7 @@ public class DragButton extends ColorButton { public void run() { button.setEnabled(true); } - }, 300); + }, 200); } } } diff --git a/src/misc/resources/calc++_icon.png b/src/misc/resources/calc++_icon.png new file mode 100644 index 00000000..d507c5ff Binary files /dev/null and b/src/misc/resources/calc++_icon.png differ diff --git a/res/drawable/equals_icon.png b/src/misc/resources/equals_icon.png similarity index 100% rename from res/drawable/equals_icon.png rename to src/misc/resources/equals_icon.png diff --git a/res/drawable/equals_icon_original.png b/src/misc/resources/equals_icon_original.png similarity index 100% rename from res/drawable/equals_icon_original.png rename to src/misc/resources/equals_icon_original.png diff --git a/res/drawable/heart_original.png b/src/misc/resources/heart_original.png similarity index 100% rename from res/drawable/heart_original.png rename to src/misc/resources/heart_original.png diff --git a/src/misc/resources/icon.png b/src/misc/resources/icon.png new file mode 100644 index 00000000..e2491f8b Binary files /dev/null and b/src/misc/resources/icon.png differ diff --git a/src/misc/resources/log11o.psd b/src/misc/resources/log11o.psd new file mode 100644 index 00000000..2df9dc54 Binary files /dev/null and b/src/misc/resources/log11o.psd differ diff --git a/src/misc/resources/logo.cdr b/src/misc/resources/logo.cdr new file mode 100644 index 00000000..ffd8f3e1 Binary files /dev/null and b/src/misc/resources/logo.cdr differ diff --git a/src/misc/resources/logo.png b/src/misc/resources/logo.png new file mode 100644 index 00000000..4c62ad73 Binary files /dev/null and b/src/misc/resources/logo.png differ