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

multiplication sign for samsung galaxy s

Browse Source
This commit is contained in:
Sergey Solovyev 2012-02-12 02:05:40 +04:00
parent 9fcbda6458
commit 468e3e12f7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/colors.xml
View File

@ -10,7 +10,7 @@
<color name="button_operator_text_color">#ffffff99</color> <color name="button_operator_text_color">#ffffff99</color>
<color name="button_ce_text_color">#ffffffff</color> <color name="button_ce_text_color">#ffffffff</color>
<color name="default_text_color">#ffffffff</color> <color name="default_text_color">#ffffffff</color>
<color name="display_error_text_color">#ff1f1f1f</color> <color name="display_error_text_color">#ff393939</color>
<color name="selected_angle_unit_text_color">#ffffff99</color> <color name="selected_angle_unit_text_color">#ffffff99</color>
<color name="default_background">#ff000000</color> <color name="default_background">#ff000000</color>
</resources> </resources>

17
src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -445,7 +445,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
} }
private void setDefaultValues(@NotNull SharedPreferences preferences) { private void setDefaultValues(@NotNull SharedPreferences preferences) {
if (!preferences.contains(CalculatorEngine.Preferences.groupingSeparator.getKey())) { if (!CalculatorEngine.Preferences.groupingSeparator.isSet(preferences)) {
final Locale locale = Locale.getDefault(); final Locale locale = Locale.getDefault();
if (locale != null) { if (locale != null) {
final DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(locale); final DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(locale);
@ -461,14 +461,21 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
} }
} }
if (!preferences.contains(CalculatorEngine.Preferences.angleUnit.getKey())) { if (!CalculatorEngine.Preferences.angleUnit.isSet(preferences)) {
CalculatorEngine.Preferences.angleUnit.putDefault(preferences); CalculatorEngine.Preferences.angleUnit.putDefault(preferences);
} }
if (!preferences.contains(CalculatorEngine.Preferences.numeralBase.getKey())) { if (!CalculatorEngine.Preferences.numeralBase.isSet(preferences)) {
CalculatorEngine.Preferences.numeralBase.putDefault(preferences); CalculatorEngine.Preferences.numeralBase.putDefault(preferences);
} }
if (!CalculatorEngine.Preferences.multiplicationSign.isSet(preferences)) {
if ( AndroidUtils.isPhoneModel(AndroidUtils.PhoneModel.samsung_galaxy_s) || AndroidUtils.isPhoneModel(AndroidUtils.PhoneModel.samsung_galaxy_s_2) ) {
// workaround ofr samsung galaxy s phones
CalculatorEngine.Preferences.multiplicationSign.putPreference(preferences, "*");
}
}
} }
private synchronized void setOnDragListeners(@NotNull SimpleOnDragListener.Preferences dragPreferences, @NotNull SharedPreferences preferences) { private synchronized void setOnDragListeners(@NotNull SimpleOnDragListener.Preferences dragPreferences, @NotNull SharedPreferences preferences) {
@ -793,7 +800,9 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
if (CalculatorEngine.Preferences.getPreferenceKeys().contains(key)) { if (CalculatorEngine.Preferences.getPreferenceKeys().contains(key)) {
CalculatorEngine.instance.softReset(this, preferences); CalculatorEngine.instance.softReset(this, preferences);
//this.calculatorModel.evaluate();
// reevaluate in order to update values (in case of preferences changed from the main window, like numeral bases and angle units)
this.calculatorModel.evaluate();
} }
if ( USE_BACK_AS_PREV_P_KEY.equals(key) ) { if ( USE_BACK_AS_PREV_P_KEY.equals(key) ) {