Merge "Fixup widths of clear/ delete buttons" into jb-mr1-dev
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index 2d3b1c3..c8a1216 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -4,16 +4,16 @@
/*
* Copyright (C) 2008, The Android Open Source Project
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
@@ -50,16 +50,12 @@
android:layout_marginLeft="8dip"
android:visibility="gone"/>
<FrameLayout
- android:layout_width="0dp"
- android:layout_weight="1"
+ android:layout_width="100dp"
android:layout_height="match_parent">
<!-- marginRight has to be 0 to catch border-touch -->
<com.android.calculator2.ColorButton
android:id="@+id/clear"
android:text="@string/clear"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
/>
@@ -67,9 +63,6 @@
<com.android.calculator2.ColorButton
android:id="@+id/del"
android:text="@string/del"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
android:contentDescription="@string/delDesc"
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index f624d01..e4e3c1a 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -4,16 +4,16 @@
/*
* Copyright (C) 2008, The Android Open Source Project
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
@@ -78,7 +78,7 @@
android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
- android:minWidth="100dip"
+ android:minWidth="89dip"
/>
<!-- marginRight has to be 0 to catch border-touch -->
<com.android.calculator2.ColorButton
