From 5881883f77f4db4a110f756069464b54fa717c93 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <serso1988@gmail.com>
Date: Mon, 14 Nov 2011 18:36:33 +0400
Subject: [PATCH] percents

---
 res/layout/calc_subtraction_button.xml        |  3 +-
 .../android/calculator/CalculatorModel.java   | 32 +++++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/res/layout/calc_subtraction_button.xml b/res/layout/calc_subtraction_button.xml
index 2feda812..d27a828b 100644
--- a/res/layout/calc_subtraction_button.xml
+++ b/res/layout/calc_subtraction_button.xml
@@ -8,9 +8,8 @@
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/subtractionButton"
-													   calc:textUp="+…%"
+													   calc:textUp="%"
 													   a:text="-"
-													   calc:textDown="-…%"
 													   calc:directionTextScale="0.5"
 													   style="?digitButtonStyle"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
index c0fa7aac..49f5ecb6 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
@@ -257,29 +257,19 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 				@Override
 				public void doOperation(@NotNull EditText editor) {
 					int cursorPositionOffset = 0;
-					final StringBuilder textToBeInserted = new StringBuilder();
+					final StringBuilder textToBeInserted = new StringBuilder(text);
 
-					if (text.equals("+…%")) {
-						textToBeInserted .append("+%");
-						cursorPositionOffset = -1;
-					} else if (text.equals("-…%")) {
-						textToBeInserted.append("-%");
-						cursorPositionOffset = -1;
-					} else {
-						textToBeInserted.append(text);
+					final MathType.Result mathType = MathType.getType(text, 0);
+					switch (mathType.getMathType()) {
+						case function:
+							textToBeInserted.append("()");
+							cursorPositionOffset = -1;
+							break;
+					}
 
-						final MathType.Result mathType = MathType.getType(text, 0);
-						switch (mathType.getMathType()) {
-							case function:
-								textToBeInserted.append("()");
-								cursorPositionOffset = -1;
-								break;
-						}
-
-						if (cursorPositionOffset == 0) {
-							if (MathType.openGroupSymbols.contains(text)) {
-								cursorPositionOffset = -1;
-							}
+					if (cursorPositionOffset == 0) {
+						if (MathType.openGroupSymbols.contains(text)) {
+							cursorPositionOffset = -1;
 						}
 					}