diff --git a/android-app-core/res/drawable-hdpi/ab_add.png b/android-app-core/res/drawable-hdpi/ab_add.png
deleted file mode 100644
index 218ee8ac..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_copy.png b/android-app-core/res/drawable-hdpi/ab_copy.png
deleted file mode 100644
index dc27c6f0..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_copy.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_erase.png b/android-app-core/res/drawable-hdpi/ab_erase.png
deleted file mode 100644
index 5d638bd5..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_erase.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_expand.png b/android-app-core/res/drawable-hdpi/ab_expand.png
deleted file mode 100644
index a3039d43..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_expand.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_graph.png b/android-app-core/res/drawable-hdpi/ab_graph.png
deleted file mode 100644
index 53be11dc..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_graph.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_menu.png b/android-app-core/res/drawable-hdpi/ab_menu.png
deleted file mode 100644
index 6816df89..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_menu.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_paste.png b/android-app-core/res/drawable-hdpi/ab_paste.png
deleted file mode 100644
index 1ce4060d..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_paste.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_save.png b/android-app-core/res/drawable-hdpi/ab_save.png
deleted file mode 100644
index 561e414b..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_save.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_settings.png b/android-app-core/res/drawable-hdpi/ab_settings.png
deleted file mode 100644
index 44d799f5..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_share.png b/android-app-core/res/drawable-hdpi/ab_share.png
deleted file mode 100644
index 44180aa7..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_share.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/kb_contract.png b/android-app-core/res/drawable-hdpi/kb_contract.png
new file mode 100644
index 00000000..408eb720
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_contract.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_copy.png b/android-app-core/res/drawable-hdpi/kb_copy.png
new file mode 100644
index 00000000..bea62cff
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_copy.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_disk.png b/android-app-core/res/drawable-hdpi/kb_disk.png
new file mode 100644
index 00000000..d46a649d
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_disk.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_erase.png b/android-app-core/res/drawable-hdpi/kb_erase.png
new file mode 100644
index 00000000..ae6ac20d
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_erase.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_expand.png b/android-app-core/res/drawable-hdpi/kb_expand.png
new file mode 100644
index 00000000..856073da
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_expand.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_menu.png b/android-app-core/res/drawable-hdpi/kb_menu.png
new file mode 100644
index 00000000..400c51e1
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_menu.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_paste.png b/android-app-core/res/drawable-hdpi/kb_paste.png
new file mode 100644
index 00000000..4a3d8a17
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_paste.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_plus.png b/android-app-core/res/drawable-hdpi/kb_plus.png
new file mode 100644
index 00000000..e9279924
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_plus.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_settings.png b/android-app-core/res/drawable-hdpi/kb_settings.png
new file mode 100644
index 00000000..99975155
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_settings.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_share.png b/android-app-core/res/drawable-hdpi/kb_share.png
new file mode 100644
index 00000000..310a82a4
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_share.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_stats.png b/android-app-core/res/drawable-hdpi/kb_stats.png
new file mode 100644
index 00000000..774bc1e4
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/kb_stats.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_add.png b/android-app-core/res/drawable-mdpi/ab_add.png
deleted file mode 100644
index c6ae5f52..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_copy.png b/android-app-core/res/drawable-mdpi/ab_copy.png
deleted file mode 100644
index 81a00a78..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_copy.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_erase.png b/android-app-core/res/drawable-mdpi/ab_erase.png
deleted file mode 100644
index 47c87087..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_erase.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_expand.png b/android-app-core/res/drawable-mdpi/ab_expand.png
deleted file mode 100644
index 4786d402..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_expand.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_graph.png b/android-app-core/res/drawable-mdpi/ab_graph.png
deleted file mode 100644
index d82f9f7a..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_graph.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_menu.png b/android-app-core/res/drawable-mdpi/ab_menu.png
deleted file mode 100644
index f19442d1..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_menu.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_paste.png b/android-app-core/res/drawable-mdpi/ab_paste.png
deleted file mode 100644
index 99069290..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_paste.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_save.png b/android-app-core/res/drawable-mdpi/ab_save.png
deleted file mode 100644
index 3961ee47..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_save.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_settings.png b/android-app-core/res/drawable-mdpi/ab_settings.png
deleted file mode 100644
index 931141d1..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_share.png b/android-app-core/res/drawable-mdpi/ab_share.png
deleted file mode 100644
index 61773f5d..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_share.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_contract.png b/android-app-core/res/drawable-mdpi/kb_contract.png
new file mode 100644
index 00000000..27db258d
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_contract.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_copy.png b/android-app-core/res/drawable-mdpi/kb_copy.png
new file mode 100644
index 00000000..edbc7ef3
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_copy.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_disk.png b/android-app-core/res/drawable-mdpi/kb_disk.png
new file mode 100644
index 00000000..a0737c09
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_disk.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_erase.png b/android-app-core/res/drawable-mdpi/kb_erase.png
new file mode 100644
index 00000000..0cb38038
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_erase.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_expand.png b/android-app-core/res/drawable-mdpi/kb_expand.png
new file mode 100644
index 00000000..b29e29d3
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_expand.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_menu.png b/android-app-core/res/drawable-mdpi/kb_menu.png
new file mode 100644
index 00000000..c57c54c8
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_menu.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_paste.png b/android-app-core/res/drawable-mdpi/kb_paste.png
new file mode 100644
index 00000000..514a6bf0
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_paste.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_plus.png b/android-app-core/res/drawable-mdpi/kb_plus.png
new file mode 100644
index 00000000..a519ed62
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_plus.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_settings.png b/android-app-core/res/drawable-mdpi/kb_settings.png
new file mode 100644
index 00000000..40024062
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_settings.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_share.png b/android-app-core/res/drawable-mdpi/kb_share.png
new file mode 100644
index 00000000..31bbd3fa
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_share.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_stats.png b/android-app-core/res/drawable-mdpi/kb_stats.png
new file mode 100644
index 00000000..d7869943
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/kb_stats.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_add.png b/android-app-core/res/drawable-xhdpi/ab_add.png
deleted file mode 100644
index b0b581ae..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_copy.png b/android-app-core/res/drawable-xhdpi/ab_copy.png
deleted file mode 100644
index 9172f03d..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_copy.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_erase.png b/android-app-core/res/drawable-xhdpi/ab_erase.png
deleted file mode 100644
index 8b822d9e..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_erase.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_expand.png b/android-app-core/res/drawable-xhdpi/ab_expand.png
deleted file mode 100644
index 04d7851a..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_expand.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_graph.png b/android-app-core/res/drawable-xhdpi/ab_graph.png
deleted file mode 100644
index 13ed3f30..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_graph.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_paste.png b/android-app-core/res/drawable-xhdpi/ab_paste.png
deleted file mode 100644
index 2716323d..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_paste.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_save.png b/android-app-core/res/drawable-xhdpi/ab_save.png
deleted file mode 100644
index 5d31a9e5..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_save.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_settings.png b/android-app-core/res/drawable-xhdpi/ab_settings.png
deleted file mode 100644
index 39cbd6d9..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_share.png b/android-app-core/res/drawable-xhdpi/ab_share.png
deleted file mode 100644
index baacbdef..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_share.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_contract.png b/android-app-core/res/drawable-xhdpi/kb_contract.png
new file mode 100644
index 00000000..c23707ed
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_contract.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_copy.png b/android-app-core/res/drawable-xhdpi/kb_copy.png
new file mode 100644
index 00000000..695bd139
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_copy.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_disk.png b/android-app-core/res/drawable-xhdpi/kb_disk.png
new file mode 100644
index 00000000..6334571e
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_disk.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_erase.png b/android-app-core/res/drawable-xhdpi/kb_erase.png
new file mode 100644
index 00000000..0f0c695c
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_erase.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_expand.png b/android-app-core/res/drawable-xhdpi/kb_expand.png
new file mode 100644
index 00000000..0d81804d
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_expand.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_menu.png b/android-app-core/res/drawable-xhdpi/kb_menu.png
similarity index 67%
rename from android-app-core/res/drawable-xhdpi/ab_menu.png
rename to android-app-core/res/drawable-xhdpi/kb_menu.png
index f9308c61..affa41bb 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_menu.png and b/android-app-core/res/drawable-xhdpi/kb_menu.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_paste.png b/android-app-core/res/drawable-xhdpi/kb_paste.png
new file mode 100644
index 00000000..6db9635a
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_paste.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_plus.png b/android-app-core/res/drawable-xhdpi/kb_plus.png
new file mode 100644
index 00000000..f216fd5f
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_plus.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_settings.png b/android-app-core/res/drawable-xhdpi/kb_settings.png
new file mode 100644
index 00000000..a743a6c4
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_settings.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_share.png b/android-app-core/res/drawable-xhdpi/kb_share.png
new file mode 100644
index 00000000..b4f446f4
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_share.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_stats.png b/android-app-core/res/drawable-xhdpi/kb_stats.png
new file mode 100644
index 00000000..c22cc3fb
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/kb_stats.png differ
diff --git a/android-app-core/res/layout/cpp_simple_button_copy.xml b/android-app-core/res/layout/cpp_simple_button_copy.xml
index fdd2d978..810fb148 100644
--- a/android-app-core/res/layout/cpp_simple_button_copy.xml
+++ b/android-app-core/res/layout/cpp_simple_button_copy.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_erase.xml b/android-app-core/res/layout/cpp_simple_button_erase.xml
index fd582b17..b31d5ce1 100644
--- a/android-app-core/res/layout/cpp_simple_button_erase.xml
+++ b/android-app-core/res/layout/cpp_simple_button_erase.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_paste.xml b/android-app-core/res/layout/cpp_simple_button_paste.xml
index 6e9f8d54..8fac963f 100644
--- a/android-app-core/res/layout/cpp_simple_button_paste.xml
+++ b/android-app-core/res/layout/cpp_simple_button_paste.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_settings.xml b/android-app-core/res/layout/cpp_simple_button_settings.xml
index 8c802c1c..14ca0b27 100644
--- a/android-app-core/res/layout/cpp_simple_button_settings.xml
+++ b/android-app-core/res/layout/cpp_simple_button_settings.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
index ae230ac4..f39eb345 100644
--- a/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
+++ b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
@@ -9,6 +9,7 @@ import android.content.Intent;
import android.text.Html;
import android.widget.RemoteViews;
import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.external.CalculatorExternalListenersContainer;
import org.solovyev.android.calculator.external.ExternalCalculatorIntentHandler;
import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater;
@@ -41,9 +42,6 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
@Nonnull
private ExternalCalculatorIntentHandler intentHandler = new CalculatorWidgetIntentHandler(this);
- private boolean initialized = false;
-
-
/*
**********************************************************************
*
@@ -53,6 +51,13 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
*/
protected AbstractCalculatorWidgetProvider() {
+ final Class componentClass = this.getComponentClass();
+
+ final CalculatorExternalListenersContainer externalListenersContainer = Locator.getInstance().getExternalListenersContainer();
+ // NOTE: null might be in tests, now robolectric creates widget provider before application
+ if (externalListenersContainer != null) {
+ externalListenersContainer.addExternalListener(componentClass);
+ }
}
/*
@@ -66,13 +71,6 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
@Override
public void onEnabled(Context context) {
super.onEnabled(context);
-
- if (!initialized) {
- final Class componentClass = this.getComponentClass();
- Locator.getInstance().getExternalListenersContainer().addExternalListener(componentClass);
- initialized = true;
- }
-
getCursorColor(context);
}
diff --git a/android-app/res/layout/cpp_app_button_copy.xml b/android-app/res/layout/cpp_app_button_copy.xml
index f61df90c..607b3188 100644
--- a/android-app/res/layout/cpp_app_button_copy.xml
+++ b/android-app/res/layout/cpp_app_button_copy.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_button_erase.xml b/android-app/res/layout/cpp_app_button_erase.xml
index 84ce39fa..dac0fb9f 100644
--- a/android-app/res/layout/cpp_app_button_erase.xml
+++ b/android-app/res/layout/cpp_app_button_erase.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_button_paste.xml b/android-app/res/layout/cpp_app_button_paste.xml
index 5181d986..e80a089a 100644
--- a/android-app/res/layout/cpp_app_button_paste.xml
+++ b/android-app/res/layout/cpp_app_button_paste.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_plot_function_list_item.xml b/android-app/res/layout/cpp_plot_function_list_item.xml
index e1656688..090ffbc8 100644
--- a/android-app/res/layout/cpp_plot_function_list_item.xml
+++ b/android-app/res/layout/cpp_plot_function_list_item.xml
@@ -31,6 +31,6 @@
a:paddingTop="0dp"
a:paddingBottom="0dp"
a:scaleType="centerInside"
- a:src="@drawable/ab_settings" />
+ a:src="@drawable/kb_settings" />
\ No newline at end of file
diff --git a/android-app/res/menu/functions_menu.xml b/android-app/res/menu/functions_menu.xml
index b56037f9..acd9c695 100644
--- a/android-app/res/menu/functions_menu.xml
+++ b/android-app/res/menu/functions_menu.xml
@@ -11,6 +11,6 @@