icons + widget fix

This commit is contained in:
Sergey Solovyev 2013-06-23 23:34:08 +04:00
parent ab6520f0f3
commit 71fff1d05c
74 changed files with 24 additions and 26 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 856 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 771 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 896 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 419 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 769 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 858 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 677 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -31,6 +31,6 @@
a:paddingTop="0dp"
a:paddingBottom="0dp"
a:scaleType="centerInside"
a:src="@drawable/ab_settings" />
a:src="@drawable/kb_settings" />
</LinearLayout>

View File

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

View File

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

View File

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