More descriptive errors for install failures

Change-Id: Ica79bece0fd29c27126e1ee51daeac96affaa1ab

4 files changed, 69 insertions, 1 deletions

diff --git a/res/drawable/ic_result_status.xml b/res/drawable/ic_result_status.xml
new file mode 100644
index 00000000..5e8fe977
--- /dev/null
+++ b/res/drawable/ic_result_status.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- success state -->
+    <item android:maxLevel="0" android:drawable="@drawable/button_indicator_finish"/>
+    <!-- failure state -->
+    <item android:maxLevel="1" android:drawable="@android:drawable/ic_delete"/>
+</level-list>
\ No newline at end of file
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml
index ded050c3..4e8f9b1f 100755
--- a/res/layout/op_progress.xml
+++ b/res/layout/op_progress.xml
@@ -31,8 +31,19 @@
             android:text="@string/installing"
             android:paddingTop="16dip"
             android:paddingLeft="16dip"
-            android:paddingBottom="16dip"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
+    <TextView
+            android:id="@+id/center_explanation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:paddingTop="8dip"
+            android:paddingLeft="16dip"
+            android:paddingBottom="16dip"
+            android:textAppearance="?android:attr/textAppearanceSmall"/>
+
     <ProgressBar
             android:id="@+id/progress_bar"
             style="?android:attr/progressBarStyleHorizontal"
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index e9e1ec29..951f2446 100755
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -32,6 +32,15 @@
             style="@style/padded"
             android:paddingBottom="16dip"
             android:textAppearance="?android:attr/textAppearanceMedium" />
+    <Button android:id="@+id/device_manager_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center_horizontal"
+            android:maxLines="2"
+            android:text="@string/manage_device_administrators"/>
     <ProgressBar
             android:id="@+id/progress_bar"
             style="?android:attr/progressBarStyleHorizontal"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5dbae68a..d8749782 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,25 @@
     <string name="install_done">Application installed</string>
     <string name="install_confirm_question">Do you want to install this application?</string>
     <string name="install_failed">Application not installed</string>
+    <!-- Reason displayed when installation fails because the installation package itself is invalid
+        in some way (e.g., corrupt) [CHAR LIMIT=100] -->
+    <string name="install_failed_invalid_apk">The package appears to be corrupt.</string>
+    <!-- Reason displayed when installation fails because the package an existing package is
+        installed with a conflicting package author signature [CHAR LIMIT=100] -->
+    <string name="install_failed_inconsistent_certificates">An existing package by the same name
+        with a conflicting signature is already installed.</string>
+    <!-- Reason displayed when installation fails because the package specifies a minimum compatible
+        OS version that is newer than our current OS version. [CHAR LIMIT=100] -->
+    <string name="install_failed_older_sdk">The package only works on newer versions of
+        Android.</string>
+    <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
+    <string name="install_failed_cpu_abi_incompatible" product="tablet">This application is not
+        compatible with this tablet\'s CPU.</string>
+    <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
+    <string name="install_failed_cpu_abi_incompatible" product="default">This application is not
+        compatible with this phone\'s CPU.</string>
     <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
     <string name="install_failed_msg" product="tablet"><xliff:g id="app_name">%1$s</xliff:g> could not be installed on this tablet.</string>
     <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
@@ -58,6 +77,14 @@ found in the list of installed applications.</string>
     <string name="uninstalling">Uninstalling\u2026</string>
     <string name="uninstall_done">Uninstall finished</string>
     <string name="uninstall_failed">Uninstall not successful</string>
+    <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator [CHAR LIMIT=80] -->
+    <string name="uninstall_failed_device_policy_manager">Cannot uninstall: this package is an
+        active device administrator.</string>
+    <!-- String on a button that leads to the "device administrator" configuration setting where a
+        user will be able to disable the device administrator in order to uninstall
+        it. [CHAR LIMIT=50] -->
+    <string name="manage_device_administrators">Manage device administrators</string>
     <string name="uninstall_failed_msg"><xliff:g id="app_name">%1$s</xliff:g> could not be uninstalled</string>
 
     <!-- Dialog attributes to indicate parse errors -->