diff --git a/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java b/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java index abe0bf33..b66a5046 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java @@ -112,7 +112,7 @@ public class ActivityUi extends BaseUi { toggleTitle(activity, actionBar, true); if (!homeAsUp) { - actionBar.setIcon(R.drawable.ab_icon); + actionBar.setIcon(R.drawable.ab_logo); } actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); } diff --git a/android-app/src/main/res/drawable-hdpi/ab_clock.png b/android-app/src/main/res/drawable-hdpi/ab_clock.png new file mode 100644 index 00000000..f56de4aa Binary files /dev/null and b/android-app/src/main/res/drawable-hdpi/ab_clock.png differ diff --git a/android-app/src/main/res/drawable-hdpi/ab_icon.png b/android-app/src/main/res/drawable-hdpi/ab_icon.png deleted file mode 100644 index 69634a91..00000000 Binary files a/android-app/src/main/res/drawable-hdpi/ab_icon.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-hdpi/ab_logo.png b/android-app/src/main/res/drawable-hdpi/ab_logo.png new file mode 100644 index 00000000..7b8e7ee1 Binary files /dev/null and b/android-app/src/main/res/drawable-hdpi/ab_logo.png differ diff --git a/android-app/src/main/res/drawable-hdpi/ic_access_time_grey600_48dp.png b/android-app/src/main/res/drawable-hdpi/ic_access_time_grey600_48dp.png deleted file mode 100644 index ac849817..00000000 Binary files a/android-app/src/main/res/drawable-hdpi/ic_access_time_grey600_48dp.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-ldpi/.emptyfolder b/android-app/src/main/res/drawable-ldpi/.emptyfolder new file mode 100644 index 00000000..e69de29b diff --git a/android-app/src/main/res/drawable-ldpi/ab_icon.png b/android-app/src/main/res/drawable-ldpi/ab_icon.png deleted file mode 100644 index 4cdbb58f..00000000 Binary files a/android-app/src/main/res/drawable-ldpi/ab_icon.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-ldpi/kb_logo.png b/android-app/src/main/res/drawable-ldpi/kb_logo.png deleted file mode 100644 index 1eb95617..00000000 Binary files a/android-app/src/main/res/drawable-ldpi/kb_logo.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-mdpi/ab_clock.png b/android-app/src/main/res/drawable-mdpi/ab_clock.png new file mode 100644 index 00000000..08eb5338 Binary files /dev/null and b/android-app/src/main/res/drawable-mdpi/ab_clock.png differ diff --git a/android-app/src/main/res/drawable-mdpi/ab_icon.png b/android-app/src/main/res/drawable-mdpi/ab_icon.png deleted file mode 100644 index 795d5580..00000000 Binary files a/android-app/src/main/res/drawable-mdpi/ab_icon.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-mdpi/ab_logo.png b/android-app/src/main/res/drawable-mdpi/ab_logo.png new file mode 100644 index 00000000..40e7a417 Binary files /dev/null and b/android-app/src/main/res/drawable-mdpi/ab_logo.png differ diff --git a/android-app/src/main/res/drawable-mdpi/ic_access_time_grey600_48dp.png b/android-app/src/main/res/drawable-mdpi/ic_access_time_grey600_48dp.png deleted file mode 100644 index df545efa..00000000 Binary files a/android-app/src/main/res/drawable-mdpi/ic_access_time_grey600_48dp.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-xhdpi/ab_clock.png b/android-app/src/main/res/drawable-xhdpi/ab_clock.png new file mode 100644 index 00000000..5fa9c892 Binary files /dev/null and b/android-app/src/main/res/drawable-xhdpi/ab_clock.png differ diff --git a/android-app/src/main/res/drawable-xhdpi/ab_icon.png b/android-app/src/main/res/drawable-xhdpi/ab_icon.png deleted file mode 100644 index e7672e87..00000000 Binary files a/android-app/src/main/res/drawable-xhdpi/ab_icon.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-xhdpi/ab_logo.png b/android-app/src/main/res/drawable-xhdpi/ab_logo.png new file mode 100644 index 00000000..c0b599e1 Binary files /dev/null and b/android-app/src/main/res/drawable-xhdpi/ab_logo.png differ diff --git a/android-app/src/main/res/drawable-xhdpi/ic_access_time_grey600_48dp.png b/android-app/src/main/res/drawable-xhdpi/ic_access_time_grey600_48dp.png deleted file mode 100644 index b8c7311f..00000000 Binary files a/android-app/src/main/res/drawable-xhdpi/ic_access_time_grey600_48dp.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-xxhdpi/ab_clock.png b/android-app/src/main/res/drawable-xxhdpi/ab_clock.png new file mode 100644 index 00000000..6759067c Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/ab_clock.png differ diff --git a/android-app/src/main/res/drawable-xxhdpi/ab_logo.png b/android-app/src/main/res/drawable-xxhdpi/ab_logo.png new file mode 100644 index 00000000..9107d931 Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/ab_logo.png differ diff --git a/android-app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_48dp.png b/android-app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_48dp.png deleted file mode 100644 index 3715a0ac..00000000 Binary files a/android-app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_48dp.png and /dev/null differ diff --git a/android-app/src/main/res/drawable-xxxhdpi/ab_logo.png b/android-app/src/main/res/drawable-xxxhdpi/ab_logo.png new file mode 100644 index 00000000..9e8f92af Binary files /dev/null and b/android-app/src/main/res/drawable-xxxhdpi/ab_logo.png differ diff --git a/android-app/src/main/res/menu/history_menu.xml b/android-app/src/main/res/menu/history_menu.xml index 2a439f41..c18944b7 100644 --- a/android-app/src/main/res/menu/history_menu.xml +++ b/android-app/src/main/res/menu/history_menu.xml @@ -33,7 +33,7 @@