summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2014-05-27 17:53:10 -0700
committerJustin Klaassen <justinklaassen@google.com>2014-05-28 15:17:38 -0700
commit4b3af0578b1a44038856bc56244aea8aaeac22d1 (patch)
tree98685ecfd26c20e42bda03ae976e742c02478663 /res/drawable
parenta1d84550f39728b7a68e3f9c85d7f757ea55f114 (diff)
downloadandroid_packages_apps_ExactCalculator-4b3af0578b1a44038856bc56244aea8aaeac22d1.tar.gz
android_packages_apps_ExactCalculator-4b3af0578b1a44038856bc56244aea8aaeac22d1.tar.bz2
android_packages_apps_ExactCalculator-4b3af0578b1a44038856bc56244aea8aaeac22d1.zip
Overhaul Calculator UI.
Bug: 14418545 Bug: 14419084 Bug: 14419142 Bug: 14420277 Bug: 14466652 Bug: 14564559 Bug: 14564608 Bug: 14846724 Bug: 15090154 Bug: 15287699 Bug: 15289526 Bug: 15289616 Change-Id: I93e1530446d5bd6a4c3189f751c88ece1abc7767
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/btn_advanced.xml18
-rw-r--r--res/drawable/btn_digit.xml18
-rw-r--r--res/drawable/btn_function.xml18
-rw-r--r--res/drawable/display_shadow.xml23
-rw-r--r--res/drawable/ic_delete.xml4
-rw-r--r--res/drawable/pad_btn_background.xml21
-rw-r--r--res/drawable/pad_page_shadow.xml22
-rw-r--r--res/drawable/shadow_bottom.xml9
-rw-r--r--res/drawable/shadow_right.xml9
-rw-r--r--res/drawable/shadow_top.xml9
10 files changed, 66 insertions, 85 deletions
diff --git a/res/drawable/btn_advanced.xml b/res/drawable/btn_advanced.xml
deleted file mode 100644
index 8f99f46..0000000
--- a/res/drawable/btn_advanced.xml
+++ /dev/null
@@ -1,18 +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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/primary_dark" android:pinned="true" />
diff --git a/res/drawable/btn_digit.xml b/res/drawable/btn_digit.xml
deleted file mode 100644
index 286b735..0000000
--- a/res/drawable/btn_digit.xml
+++ /dev/null
@@ -1,18 +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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/gray_50" android:pinned="true" />
diff --git a/res/drawable/btn_function.xml b/res/drawable/btn_function.xml
deleted file mode 100644
index fc4fa56..0000000
--- a/res/drawable/btn_function.xml
+++ /dev/null
@@ -1,18 +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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/gray_60" android:pinned="true" />
diff --git a/res/drawable/display_shadow.xml b/res/drawable/display_shadow.xml
new file mode 100644
index 0000000..e68b63d
--- /dev/null
+++ b/res/drawable/display_shadow.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+ -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <gradient
+ android:angle="90"
+ android:startColor="@android:color/transparent"
+ android:endColor="#33000000" />
+</shape> \ No newline at end of file
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
deleted file mode 100644
index 367e7cf..0000000
--- a/res/drawable/ic_delete.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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" />
diff --git a/res/drawable/pad_btn_background.xml b/res/drawable/pad_btn_background.xml
new file mode 100644
index 0000000..1366dfc
--- /dev/null
+++ b/res/drawable/pad_btn_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+ -->
+
+<ripple
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@color/pad_button_tint_color"
+ android:pinned="true" /> \ No newline at end of file
diff --git a/res/drawable/pad_page_shadow.xml b/res/drawable/pad_page_shadow.xml
new file mode 100644
index 0000000..4cd079b
--- /dev/null
+++ b/res/drawable/pad_page_shadow.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+ -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <gradient
+ android:startColor="@android:color/transparent"
+ android:endColor="#33000000" />
+</shape> \ No newline at end of file
diff --git a/res/drawable/shadow_bottom.xml b/res/drawable/shadow_bottom.xml
deleted file mode 100644
index e07dfdf..0000000
--- a/res/drawable/shadow_bottom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <gradient
- android:angle="90"
- android:endColor="#C0000000"
- android:startColor="#00000000" />
-
-</shape> \ No newline at end of file
diff --git a/res/drawable/shadow_right.xml b/res/drawable/shadow_right.xml
deleted file mode 100644
index c842311..0000000
--- a/res/drawable/shadow_right.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <gradient
- android:angle="0"
- android:endColor="#33000000"
- android:startColor="#00000000" />
-
-</shape> \ No newline at end of file
diff --git a/res/drawable/shadow_top.xml b/res/drawable/shadow_top.xml
deleted file mode 100644
index fa30d3e..0000000
--- a/res/drawable/shadow_top.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <gradient
- android:angle="270"
- android:endColor="#C0000000"
- android:startColor="#00000000" />
-
-</shape> \ No newline at end of file