From fbd1571632ccbe6a8db73997d1f1834c8f1e586c Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sun, 16 Jun 2013 19:26:28 +0400
Subject: [PATCH] changes

---
 .../android/calculator/CalculatorButtons.java      |  9 +++++----
 android-app/AndroidManifest.xml                    | 14 +++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
index fd58e8b7..6909c290 100644
--- a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
+++ b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
@@ -13,8 +13,6 @@ import android.widget.Button;
 import android.widget.RemoteViews;
 import jscl.AngleUnit;
 import jscl.NumeralBase;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.solovyev.android.Views;
 import org.solovyev.android.calculator.core.R;
 import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
@@ -25,6 +23,9 @@ import org.solovyev.android.view.drag.DragDirection;
 import org.solovyev.android.view.drag.SimpleOnDragListener;
 import org.solovyev.common.math.Point2d;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * User: serso
  * Date: 9/28/12
@@ -135,10 +136,10 @@ public final class CalculatorButtons {
 			if (dragDirection == DragDirection.up) {
 				Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_var_dialog, null, context);
 				result = true;
-			} else if (dragDirection == DragDirection.down) {
+			}/* else if (dragDirection == DragDirection.down) {
 				Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_matrix_dialog, null, context);
 				result = true;
-			}
+			}*/
 
 			return result;
 		}
diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
index e0bf93be..483b0aa0 100644
--- a/android-app/AndroidManifest.xml
+++ b/android-app/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
 	<application android:allowBackup="true" android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
 
-		<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
+		<activity android:clearTaskOnLaunch="true" android:launchMode="singleTop" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
 
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
@@ -33,7 +33,7 @@
 
 		</activity>
 
-		<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
+		<activity android:clearTaskOnLaunch="true" android:launchMode="singleTop" android:label="@string/c_app_name" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
 
 		<!-- settings must use action bar icon-->
 		<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.CalculatorPreferencesActivity"/>
@@ -54,13 +54,13 @@
 		<activity android:name=".CalculatorWikiActivity"/>
 
 		<activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
-		<activity android:label="@string/cpp_plot_functions" android:launchMode="singleTop" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
-		<activity android:label="@string/cpp_plot_function_settings" android:launchMode="singleTop" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
-		<activity android:label="@string/cpp_plot_range" android:launchMode="singleTop" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+		<activity android:label="@string/cpp_plot_functions" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+		<activity android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+		<activity android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
-		<activity android:label="@string/cpp_purchase_title" android:launchMode="singleTop" android:name=".preferences.CalculatorPurchaseDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+		<activity android:label="@string/cpp_purchase_title" android:name=".preferences.CalculatorPurchaseDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
-		<activity android:launchMode="singleTop" android:name=".CalculatorDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+		<activity android:name=".CalculatorDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
 		<!-- todo serso: strings-->
 		<activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity"/>