mirror of
https://github.com/SimpleMobileTools/Simple-Calculator.git
synced 2025-06-05 21:49:13 +02:00
merge master into fix_data branch and resolve conflicts
This commit is contained in:
@ -297,6 +297,6 @@ class MainActivity : SimpleActivity(), Calculator {
|
|||||||
bundle.putDouble("savedBaseValue", calc.baseValue)
|
bundle.putDouble("savedBaseValue", calc.baseValue)
|
||||||
bundle.putDouble("savedSecondValue", calc.getSecondValueV2())
|
bundle.putDouble("savedSecondValue", calc.getSecondValueV2())
|
||||||
bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula)
|
bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula)
|
||||||
|
}
|
||||||
//============================================================
|
//============================================================
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user