Cleanup keyboard layout files

Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060
diff --git a/java/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml
index 7f88cd3..ee1feab 100644
--- a/java/res/xml/popup_punctuation.xml
+++ b/java/res/xml/popup_punctuation.xml
@@ -18,29 +18,51 @@
 */
 -->
 
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:keyWidth="10%p"
     android:horizontalGap="0px"
     android:verticalGap="0px"
     android:keyHeight="@dimen/key_height"
+>
+    <Row
+        android:rowEdgeFlags="top"
     >
-
-    <Row android:rowEdgeFlags="top">
-        <Key android:keyLabel=":" android:keyEdgeFlags="left" />
-        <Key android:keyLabel="/" />
-        <Key android:keyLabel="&amp;" />
-        <Key android:keyLabel="(" />
-        <Key android:keyLabel=")" />
-        <Key android:keyLabel="-" />
-        <Key android:keyLabel="+" android:keyEdgeFlags="right" />
+        <Key
+            android:keyLabel=":"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="/" />
+        <Key
+            android:keyLabel="&amp;" />
+        <Key
+            android:keyLabel="(" />
+        <Key
+            android:keyLabel=")" />
+        <Key
+            android:keyLabel="-" />
+        <Key
+            android:keyLabel="+"
+            android:keyEdgeFlags="right" />
     </Row>
-    <Row android:rowEdgeFlags="bottom">
-        <Key android:keyLabel=";" android:keyEdgeFlags="left" />
-        <Key android:keyLabel="\@" />
-        <Key android:keyLabel="\'" />
-        <Key android:keyLabel="&quot;" />
-        <Key android:keyLabel="\?" />
-        <Key android:keyLabel="!" />
-        <Key android:keyLabel="," android:keyEdgeFlags="right" />
+    <Row
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:keyLabel=";"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="\@" />
+        <Key
+            android:keyLabel="\'" />
+        <Key
+            android:keyLabel="&quot;" />
+        <Key
+            android:keyLabel="\?" />
+        <Key
+            android:keyLabel="!" />
+        <Key
+            android:keyLabel=","
+            android:keyEdgeFlags="right" />
     </Row>
 </Keyboard>