TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-widget' into dev

Browse Source
This commit is contained in:
Sergey Solovyev 2012-10-26 21:38:17 +04:00
commit 401ff87e91
3 changed files with 505 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
View File

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

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

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