Rearrange buttons

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" />

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" />

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" />

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" />

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" />