From 2171d9dd2c56b5fdbb08d040e3490e53692d4ab2 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sat, 21 Apr 2012 12:33:51 +0400
Subject: [PATCH] Orientation change lock

---
 calculatorpp/AndroidManifest.xml              |  4 +++-
 calculatorpp/res/values/text_preferences.xml  |  7 +++++++
 calculatorpp/res/xml/preferences.xml          |  7 +++++++
 .../calculator/CalculatorActivity.java        | 20 +++++++++++++++++--
 .../calculator/CalculatorPreferences.java     |  1 +
 pom.xml                                       |  1 -
 6 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 calculatorpp/res/values/text_preferences.xml

diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml
index e9bc5ce6..a104322e 100644
--- a/calculatorpp/AndroidManifest.xml
+++ b/calculatorpp/AndroidManifest.xml
@@ -10,7 +10,9 @@
 
 	<application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication">
 
-		<activity android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
+		<activity android:label="@string/c_app_name"
+                  android:name=".CalculatorActivity"
+                  android:windowSoftInputMode="adjustPan">
 
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
diff --git a/calculatorpp/res/values/text_preferences.xml b/calculatorpp/res/values/text_preferences.xml
new file mode 100644
index 00000000..f58e6a7f
--- /dev/null
+++ b/calculatorpp/res/values/text_preferences.xml
@@ -0,0 +1,7 @@
+<resources>
+    <string name="c_auto_orientation_title">Toggle screen orientation change</string>
+    <string name="c_auto_orientation_summary">If turned on calculator will change screen orientation automatically</string>
+
+    <string name="c_show_equals_button_title">Show equals button</string>
+    <string name="c_show_equals_button_summary">Preference hides or shows equals button</string>
+</resources>
\ No newline at end of file
diff --git a/calculatorpp/res/xml/preferences.xml b/calculatorpp/res/xml/preferences.xml
index 70da6015..e62e9884 100644
--- a/calculatorpp/res/xml/preferences.xml
+++ b/calculatorpp/res/xml/preferences.xml
@@ -134,6 +134,13 @@
 									  a:defaultValue="0;45"
 									  range:steps="5"
 									  range:boundaries="0;45"/>-->
+
+        <android.preference.CheckBoxPreference
+                a:key="autoOrientation"
+                a:title="@string/c_auto_orientation_title"
+                a:summary="@string/c_auto_orientation_summary"
+                a:defaultValue="false"/>
+
 	</PreferenceScreen>
 
 	<PreferenceScreen
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 2d059c13..7e2ba01b 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -8,6 +8,7 @@ package org.solovyev.android.calculator;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.*;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -225,7 +226,9 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
         numeralBaseButtons.addButtonId(R.id.sixDigitButton);
         numeralBaseButtons.toggleNumericDigits(this, preferences);
 
-		preferences.registerOnSharedPreferenceChangeListener(this);
+        toggleOrientationChange(preferences);
+
+        preferences.registerOnSharedPreferenceChangeListener(this);
 	}
 
 	private void toggleButtonDirectionText(int id, boolean showDirectionText, @NotNull DragDirection... dragDirections) {
@@ -670,6 +673,10 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 			useBackAsPrev = CalculatorPreferences.Gui.usePrevAsBack.getPreference(preferences);
 		}
 
+        if ( CalculatorPreferences.Gui.autoOrientation.getKey().equals(key) ) {
+            toggleOrientationChange(preferences);
+        }
+
         if (CalculatorEngine.Preferences.numeralBase.getKey().equals(key)) {
             numeralBaseButtons.toggleNumericDigits(this, preferences);
         }
@@ -679,7 +686,16 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 		}
 	}
 
-	private void initMultiplicationButton() {
+    private void toggleOrientationChange(@Nullable SharedPreferences preferences) {
+        preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(this) : preferences;
+        if (CalculatorPreferences.Gui.autoOrientation.getPreference(preferences)) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+    }
+
+    private void initMultiplicationButton() {
 		final View multiplicationButton = findViewById(R.id.multiplicationButton);
 		if ( multiplicationButton instanceof Button) {
 			((Button) multiplicationButton).setText(CalculatorEngine.instance.getMultiplicationSign());
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
index 5a2f6872..dd158c49 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
@@ -35,6 +35,7 @@ public final class CalculatorPreferences {
         public static final Preference<Boolean> showReleaseNotes = new BooleanPreference("org.solovyev.android.calculator.CalculatorActivity_show_release_notes", true);
         public static final Preference<Boolean> usePrevAsBack = new BooleanPreference("org.solovyev.android.calculator.CalculatorActivity_use_back_button_as_prev", false);
         public static final Preference<Boolean> showEqualsButton = new BooleanPreference("showEqualsButton", true);
+        public static final Preference<Boolean> autoOrientation = new BooleanPreference("autoOrientation", true);
 
         public static enum Theme {
 
diff --git a/pom.xml b/pom.xml
index 03ea24aa..7599b1a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <android.sdk.path>/home/ssolovyev/projects/org.solovyev/misc/lib/android-sdk-linux_x86</android.sdk.path>
     </properties>
 
     <dependencyManagement>