#14399: cleanup and consistency

res/layout/test_layout.xml

@@ -97,8 +97,8 @@ as that of the covered work.
         android:id="@+id/buttonCall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
         android:layout_weight=".5"
+        android:gravity="center_vertical"
         android:onClick="onClick"
         android:src="@drawable/ic_call"
         android:background="@drawable/call_button" />
@@ -107,11 +107,11 @@ as that of the covered work.
         android:id="@+id/buttonHangUp"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="0.50"
-        android:background="@drawable/hangup_button"
+        android:layout_weight=".5"
         android:gravity="center_vertical"
         android:onClick="onClick"
-        android:src="@drawable/ic_hangup" />
+        android:src="@drawable/ic_hangup"
+        android:background="@drawable/hangup_button" />
 
     <ImageButton
         android:id="@+id/buttonIncomingCall"
@@ -124,8 +124,6 @@ as that of the covered work.
         android:background="@drawable/hangup_button"
         android:drawable="@drawable/hangup_button" />
     </LinearLayout>
-
-<!--         android:background="@drawable/custom_button" -->
     
     <TextView
         android:id="@+id/callVoid_text"