Rename calculator back to Calculator

Also renames some assets, removes the stationary button style, and
restores the default clear / delete icon switching.

BUG: 13322842
BUG: 13321800
Change-Id: I43ccf7a7eb40a670289ca61c3582f0914a4bacee

1 files changed, 33 insertions, 24 deletions

diff --git a/res/layout-port/simple_pad.xml b/res/layout-port/simple_pad.xml
index 606e16a..276e079 100644
--- a/res/layout-port/simple_pad.xml
+++ b/res/layout-port/simple_pad.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
 
-<!--
-/*
-* Copyright (C) 2011, 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
-*
-*     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
-* limitations under the License.
-*/
+     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
+
+     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.
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -116,13 +112,26 @@
         android:layout_weight="1"
         android:orientation="vertical" >
 
-        <ImageButton
-            android:id="@+id/del"
-            style="@style/function_button"
-            android:contentDescription="@string/delDesc"
-            android:src="@drawable/calc_clear_symbol"
-            android:text="@string/del"
-            android:textSize="@dimen/small_text_size" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" >
+
+            <ImageButton
+                android:id="@+id/del"
+                style="@style/function_button"
+                android:contentDescription="@string/delDesc"
+                android:src="@drawable/ic_delete"
+                android:textSize="@dimen/small_text_size" />
+
+            <Button
+                android:id="@+id/clear"
+                style="@style/function_button"
+                android:contentDescription="@string/clearDesc"
+                android:text="@string/clear"
+                android:textSize="@dimen/small_text_size"
+                android:visibility="invisible" />
+        </FrameLayout>
 
         <Button
             android:id="@+id/div"
@@ -149,4 +158,4 @@
             android:text="@string/plus" />
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file