From 1a31c5a053fda5ede98ba1f0264fe985d406b977 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Sat, 2 Apr 2016 15:26:11 +0200
Subject: [PATCH] Rearrange buttons

---
 app/src/main/res/layout-land/cpp_app_keyboard.xml         | 4 ++--
 app/src/main/res/layout/cpp_app_button_6.xml              | 1 -
 app/src/main/res/layout/cpp_app_button_division.xml       | 1 +
 app/src/main/res/layout/cpp_app_button_multiplication.xml | 4 +++-
 app/src/main/res/layout/cpp_app_button_percent.xml        | 3 ---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout-land/cpp_app_keyboard.xml b/app/src/main/res/layout-land/cpp_app_keyboard.xml
index 36108a64..8b210807 100644
--- a/app/src/main/res/layout-land/cpp_app_keyboard.xml
+++ b/app/src/main/res/layout-land/cpp_app_keyboard.xml
@@ -84,10 +84,10 @@
         a:baselineAligned="false"
         a:orientation="horizontal">
 
-        <include layout="@layout/cpp_app_button_copy" />
-
         <include layout="@layout/cpp_app_button_paste" />
 
+        <include layout="@layout/cpp_app_button_percent" />
+
         <include layout="@layout/cpp_app_button_1" />
 
         <include layout="@layout/cpp_app_button_2" />
diff --git a/app/src/main/res/layout/cpp_app_button_6.xml b/app/src/main/res/layout/cpp_app_button_6.xml
index 1abffd6e..de56b116 100644
--- a/app/src/main/res/layout/cpp_app_button_6.xml
+++ b/app/src/main/res/layout/cpp_app_button_6.xml
@@ -29,6 +29,5 @@
     a:id="@id/cpp_button_6"
     style="?attr/cpp_button_style_digit"
     a:text="6"
-    c:directionTextUp="√"
     c:directionTextLeft="F"
     tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_app_button_division.xml b/app/src/main/res/layout/cpp_app_button_division.xml
index fd92ccb8..4d42b243 100644
--- a/app/src/main/res/layout/cpp_app_button_division.xml
+++ b/app/src/main/res/layout/cpp_app_button_division.xml
@@ -28,5 +28,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     a:id="@id/cpp_button_division"
     style="?attr/cpp_button_style_operation"
+    c:directionTextUp="√"
     a:text="/"
     tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_app_button_multiplication.xml b/app/src/main/res/layout/cpp_app_button_multiplication.xml
index d95c233f..66623666 100644
--- a/app/src/main/res/layout/cpp_app_button_multiplication.xml
+++ b/app/src/main/res/layout/cpp_app_button_multiplication.xml
@@ -24,9 +24,11 @@
 
 <org.solovyev.android.views.dragbutton.DirectionDragButton
     xmlns:a="http://schemas.android.com/apk/res/android"
-    xmlns:c="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     a:id="@id/cpp_button_multiplication"
     style="?attr/cpp_button_style_operation"
     a:text="×"
+    app:directionTextDown="^2"
+    app:directionTextUp="^"
     tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_app_button_percent.xml b/app/src/main/res/layout/cpp_app_button_percent.xml
index f332536b..361b5440 100644
--- a/app/src/main/res/layout/cpp_app_button_percent.xml
+++ b/app/src/main/res/layout/cpp_app_button_percent.xml
@@ -26,9 +26,6 @@
     a:id="@id/cpp_button_percent"
     style="?attr/cpp_button_style_control"
     xmlns:a="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     a:text="%"
-    app:directionTextDown="^2"
-    app:directionTextUp="^"
     tools:ignore="HardcodedText" />
\ No newline at end of file