Library upgrade
This commit is contained in:
parent
9c7826fadc
commit
16beb057c2
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,4 +3,5 @@ target
|
||||
atlassian-ide-plugin.xml
|
||||
.idea/workspace.xml
|
||||
.idea/tasks.xml
|
||||
.idea/uiDesigner.xml
|
||||
.idea/uiDesigner.xml
|
||||
.idea/libraries/
|
@ -22,12 +22,18 @@
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<processorPath useClasspath="true" />
|
||||
<module name="android-app" />
|
||||
<module name="android-app-core" />
|
||||
<module name="android-app-onscreen" />
|
||||
<module name="android-app-test" />
|
||||
<module name="android-app-widget" />
|
||||
<module name="calculatorpp-android-app" />
|
||||
<module name="calculatorpp-android-app-core" />
|
||||
<module name="calculatorpp-android-app-onscreen" />
|
||||
<module name="calculatorpp-android-app-test" />
|
||||
<module name="calculatorpp-android-app-widget" />
|
||||
<module name="calculatorpp-core" />
|
||||
<module name="core" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
</component>
|
||||
|
@ -11,25 +11,25 @@
|
||||
<module fileurl="file://$PROJECT_DIR$/core.iml" filepath="$PROJECT_DIR$/core.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-com.actionbarsherlock_actionbarsherlock_4.4.0.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-com.actionbarsherlock_actionbarsherlock_4.4.0.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-ads_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-ads_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-all_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-all_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-app_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-app_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-billing_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-billing_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-core_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-core_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-db_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-db_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-fragments_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-fragments_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-http_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-http_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-keyboards_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-keyboards_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-lists_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-lists_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-menus_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-menus_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-networks_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-networks_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-other_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-other_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-preferences_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-preferences_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-security_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-security_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-sherlock_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-sherlock_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-tasks_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-tasks_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-views_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-views_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.11.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.11.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-ads_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-ads_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-all_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-all_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-app_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-app_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-billing_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-billing_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-core_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-core_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-db_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-db_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-fragments_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-fragments_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-http_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-http_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-keyboards_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-keyboards_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-lists_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-lists_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-menus_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-menus_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-networks_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-networks_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-other_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-other_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-preferences_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-preferences_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-security_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-security_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-sherlock_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-sherlock_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-tasks_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-tasks_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-views_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-views_1.1.15.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
|
@ -10,7 +10,7 @@
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-core/assets" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-core/libs" />
|
||||
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-core/target/generated-sources/combined-resources/res" />
|
||||
<option name="APK_PATH" value="/android-app-core/target/calculatorpp-android-app-core.apk" />
|
||||
<option name="APK_PATH" value="/android-app-core/target/android-app-core.apk" />
|
||||
<option name="LIBRARY_PROJECT" value="true" />
|
||||
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
|
||||
<option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
|
||||
@ -26,24 +26,25 @@
|
||||
<output-test url="file://$MODULE_DIR$/android-app-core/target/idea-test-classes" />
|
||||
<content url="file://$MODULE_DIR$/android-app-core">
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/extracted-dependencies" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/idea-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="core" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
|
||||
@ -101,26 +102,26 @@
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-6" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.15" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
@ -28,13 +28,12 @@ import android.graphics.Paint;
|
||||
import android.text.TextPaint;
|
||||
import android.util.AttributeSet;
|
||||
import jscl.AngleUnit;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import org.solovyev.android.calculator.Locator;
|
||||
import org.solovyev.android.calculator.core.R;
|
||||
import org.solovyev.android.view.drag.DirectionDragButton;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
/**
|
||||
* User: serso
|
||||
* Date: 11/22/11
|
||||
@ -51,16 +50,16 @@ public class AngleUnitsButton extends DirectionDragButton {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initDirectionTextPaint(@Nonnull Paint basePaint,
|
||||
@Nonnull DirectionTextData directionTextData,
|
||||
@Nonnull Resources resources) {
|
||||
super.initDirectionTextPaint(basePaint, directionTextData, resources);
|
||||
protected void initDirectionTextPaint(@Nonnull Paint basePaint, @Nonnull DirectionTextData textData) {
|
||||
super.initDirectionTextPaint(basePaint, textData);
|
||||
|
||||
final TextPaint directionTextPaint = directionTextData.getPaint();
|
||||
final int color = getDirectionTextColor(directionTextData.getText());
|
||||
directionTextPaint.setColor(color);
|
||||
if (!isCurrentAngleUnits(directionTextData.getText())) {
|
||||
directionTextPaint.setAlpha(getDirectionTextAlpha());
|
||||
final String text = textData.getText();
|
||||
final TextPaint paint = textData.getPaint();
|
||||
|
||||
final int color = getDirectionTextColor(text);
|
||||
paint.setColor(color);
|
||||
if (!isCurrentAngleUnits(text)) {
|
||||
paint.setAlpha(directionTextAlpha);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -23,18 +23,16 @@
|
||||
package org.solovyev.android.calculator.view;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Paint;
|
||||
import android.text.TextPaint;
|
||||
import android.util.AttributeSet;
|
||||
import jscl.NumeralBase;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import org.solovyev.android.calculator.Locator;
|
||||
import org.solovyev.android.calculator.core.R;
|
||||
import org.solovyev.android.view.drag.DirectionDragButton;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
/**
|
||||
* User: serso
|
||||
* Date: 12/8/11
|
||||
@ -51,18 +49,16 @@ public class NumeralBasesButton extends DirectionDragButton {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initDirectionTextPaint(@Nonnull Paint basePaint,
|
||||
@Nonnull DirectionTextData directionTextData,
|
||||
@Nonnull Resources resources) {
|
||||
super.initDirectionTextPaint(basePaint, directionTextData, resources);
|
||||
protected void initDirectionTextPaint(@Nonnull Paint basePaint, @Nonnull DirectionTextData textData) {
|
||||
super.initDirectionTextPaint(basePaint, textData);
|
||||
|
||||
final TextPaint directionTextPaint = directionTextData.getPaint();
|
||||
final String text = textData.getText();
|
||||
final TextPaint paint = textData.getPaint();
|
||||
|
||||
final int color = getDirectionTextColor(directionTextData.getText());
|
||||
directionTextPaint.setColor(color);
|
||||
|
||||
if (!isCurrentNumberBase(directionTextData.getText())) {
|
||||
directionTextPaint.setAlpha(getDirectionTextAlpha());
|
||||
final int color = getDirectionTextColor(text);
|
||||
paint.setColor(color);
|
||||
if (!isCurrentNumberBase(text)) {
|
||||
paint.setAlpha(directionTextAlpha);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/assets" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/libs" />
|
||||
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-onscreen/target/generated-sources/combined-resources/res" />
|
||||
<option name="APK_PATH" value="/android-app-onscreen/target/calculatorpp-android-app-onscreen.apk" />
|
||||
<option name="APK_PATH" value="/android-app-onscreen/target/android-app-onscreen.apk" />
|
||||
<option name="LIBRARY_PROJECT" value="true" />
|
||||
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
|
||||
<option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
|
||||
@ -26,24 +26,25 @@
|
||||
<output-test url="file://$MODULE_DIR$/android-app-onscreen/target/idea-test-classes" />
|
||||
<content url="file://$MODULE_DIR$/android-app-onscreen">
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/extracted-dependencies" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/idea-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="core" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
|
||||
@ -66,26 +67,26 @@
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.15" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-widget/assets" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-widget/libs" />
|
||||
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-widget/target/generated-sources/combined-resources/res" />
|
||||
<option name="APK_PATH" value="/android-app-widget/target/calculatorpp-android-app-widget.apk" />
|
||||
<option name="APK_PATH" value="/android-app-widget/target/android-app-widget.apk" />
|
||||
<option name="LIBRARY_PROJECT" value="true" />
|
||||
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
|
||||
<option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
|
||||
@ -26,24 +26,25 @@
|
||||
<output-test url="file://$MODULE_DIR$/android-app-widget/target/idea-test-classes" />
|
||||
<content url="file://$MODULE_DIR$/android-app-widget">
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/extracted-dependencies" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/idea-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="core" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
|
||||
@ -66,26 +67,26 @@
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.15" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app/assets" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app/libs" />
|
||||
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app/target/generated-sources/combined-resources/res" />
|
||||
<option name="APK_PATH" value="/android-app/target/calculatorpp-android-app.apk" />
|
||||
<option name="APK_PATH" value="/android-app/target/android-app.apk" />
|
||||
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
|
||||
<option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
|
||||
<includeAssetsFromLibraries>true</includeAssetsFromLibraries>
|
||||
@ -25,27 +25,29 @@
|
||||
<output-test url="file://$MODULE_DIR$/android-app/target/idea-test-classes" />
|
||||
<content url="file://$MODULE_DIR$/android-app">
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/r" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/extracted-dependencies" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/idea-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/idea-test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-archiver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-status" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="core" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
|
||||
@ -108,26 +110,26 @@
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-6" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.11" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.15" />
|
||||
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.15" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
@ -46,7 +46,6 @@ import org.solovyev.android.calculator.wizard.CalculatorWizards;
|
||||
import org.solovyev.android.fragments.FragmentUtils;
|
||||
import org.solovyev.android.prefs.Preference;
|
||||
import org.solovyev.android.wizard.Wizard;
|
||||
import org.solovyev.android.wizard.WizardUi;
|
||||
import org.solovyev.android.wizard.Wizards;
|
||||
import org.solovyev.common.Objects;
|
||||
import org.solovyev.common.history.HistoryAction;
|
||||
@ -110,7 +109,9 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
|
||||
FragmentUtils.createFragment(this, CalculatorKeyboardFragment.class, R.id.keyboardContainer, "keyboard");
|
||||
|
||||
this.useBackAsPrev = CalculatorPreferences.Gui.usePrevAsBack.getPreference(preferences);
|
||||
firstTimeInit(preferences, this);
|
||||
if (savedInstanceState == null) {
|
||||
firstTimeInit(preferences, this);
|
||||
}
|
||||
|
||||
toggleOrientationChange(preferences);
|
||||
|
||||
|
6
core.iml
6
core.iml
@ -12,10 +12,10 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.sf.opencsv:opencsv:2.0" level="project" />
|
||||
|
Loading…
Reference in New Issue
Block a user