ExactCalculator: Update history icon, drop custom color
Change-Id: Ic58a407d22b32d80e6ec0c770cc90ef735d99479
diff --git a/res/drawable/ic_history.xml b/res/drawable/ic_history.xml
new file mode 100644
index 0000000..cad8507
--- /dev/null
+++ b/res/drawable/ic_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: Material Design Authors / Google LLC
+ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M480,840Q342,840 239.5,748.5Q137,657 122,520L204,520Q218,624 296.5,692Q375,760 480,760Q597,760 678.5,678.5Q760,597 760,480Q760,363 678.5,281.5Q597,200 480,200Q411,200 351,232Q291,264 250,320L360,320L360,400L120,400L120,160L200,160L200,254Q251,190 324.5,155Q398,120 480,120Q555,120 620.5,148.5Q686,177 734.5,225.5Q783,274 811.5,339.5Q840,405 840,480Q840,555 811.5,620.5Q783,686 734.5,734.5Q686,783 620.5,811.5Q555,840 480,840ZM592,648L440,496L440,280L520,280L520,464L648,592L592,648Z"/>
+</vector>
diff --git a/res/drawable/ic_history_grey600_48dp.xml b/res/drawable/ic_history_grey600_48dp.xml
deleted file mode 100644
index 65103fc..0000000
--- a/res/drawable/ic_history_grey600_48dp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 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.
- -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="48.0"
- android:viewportWidth="48.0">
- <path
- android:fillColor="#757575"
- android:pathData="M25.99,6C16.04,6 8,14.06 8,24H2l7.79,7.79 0.14,0.29L18,24h-6c0,-7.73
- 6.27,-14 14,-14s14,6.27 14,14 -6.27,14 -14,14c-3.87,0 -7.36,-1.58
- -9.89,-4.11l-2.83,2.83C16.53,39.98 21.02,42 25.99,42 35.94,42 44,33.94 44,24S35.94,6
- 25.99,6zM24,16v10l8.56,5.08L34,28.65l-7,-4.15V16h-3z" />
-</vector>
\ No newline at end of file
diff --git a/res/layout/empty_history_view.xml b/res/layout/empty_history_view.xml
index 7814b52..01609f2 100644
--- a/res/layout/empty_history_view.xml
+++ b/res/layout/empty_history_view.xml
@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:drawableTop="@drawable/ic_history_grey600_48dp"
+ android:drawableTop="@drawable/ic_history"
android:text="@string/no_history"
android:textSize="20sp" />
diff --git a/res/values-night/color.xml b/res/values-night/color.xml
index 27f2d5f..1d63e35 100644
--- a/res/values-night/color.xml
+++ b/res/values-night/color.xml
@@ -6,7 +6,6 @@
<resources>
<!-- Display background -->
- <color name="empty_history_color">@color/material_dynamic_neutral_variant20</color>
<color name="display_background_color">@color/material_dynamic_neutral20</color>
<!-- Display text -->
diff --git a/res/values/color.xml b/res/values/color.xml
index 39d3178..51f5313 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -18,7 +18,6 @@
<resources>
<!-- Display background -->
- <color name="empty_history_color">@color/material_dynamic_neutral90</color>
<color name="display_background_color">@color/material_dynamic_neutral90</color>
<!-- Display text -->
diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index 9b0f4c0..d1fc1a2 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -123,8 +123,6 @@
newDataSet.add(null);
}
final boolean isEmpty = newDataSet.isEmpty();
- mRecyclerView.setBackgroundColor(ContextCompat.getColor(activity,
- isEmpty ? R.color.empty_history_color : R.color.display_background_color));
if (isEmpty) {
newDataSet.add(new HistoryItem());
}