OSDN Git Service
(root)
/
android-x86
/
packages-apps-CMFileManager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
842a009
)
CMFM: New high resolution launcher icons
author
Jorge Ruesga
<jorge@ruesga.com>
Sat, 15 Mar 2014 00:16:45 +0000
(
01:16
+0100)
committer
Steve Kondik
<shade@chemlab.org>
Sun, 16 Mar 2014 06:12:23 +0000
(06:12 +0000)
Change-Id: I6cd62ac6fe0b151530e3165152f98427503aede4
JIRA: CYAN-3546
Issue: https://jira.cyanogenmod.org/browse/CYAN-3546
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
21 files changed:
AndroidManifest.xml
patch
|
blob
|
history
res/drawable-hdpi/ic_launcher.png
patch
|
blob
|
history
res/drawable-hdpi/ic_launcher_editor.png
patch
|
blob
|
history
res/drawable-hdpi/ic_launcher_settings.png
patch
|
blob
|
history
res/drawable-hdpi/ic_launcher_themes.png
[new file with mode: 0644]
patch
|
blob
res/drawable-hdpi/ic_theme_launcher.png
[deleted file]
patch
|
blob
|
history
res/drawable-mdpi/ic_launcher.png
patch
|
blob
|
history
res/drawable-mdpi/ic_launcher_editor.png
patch
|
blob
|
history
res/drawable-mdpi/ic_launcher_settings.png
patch
|
blob
|
history
res/drawable-mdpi/ic_launcher_themes.png
[new file with mode: 0644]
patch
|
blob
res/drawable-mdpi/ic_theme_launcher.png
[deleted file]
patch
|
blob
|
history
res/drawable-xhdpi/ic_launcher.png
patch
|
blob
|
history
res/drawable-xhdpi/ic_launcher_editor.png
patch
|
blob
|
history
res/drawable-xhdpi/ic_launcher_settings.png
patch
|
blob
|
history
res/drawable-xhdpi/ic_launcher_themes.png
[new file with mode: 0644]
patch
|
blob
res/drawable-xhdpi/ic_theme_launcher.png
[deleted file]
patch
|
blob
|
history
res/drawable-xxhdpi/ic_launcher.png
[new file with mode: 0644]
patch
|
blob
res/drawable-xxhdpi/ic_launcher_editor.png
[new file with mode: 0644]
patch
|
blob
res/drawable-xxhdpi/ic_launcher_settings.png
[new file with mode: 0644]
patch
|
blob
res/drawable-xxhdpi/ic_launcher_themes.png
[new file with mode: 0644]
patch
|
blob
src/com/cyanogenmod/filemanager/activities/preferences/ThemesPreferenceFragment.java
patch
|
blob
|
history
diff --git
a/AndroidManifest.xml
b/AndroidManifest.xml
index
bdb70ab
..
ac00a7b
100644
(file)
--- a/
AndroidManifest.xml
+++ b/
AndroidManifest.xml
@@
-192,7
+192,7
@@
android:name=".themes.ThemeActivity"
android:label="@string/app_name"
android:permission="com.cyanogenmod.filemanager.permissions.READ_THEME"
- android:icon="@drawable/ic_
theme_launcher
"
+ android:icon="@drawable/ic_
launcher_themes
"
android:exported="true">
<intent-filter>
<action android:name="com.cyanogenmod.filemanager.actions.MAIN_THEME" />
diff --git
a/res/drawable-hdpi/ic_launcher.png
b/res/drawable-hdpi/ic_launcher.png
index
f3e6c85
..
0e27d27
100644
(file)
Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ
diff --git
a/res/drawable-hdpi/ic_launcher_editor.png
b/res/drawable-hdpi/ic_launcher_editor.png
index
4321cad
..
61b2635
100644
(file)
Binary files a/res/drawable-hdpi/ic_launcher_editor.png and b/res/drawable-hdpi/ic_launcher_editor.png differ
diff --git
a/res/drawable-hdpi/ic_launcher_settings.png
b/res/drawable-hdpi/ic_launcher_settings.png
index
1fc8770
..
831dd01
100644
(file)
Binary files a/res/drawable-hdpi/ic_launcher_settings.png and b/res/drawable-hdpi/ic_launcher_settings.png differ
diff --git a/res/drawable-hdpi/ic_launcher_themes.png
b/res/drawable-hdpi/ic_launcher_themes.png
new file mode 100644
(file)
index 0000000..
966be29
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_themes.png differ
diff --git
a/res/drawable-hdpi/ic_theme_launcher.png
b/res/drawable-hdpi/ic_theme_launcher.png
deleted file mode 100644
(file)
index
f9f60cb
..0000000
Binary files a/res/drawable-hdpi/ic_theme_launcher.png and /dev/null differ
diff --git
a/res/drawable-mdpi/ic_launcher.png
b/res/drawable-mdpi/ic_launcher.png
index
ea67ee8
..
3641f65
100644
(file)
Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ
diff --git
a/res/drawable-mdpi/ic_launcher_editor.png
b/res/drawable-mdpi/ic_launcher_editor.png
index
9e44ba6
..
3fee767
100644
(file)
Binary files a/res/drawable-mdpi/ic_launcher_editor.png and b/res/drawable-mdpi/ic_launcher_editor.png differ
diff --git
a/res/drawable-mdpi/ic_launcher_settings.png
b/res/drawable-mdpi/ic_launcher_settings.png
index
cc08f5e
..
fb6f6ea
100644
(file)
Binary files a/res/drawable-mdpi/ic_launcher_settings.png and b/res/drawable-mdpi/ic_launcher_settings.png differ
diff --git a/res/drawable-mdpi/ic_launcher_themes.png
b/res/drawable-mdpi/ic_launcher_themes.png
new file mode 100644
(file)
index 0000000..
132006b
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_themes.png differ
diff --git
a/res/drawable-mdpi/ic_theme_launcher.png
b/res/drawable-mdpi/ic_theme_launcher.png
deleted file mode 100644
(file)
index
d5cfd44
..0000000
Binary files a/res/drawable-mdpi/ic_theme_launcher.png and /dev/null differ
diff --git
a/res/drawable-xhdpi/ic_launcher.png
b/res/drawable-xhdpi/ic_launcher.png
index
38546e0
..
9343eba
100644
(file)
Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git
a/res/drawable-xhdpi/ic_launcher_editor.png
b/res/drawable-xhdpi/ic_launcher_editor.png
index
8a0ea90
..
974199b
100644
(file)
Binary files a/res/drawable-xhdpi/ic_launcher_editor.png and b/res/drawable-xhdpi/ic_launcher_editor.png differ
diff --git
a/res/drawable-xhdpi/ic_launcher_settings.png
b/res/drawable-xhdpi/ic_launcher_settings.png
index
d424162
..
821caec
100644
(file)
Binary files a/res/drawable-xhdpi/ic_launcher_settings.png and b/res/drawable-xhdpi/ic_launcher_settings.png differ
diff --git a/res/drawable-xhdpi/ic_launcher_themes.png
b/res/drawable-xhdpi/ic_launcher_themes.png
new file mode 100644
(file)
index 0000000..
98da90e
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_themes.png differ
diff --git
a/res/drawable-xhdpi/ic_theme_launcher.png
b/res/drawable-xhdpi/ic_theme_launcher.png
deleted file mode 100644
(file)
index
e49ebf6
..0000000
Binary files a/res/drawable-xhdpi/ic_theme_launcher.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png
b/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
(file)
index 0000000..
232d17e
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_editor.png
b/res/drawable-xxhdpi/ic_launcher_editor.png
new file mode 100644
(file)
index 0000000..
c21a4ee
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_editor.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_settings.png
b/res/drawable-xxhdpi/ic_launcher_settings.png
new file mode 100644
(file)
index 0000000..
517f4f6
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_settings.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_themes.png
b/res/drawable-xxhdpi/ic_launcher_themes.png
new file mode 100644
(file)
index 0000000..
08c3108
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_themes.png differ
diff --git
a/src/com/cyanogenmod/filemanager/activities/preferences/ThemesPreferenceFragment.java
b/src/com/cyanogenmod/filemanager/activities/preferences/ThemesPreferenceFragment.java
index
ac70a6b
..
abb0d94
100644
(file)
--- a/
src/com/cyanogenmod/filemanager/activities/preferences/ThemesPreferenceFragment.java
+++ b/
src/com/cyanogenmod/filemanager/activities/preferences/ThemesPreferenceFragment.java
@@
-66,6
+66,7
@@
public class ThemesPreferenceFragment extends TitlePreferenceFragment {
// Add the preferences
addPreferencesFromResource(R.xml.preferences_themes);
+ getActivity().getActionBar().setIcon(R.drawable.ic_launcher_themes);
// Theme selector
this.mThemeSelector =