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

Error in case of loading user data (functions, vars etc)

Browse Source
This commit is contained in:
Sergey Solovyev 2013-01-20 15:07:48 +04:00
parent 373d7d9c16
commit 1fd8146b7e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-app/AndroidManifest.xml
View File

@ -73,7 +73,7 @@
<!-- ONSCREEN CONFIG -->
<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity">
<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity" android:theme="@style/cpp_gray_dialog_theme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

7
core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
View File

@ -228,8 +228,11 @@ public class AFunction implements IFunction, MathPersistenceEntity, Serializable
this.value = function.getContent();
this.system = function.isSystem();
this.description = function.getDescription();
this.id = function.getId();
}
if (function.isIdDefined()) {
this.id = function.getId();
}
this.parameterNames = new ArrayList<String>(function.getParameterNames());
}
public Builder(@NotNull String name,
@NotNull String value,