Merge branch 'dev-widget' into dev

calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java

@@ -64,6 +64,7 @@ public final class CalculatorButtons {
         views.setTextViewText(R.id.multiplicationButton, CalculatorLocatorImpl.getInstance().getEngine().getMultiplicationSign());
     }
 
+
     public static void toggleEqualsButton(@Nullable SharedPreferences preferences,
                                           @NotNull Activity activity) {
         preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(activity) : preferences;

calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java

@@ -117,11 +117,11 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
                 }
             }
 
-            CalculatorButtons.initMultiplicationButton(views);
-
             updateEditorState(context, views, editorState);
             updateDisplayState(context, views, displayState);
 
+            CalculatorButtons.initMultiplicationButton(views);
+
             appWidgetManager.updateAppWidget(appWidgetId, views);
         }
     }