summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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, 4 insertions, 40 deletions
diff --git a/res/drawable/ic_fail_material.xml b/res/drawable/ic_fail_material.xml
deleted file mode 100644
index 9d53fdc0..00000000
--- a/res/drawable/ic_fail_material.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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 bd8bf756..7fc043f5 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_material"/>
+ <item android:maxLevel="0" android:drawable="@drawable/ic_success"/>
<!-- failure state -->
- <item android:maxLevel="1" android:drawable="@drawable/ic_fail_material"/>
+ <item android:maxLevel="1" android:drawable="@drawable/ic_fail"/>
</level-list> \ No newline at end of file
diff --git a/res/drawable/ic_success_material.xml b/res/drawable/ic_success_material.xml
deleted file mode 100644
index ebcce3b5..00000000
--- a/res/drawable/ic_success_material.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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 d3bcb1ea..2f297e0c 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) getDrawable(R.drawable.ic_result_status);
+ LevelListDrawable centerTextDrawable = (LevelListDrawable) getResources()
+ .getDrawable(R.drawable.ic_result_status);
if (msg.arg1 == PackageManager.INSTALL_SUCCEEDED) {
mLaunchButton.setVisibility(View.VISIBLE);
centerTextDrawable.setLevel(0);