From 7387add6feefeb9be1d99b7da0b5848996c9b45a Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 5 Mar 2014 17:57:05 -0800
Subject: 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
---
 res/drawable/btn_stationary.xml    | 22 ----------------------
 res/drawable/calc_clear_symbol.xml |  3 ---
 res/drawable/ic_delete.xml         |  4 ++++
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 res/drawable/btn_stationary.xml
 delete mode 100644 res/drawable/calc_clear_symbol.xml
 create mode 100644 res/drawable/ic_delete.xml

(limited to 'res/drawable')

diff --git a/res/drawable/btn_stationary.xml b/res/drawable/btn_stationary.xml
deleted file mode 100644
index a8d5b55..0000000
--- a/res/drawable/btn_stationary.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-<reveal xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:drawable="@color/primary_light"/>
-    <item android:drawable="@color/primary"/>
-
-</reveal>
\ No newline at end of file
diff --git a/res/drawable/calc_clear_symbol.xml b/res/drawable/calc_clear_symbol.xml
deleted file mode 100644
index 5bbc3ab..0000000
--- a/res/drawable/calc_clear_symbol.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/calc_clear_symbol_tintable" />
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..367e7cf
--- /dev/null
+++ b/res/drawable/ic_delete.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_delete_alpha"
+    android:tint="@color/text_light" />
-- 
cgit v1.2.3