提交: 12d6751cc7824fbd3cc88b0a188737632acfb0c8 - development (git)

development

Commit MetaInfo

• 修訂: 12d6751cc7824fbd3cc88b0a188737632acfb0c8 (tree)
• 時間: 2011-01-13 09:57:57
• 作者: Scott Main <smain@goog...>
• Commiter: Android Git Automerger

Log Message

am ad60decc: resolved conflicts for merge of c8e12573 to honeycomb-plus-aosp

* commit 'ad60decc9dd6c58848b4de2494cdd64878ee71d8':

update notepad menu icons with new styles for GB (20% smaller)

Change Summary

• modified: samples/NotePad/res/drawable-hdpi/ic_menu_compose.png
• modified: samples/NotePad/res/drawable-hdpi/ic_menu_delete.png
• modified: samples/NotePad/res/drawable-hdpi/ic_menu_edit.png
• modified: samples/NotePad/res/drawable-hdpi/ic_menu_revert.png
• modified: samples/NotePad/res/drawable-hdpi/ic_menu_save.png
• modified: samples/NotePad/res/drawable/ic_menu_compose.png
• modified: samples/NotePad/res/drawable/ic_menu_delete.png
• modified: samples/NotePad/res/drawable/ic_menu_edit.png
• modified: samples/NotePad/res/drawable/ic_menu_revert.png
• modified: samples/NotePad/res/drawable/ic_menu_save.png

差異

Binary files a/samples/NotePad/res/drawable-hdpi/ic_menu_compose.png and b/samples/NotePad/res/drawable-hdpi/ic_menu_compose.png differ

Binary files a/samples/NotePad/res/drawable-hdpi/ic_menu_delete.png and b/samples/NotePad/res/drawable-hdpi/ic_menu_delete.png differ

Binary files a/samples/NotePad/res/drawable-hdpi/ic_menu_edit.png and b/samples/NotePad/res/drawable-hdpi/ic_menu_edit.png differ

Binary files a/samples/NotePad/res/drawable-hdpi/ic_menu_revert.png and b/samples/NotePad/res/drawable-hdpi/ic_menu_revert.png differ

Binary files a/samples/NotePad/res/drawable-hdpi/ic_menu_save.png and b/samples/NotePad/res/drawable-hdpi/ic_menu_save.png differ

Binary files a/samples/NotePad/res/drawable/ic_menu_compose.png and b/samples/NotePad/res/drawable/ic_menu_compose.png differ

Binary files a/samples/NotePad/res/drawable/ic_menu_delete.png and b/samples/NotePad/res/drawable/ic_menu_delete.png differ

Binary files a/samples/NotePad/res/drawable/ic_menu_edit.png and b/samples/NotePad/res/drawable/ic_menu_edit.png differ

Binary files a/samples/NotePad/res/drawable/ic_menu_revert.png and b/samples/NotePad/res/drawable/ic_menu_revert.png differ

Binary files a/samples/NotePad/res/drawable/ic_menu_save.png and b/samples/NotePad/res/drawable/ic_menu_save.png differ