summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-12-02 23:56:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-02 23:56:59 +0000
commitadd351b88db5b444c4b59174a3564f3e2599c9ae (patch)
tree150e124b42b47326b16c592c6bbce7e3fcc145e6
parentfdfa5bf86495b1743c6c93b9ed579852f8e65d35 (diff)
parentf2478f320ac93ad237223a2bba35a54638942d63 (diff)
downloadandroid_packages_apps_PackageInstaller-add351b88db5b444c4b59174a3564f3e2599c9ae.tar.gz
android_packages_apps_PackageInstaller-add351b88db5b444c4b59174a3564f3e2599c9ae.tar.bz2
android_packages_apps_PackageInstaller-add351b88db5b444c4b59174a3564f3e2599c9ae.zip
am f2478f32: am 950eaa29: Use Material tinting for install result
* commit 'f2478f320ac93ad237223a2bba35a54638942d63': Use Material tinting for install result
-rw-r--r--res/drawable/ic_fail_material.xml18
-rw-r--r--res/drawable/ic_result_status.xml4
-rw-r--r--res/drawable/ic_success_material.xml18
-rwxr-xr-xsrc/com/android/packageinstaller/InstallAppProgress.java4
4 files changed, 40 insertions, 4 deletions
diff --git a/res/drawable/ic_fail_material.xml b/res/drawable/ic_fail_material.xml
new file mode 100644
index 00000000..9d53fdc0
--- /dev/null
+++ b/res/drawable/ic_fail_material.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_fail"
+ android:tint="?android:attr/colorControlNormal" />
diff --git a/res/drawable/ic_result_status.xml b/res/drawable/ic_result_status.xml
index 7fc043f5..bd8bf756 100644
--- a/res/drawable/ic_result_status.xml
+++ b/res/drawable/ic_result_status.xml
@@ -15,7 +15,7 @@
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- success state -->
- <item android:maxLevel="0" android:drawable="@drawable/ic_success"/>
+ <item android:maxLevel="0" android:drawable="@drawable/ic_success_material"/>
<!-- failure state -->
- <item android:maxLevel="1" android:drawable="@drawable/ic_fail"/>
+ <item android:maxLevel="1" android:drawable="@drawable/ic_fail_material"/>
</level-list> \ No newline at end of file
diff --git a/res/drawable/ic_success_material.xml b/res/drawable/ic_success_material.xml
new file mode 100644
index 00000000..ebcce3b5
--- /dev/null
+++ b/res/drawable/ic_success_material.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_success"
+ android:tint="?android:attr/colorControlNormal" />
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index c8e4133b..d51cab1d 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -92,8 +92,8 @@ public class InstallAppProgress extends Activity implements View.OnClickListener
// Show the ok button
int centerTextLabel;
int centerExplanationLabel = -1;
- LevelListDrawable centerTextDrawable = (LevelListDrawable) getResources()
- .getDrawable(R.drawable.ic_result_status);
+ LevelListDrawable centerTextDrawable =
+ (LevelListDrawable) getDrawable(R.drawable.ic_result_status);
if (msg.arg1 == PackageManager.INSTALL_SUCCEEDED) {
mLaunchButton.setVisibility(View.VISIBLE);
centerTextDrawable.setLevel(0);