summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-07-25 21:32:18 +0100
committerAlexandra Gherghina <alexgherghina@google.com>2014-07-29 15:21:01 +0000
commit1f33d77f0430efb2d7eb532e360ba9a30004ffe7 (patch)
treed6941ab952028680bba6564c1d18a08ef0d5183d
parent7299bc1305db0de9531b0d875769735a0ebfa2bd (diff)
downloadframeworks_base-1f33d77f0430efb2d7eb532e360ba9a30004ffe7.zip
frameworks_base-1f33d77f0430efb2d7eb532e360ba9a30004ffe7.tar.gz
frameworks_base-1f33d77f0430efb2d7eb532e360ba9a30004ffe7.tar.bz2
Rename work icon symbol to match the prefix used for badges.
Also renames the images for consistency. Bug: 16369104 Change-Id: I19f97ae22cb2ee4f7db210f083badc1a30520b44
-rw-r--r--core/res/AndroidManifest.xml2
-rw-r--r--core/res/res/drawable-hdpi/ic_corp_icon.png (renamed from core/res/res/drawable-hdpi/ic_afw_icon.png)bin1298 -> 1298 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_corp_icon.png (renamed from core/res/res/drawable-mdpi/ic_afw_icon.png)bin906 -> 906 bytes
-rw-r--r--core/res/res/drawable-xhdpi/ic_corp_icon.png (renamed from core/res/res/drawable-xhdpi/ic_afw_icon.png)bin1488 -> 1488 bytes
-rw-r--r--core/res/res/drawable-xxhdpi/ic_corp_icon.png (renamed from core/res/res/drawable-xxhdpi/ic_afw_icon.png)bin2137 -> 2137 bytes
-rw-r--r--core/res/res/values/symbols.xml2
6 files changed, 2 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 97caf33..38dccbe 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2847,7 +2847,7 @@
</activity-alias>
<activity-alias android:name="com.android.internal.app.ForwardIntentToManagedProfile"
android:targetActivity="com.android.internal.app.IntentForwarderActivity"
- android:icon="@drawable/ic_afw_icon"
+ android:icon="@drawable/ic_corp_icon"
android:exported="true"
android:label="@string/managed_profile_label">
</activity-alias>
diff --git a/core/res/res/drawable-hdpi/ic_afw_icon.png b/core/res/res/drawable-hdpi/ic_corp_icon.png
index fc986fe..fc986fe 100644
--- a/core/res/res/drawable-hdpi/ic_afw_icon.png
+++ b/core/res/res/drawable-hdpi/ic_corp_icon.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_afw_icon.png b/core/res/res/drawable-mdpi/ic_corp_icon.png
index deb7966..deb7966 100644
--- a/core/res/res/drawable-mdpi/ic_afw_icon.png
+++ b/core/res/res/drawable-mdpi/ic_corp_icon.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_afw_icon.png b/core/res/res/drawable-xhdpi/ic_corp_icon.png
index ec4f44b..ec4f44b 100644
--- a/core/res/res/drawable-xhdpi/ic_afw_icon.png
+++ b/core/res/res/drawable-xhdpi/ic_corp_icon.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_afw_icon.png b/core/res/res/drawable-xxhdpi/ic_corp_icon.png
index 6888377..6888377 100644
--- a/core/res/res/drawable-xxhdpi/ic_afw_icon.png
+++ b/core/res/res/drawable-xxhdpi/ic_corp_icon.png
Binary files differ
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index c8de13b..37dc046 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1136,7 +1136,7 @@
<java-symbol type="drawable" name="cling_bg" />
<java-symbol type="drawable" name="ic_corp_badge" />
<java-symbol type="drawable" name="ic_corp_icon_badge" />
- <java-symbol type="drawable" name="ic_afw_icon" />
+ <java-symbol type="drawable" name="ic_corp_icon" />
<java-symbol type="drawable" name="sim_light_blue" />
<java-symbol type="drawable" name="sim_light_green" />