summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable-hdpi/briefcase_icon.pngbin0 -> 5857 bytes
-rw-r--r--res/drawable-hdpi/ic_corp_icon.pngbin2851 -> 0 bytes
-rw-r--r--res/drawable-mdpi/briefcase_icon.pngbin0 -> 3916 bytes
-rw-r--r--res/drawable-mdpi/ic_corp_icon.pngbin2079 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/briefcase_icon.pngbin0 -> 7836 bytes
-rw-r--r--res/drawable-xhdpi/ic_corp_icon.pngbin3999 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/briefcase_icon.pngbin0 -> 11940 bytes
-rw-r--r--res/drawable-xxhdpi/ic_corp_icon.pngbin6220 -> 0 bytes
-rw-r--r--res/drawable-xxxhdpi/briefcase_icon.pngbin0 -> 11346 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_corp_icon.pngbin6417 -> 0 bytes
-rw-r--r--src/com/android/managedprovisioning/LogoUtils.java3
-rw-r--r--tests/src/com/android/managedprovisioning/LogoUtilsTest.java2
12 files changed, 3 insertions, 2 deletions
diff --git a/res/drawable-hdpi/briefcase_icon.png b/res/drawable-hdpi/briefcase_icon.png
new file mode 100644
index 00000000..24aff118
--- /dev/null
+++ b/res/drawable-hdpi/briefcase_icon.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_corp_icon.png b/res/drawable-hdpi/ic_corp_icon.png
deleted file mode 100644
index d83a862d..00000000
--- a/res/drawable-hdpi/ic_corp_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/briefcase_icon.png b/res/drawable-mdpi/briefcase_icon.png
new file mode 100644
index 00000000..429e149e
--- /dev/null
+++ b/res/drawable-mdpi/briefcase_icon.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_corp_icon.png b/res/drawable-mdpi/ic_corp_icon.png
deleted file mode 100644
index 79372b21..00000000
--- a/res/drawable-mdpi/ic_corp_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/briefcase_icon.png b/res/drawable-xhdpi/briefcase_icon.png
new file mode 100644
index 00000000..3466ec84
--- /dev/null
+++ b/res/drawable-xhdpi/briefcase_icon.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_corp_icon.png b/res/drawable-xhdpi/ic_corp_icon.png
deleted file mode 100644
index 3626c7d0..00000000
--- a/res/drawable-xhdpi/ic_corp_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/briefcase_icon.png b/res/drawable-xxhdpi/briefcase_icon.png
new file mode 100644
index 00000000..5164c47d
--- /dev/null
+++ b/res/drawable-xxhdpi/briefcase_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_corp_icon.png b/res/drawable-xxhdpi/ic_corp_icon.png
deleted file mode 100644
index d33319f3..00000000
--- a/res/drawable-xxhdpi/ic_corp_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/briefcase_icon.png b/res/drawable-xxxhdpi/briefcase_icon.png
new file mode 100644
index 00000000..8fc7115a
--- /dev/null
+++ b/res/drawable-xxxhdpi/briefcase_icon.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_corp_icon.png b/res/drawable-xxxhdpi/ic_corp_icon.png
deleted file mode 100644
index 359e210e..00000000
--- a/res/drawable-xxxhdpi/ic_corp_icon.png
+++ /dev/null
Binary files differ
diff --git a/src/com/android/managedprovisioning/LogoUtils.java b/src/com/android/managedprovisioning/LogoUtils.java
index 5e377736..74b801b5 100644
--- a/src/com/android/managedprovisioning/LogoUtils.java
+++ b/src/com/android/managedprovisioning/LogoUtils.java
@@ -72,7 +72,8 @@ public class LogoUtils {
// If the app that started ManagedProvisioning didn't specify a logo or we couldn't get a
// logo from the uri they specified, use the default logo.
if (bitmap == null) {
- bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_corp_icon);
+ bitmap = BitmapFactory.decodeResource(context.getResources(),
+ R.drawable.briefcase_icon);
}
return new BitmapDrawable(context.getResources(),
resizeBitmap(bitmap, maxWidth, maxHeight));
diff --git a/tests/src/com/android/managedprovisioning/LogoUtilsTest.java b/tests/src/com/android/managedprovisioning/LogoUtilsTest.java
index a2da59f8..844bf71f 100644
--- a/tests/src/com/android/managedprovisioning/LogoUtilsTest.java
+++ b/tests/src/com/android/managedprovisioning/LogoUtilsTest.java
@@ -111,7 +111,7 @@ public class LogoUtilsTest extends AndroidTestCase {
public void testDontSaveOrganisationLogo() throws Exception {
Drawable logo = LogoUtils.getOrganisationLogo(getContext());
// We didn't save the organisation logo: it should be the default one.
- Drawable expected = getContext().getResources().getDrawable(R.drawable.ic_corp_icon);
+ Drawable expected = getContext().getResources().getDrawable(R.drawable.briefcase_icon);
assertEquals(logo.getIntrinsicWidth(), expected.getIntrinsicWidth());
assertEquals(logo.getIntrinsicHeight(), expected.getIntrinsicHeight());
}