icons + widget fix

android-app-core/res/layout/cpp_simple_button_copy.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_copy"
-	a:src="@drawable/ab_copy"
+	a:src="@drawable/kb_copy"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Copy" />

android-app-core/res/layout/cpp_simple_button_erase.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_erase"
-	a:src="@drawable/ab_erase"
+	a:src="@drawable/kb_erase"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Erase" />

android-app-core/res/layout/cpp_simple_button_paste.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_paste"
-	a:src="@drawable/ab_paste"
+	a:src="@drawable/kb_paste"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Paste" />

android-app-core/res/layout/cpp_simple_button_settings.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_settings"
-	a:src="@drawable/ab_settings"
+	a:src="@drawable/kb_settings"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Settings" />

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<? extends AppWidgetProvider> 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<? extends AppWidgetProvider> componentClass = this.getComponentClass();
-			Locator.getInstance().getExternalListenersContainer().addExternalListener(componentClass);
-			initialized = true;
-		}
-
 		getCursorColor(context);
 	}
 

android-app/res/layout/cpp_app_button_copy.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_copy"
-	a:src="@drawable/ab_copy"
+	a:src="@drawable/kb_copy"
 	style="?cpp_control_image_button_style"
 	a:onClick="copyButtonClickHandler" />

android-app/res/layout/cpp_app_button_erase.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_erase"
-	a:src="@drawable/ab_erase"
+	a:src="@drawable/kb_erase"
 	style="?cpp_control_image_button_style"
 	a:onClick="eraseButtonClickHandler" />

android-app/res/layout/cpp_app_button_paste.xml

@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_paste"
-	a:src="@drawable/ab_paste"
+	a:src="@drawable/kb_paste"
 	style="?cpp_control_image_button_style"
 	a:onClick="pasteButtonClickHandler" />

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" />
 
 </LinearLayout>

android-app/res/menu/functions_menu.xml

@@ -11,6 +11,6 @@
 	<item
 		a:id="@+id/functions_menu_add_function"
 		a:title="@string/c_add"
-		a:icon="@drawable/ab_add"
+		a:icon="@drawable/kb_plus"
 		a:showAsAction="always" />
 </menu>

android-app/res/menu/plot_menu.xml

@@ -11,37 +11,37 @@
 	<item
 		a:id="@+id/menu_plot_2d"
 		a:title="@string/cpp_plot_2d"
-		a:icon="@drawable/ab_graph"
+		a:icon="@drawable/kb_stats"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_3d"
 		a:title="@string/cpp_plot_3d"
-		a:icon="@drawable/ab_graph"
+		a:icon="@drawable/kb_stats"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_range"
 		a:title="@string/cpp_plot_range"
-		a:icon="@drawable/ab_expand"
+		a:icon="@drawable/kb_contract"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_functions"
 		a:title="@string/cpp_plot_functions"
-		a:icon="@drawable/ab_menu"
+		a:icon="@drawable/kb_menu"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_schreeshot"
 		a:title="@string/cpp_plot_screenshot"
-		a:icon="@drawable/ab_save"
+		a:icon="@drawable/kb_disk"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_settings"
 		a:title="@string/c_settings"
-		a:icon="@drawable/ab_settings"
+		a:icon="@drawable/kb_settings"
 		a:showAsAction="always" />
 
 </menu>

android-app/res/menu/vars_menu.xml

@@ -11,6 +11,6 @@
 	<item
 		a:id="@+id/var_menu_add_var"
 		a:title="@string/c_add"
-		a:icon="@drawable/ab_add"
+		a:icon="@drawable/kb_plus"
 		a:showAsAction="always" />
 </menu>