aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-02-02 09:00:00 +0200
committerMichael Bestas <mikeioannina@gmail.com>2015-02-03 12:17:11 +0200
commitd95652487cb9f7e69399ad71b06754abc88a5183 (patch)
tree4dd14fe1f88842bb5faa32f34c3d87ba5396973b
parent25e803b383dfa76afed8d7c61c10d1941ac371a9 (diff)
downloadandroid_packages_apps_CMFileManager-d95652487cb9f7e69399ad71b06754abc88a5183.tar.gz
android_packages_apps_CMFileManager-d95652487cb9f7e69399ad71b06754abc88a5183.tar.bz2
android_packages_apps_CMFileManager-d95652487cb9f7e69399ad71b06754abc88a5183.zip
New Material icon
* Created by Jovie Brett Bardoles Change-Id: I9c4067f100db25efd4b66d0fb03add94bc06642e
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/drawable-hdpi/ic_launcher.pngbin2518 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_editor.pngbin1237 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_settings.pngbin1600 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher.pngbin1848 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_editor.pngbin906 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_settings.pngbin1143 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher.pngbin3291 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_editor.pngbin1530 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_settings.pngbin1967 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_launcher.pngbin7171 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_launcher_editor.pngbin3514 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_launcher_settings.pngbin4499 -> 0 bytes
-rw-r--r--res/mipmap-hdpi/ic_launcher_filemanager.pngbin0 -> 23525 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_filemanager.pngbin0 -> 22870 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_filemanager.pngbin0 -> 24093 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_filemanager.pngbin0 -> 25445 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_filemanager.pngbin0 -> 26839 bytes
-rw-r--r--src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java2
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java2
-rw-r--r--src/com/cyanogenmod/filemanager/activities/PickerActivity.java2
21 files changed, 4 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8721d613..02189318 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,7 @@
<application
android:name="FileManagerApplication"
android:description="@string/app_description"
- android:icon="@drawable/ic_launcher"
+ android:icon="@mipmap/ic_launcher_filemanager"
android:label="@string/app_name"
android:largeHeap="true"
android:theme="@style/FileManager.Theme.Material.Light"
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 0e27d27c..00000000
--- a/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_editor.png b/res/drawable-hdpi/ic_launcher_editor.png
deleted file mode 100644
index 61b26352..00000000
--- a/res/drawable-hdpi/ic_launcher_editor.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
deleted file mode 100644
index 831dd016..00000000
--- a/res/drawable-hdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 3641f65f..00000000
--- a/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_editor.png b/res/drawable-mdpi/ic_launcher_editor.png
deleted file mode 100644
index 3fee767b..00000000
--- a/res/drawable-mdpi/ic_launcher_editor.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/drawable-mdpi/ic_launcher_settings.png
deleted file mode 100644
index fb6f6ea9..00000000
--- a/res/drawable-mdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 9343eba0..00000000
--- a/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_editor.png b/res/drawable-xhdpi/ic_launcher_editor.png
deleted file mode 100644
index 974199b7..00000000
--- a/res/drawable-xhdpi/ic_launcher_editor.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_settings.png b/res/drawable-xhdpi/ic_launcher_settings.png
deleted file mode 100644
index 821caeca..00000000
--- a/res/drawable-xhdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 232d17e7..00000000
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher_editor.png b/res/drawable-xxhdpi/ic_launcher_editor.png
deleted file mode 100644
index c21a4ee1..00000000
--- a/res/drawable-xxhdpi/ic_launcher_editor.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher_settings.png b/res/drawable-xxhdpi/ic_launcher_settings.png
deleted file mode 100644
index 517f4f6c..00000000
--- a/res/drawable-xxhdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-hdpi/ic_launcher_filemanager.png b/res/mipmap-hdpi/ic_launcher_filemanager.png
new file mode 100644
index 00000000..3c324df6
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_filemanager.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_filemanager.png b/res/mipmap-mdpi/ic_launcher_filemanager.png
new file mode 100644
index 00000000..ad863558
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_filemanager.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_filemanager.png b/res/mipmap-xhdpi/ic_launcher_filemanager.png
new file mode 100644
index 00000000..3fcb6a96
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_filemanager.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_filemanager.png b/res/mipmap-xxhdpi/ic_launcher_filemanager.png
new file mode 100644
index 00000000..c43ba814
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_filemanager.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_filemanager.png b/res/mipmap-xxxhdpi/ic_launcher_filemanager.png
new file mode 100644
index 00000000..8a9ba7d9
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_filemanager.png
Binary files differ
diff --git a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
index c2e8d334..1e9b7334 100644
--- a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
@@ -120,7 +120,7 @@ public class ChangeLogActivity extends Activity implements OnCancelListener, OnD
// Show a dialog
AlertDialog dialog = DialogHelper.createAlertDialog(
- this, R.drawable.ic_launcher,
+ this, R.mipmap.ic_launcher_filemanager,
R.string.changelog_title, sb.toString(), false);
dialog.setOnCancelListener(this);
dialog.setOnDismissListener(this);
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index e062b42e..f7e769a4 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -743,7 +743,7 @@ public class NavigationActivity extends Activity
mDrawerLayout.openDrawer(Gravity.START);
AlertDialog dialog = DialogHelper.createAlertDialog(this,
- R.drawable.ic_launcher, R.string.welcome_title,
+ R.mipmap.ic_launcher_filemanager, R.string.welcome_title,
getString(R.string.welcome_msg), false);
DialogHelper.delegateDialogShow(this, dialog);
diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
index 16a290bd..f2ae5a19 100644
--- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
@@ -281,7 +281,7 @@ public class PickerActivity extends Activity
// Create the dialog
this.mDialog = DialogHelper.createDialog(
- this, R.drawable.ic_launcher,
+ this, R.mipmap.ic_launcher_filemanager,
pickingDirectory ? R.string.directory_picker_title : R.string.picker_title,
this.mRootView);