diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 234b783e..c5cc1f3b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3,8 +3,8 @@ + a:versionCode="14" + a:versionName="1.1.14"> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 0328b7d1..f1cec660 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -86,6 +86,12 @@ История пуста! История Символ \'%s\' не допустим в названии переменной! + + Единицы измерения углов + Градусы + Радианы + Определяет единицы измерения углов. + Тема оформления По умолчанию Фиолетовая diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3e88a0d8..09678b12 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -47,4 +47,13 @@ 100 + + @string/p_deg + @string/p_rad + + + deg + rad + + \ No newline at end of file diff --git a/res/values/default_values.xml b/res/values/default_values.xml index 80035004..e50b56ad 100644 --- a/res/values/default_values.xml +++ b/res/values/default_values.xml @@ -27,6 +27,9 @@ org.solovyev.android.calculator.CalculatorModel_vars + org.solovyev.android.calculator.CalculatorActivity_angle_units + deg + org.solovyev.android.calculator.CalculatorActivity_calc_theme default_theme diff --git a/res/values/strings.xml b/res/values/strings.xml index 518c131f..cc6ff1ff 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -87,6 +87,12 @@ History is empty! History Character \'%s\' is not accepted in variable name! + + Angle Units + Degrees + Radians + Defines the default units for angles. + Theme Default Violet diff --git a/res/xml/main_preferences.xml b/res/xml/main_preferences.xml index 14adcc94..1712593d 100644 --- a/res/xml/main_preferences.xml +++ b/res/xml/main_preferences.xml @@ -23,6 +23,14 @@ a:summary="@string/c_calc_grouping_separator_summary" a:entryValues="@array/p_grouping_separator_values"/> + + diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorVarsActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorVarsActivity.java index e5d0c8b4..09a500da 100644 --- a/src/main/java/org/solovyev/android/calculator/CalculatorVarsActivity.java +++ b/src/main/java/org/solovyev/android/calculator/CalculatorVarsActivity.java @@ -301,7 +301,7 @@ public class CalculatorVarsActivity extends ListActivity { if (!StringUtils.isEmpty(name)) { try { - Identifier.parser.parse(name, new MutableInt(0), 0, null); + Identifier.parser.parse(name, new MutableInt(0), null); result = true; } catch (ParseException e) { // not valid name;