Skip to content
Browse files

Update icons to the ICS icons

-Remove unnecessary strings
-Add Action Menu information for ICS
  • Loading branch information...
1 parent 10f96c1 commit f3a87ed33706a1706f48b9b247a1e39f85b4310f @breber breber committed Dec 28, 2011
View
2 AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.reber.agenda" android:versionName="2.0.0.1" android:versionCode="22">
+ package="org.reber.agenda" android:versionName="2.0.0.2" android:versionCode="23">
<uses-permission android:name="android.permission.READ_CALENDAR"/>
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"></uses-sdk>
<application android:icon="@drawable/icon" android:label="@string/appName">
View
BIN res/drawable-hdpi/ic_menu_add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-hdpi/ic_menu_manage.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-hdpi/ic_menu_refresh.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-hdpi/ic_menu_revert.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-ldpi/ic_menu_manage.png
Deleted file not rendered
View
BIN res/drawable-ldpi/ic_menu_refresh.png
Deleted file not rendered
View
BIN res/drawable-ldpi/icon.png
Deleted file not rendered
View
BIN res/drawable-mdpi/ic_menu_add.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-mdpi/ic_menu_manage.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-mdpi/ic_menu_refresh.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-mdpi/ic_menu_revert.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-xhdpi/ic_menu_add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-xhdpi/ic_menu_manage.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-xhdpi/ic_menu_refresh.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-xhdpi/ic_menu_revert.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
25 res/menu/appmenu.xml
@@ -13,8 +13,25 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:title="@string/newEvent" android:id="@+id/newEventMenuItem" android:icon="@drawable/ic_menu_add"></item>
- <item android:title="@string/refresh" android:id="@+id/refresh" android:icon="@drawable/ic_menu_refresh"></item>
- <item android:title="@string/appSettings" android:id="@+id/chooseSettings" android:icon="@drawable/ic_menu_manage"></item>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/newEventMenuItem"
+ android:icon="@drawable/ic_menu_add"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/newEvent">
+ </item>
+ <item
+ android:id="@+id/refresh"
+ android:icon="@drawable/ic_menu_refresh"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/refresh">
+ </item>
+ <item
+ android:id="@+id/chooseSettings"
+ android:icon="@drawable/ic_menu_manage"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/appSettings">
+ </item>
+
</menu>
View
2 res/values-de/strings.xml
@@ -40,7 +40,7 @@
<string name="widgetTransparency">Widget Transparenz</string>
<string name="numDaysToDisplay">Anzuzeigene Anzahl der Tage</string>
<string name="numDaysHint2">2 Tage</string>
- <string name="numDaysHint7">7 Tage</string>
+ <!-- <string name="numDaysHint7">7 Tage</string> -->
<string name="use24Hour">24h Format Verwenden</string>
<!-- <string name="showMultipleEvents">Aktiviere mehrfache Ereignisse</string> -->
<string name="invalidNumberOfDays">Ungültige Anzahl der Tage</string>
View
2 res/values-es/strings.xml
@@ -40,7 +40,7 @@
<string name="widgetTransparency">Transparencia</string>
<string name="numDaysToDisplay">Número de días a mostrar</string>
<string name="numDaysHint2">2 Días</string>
- <string name="numDaysHint7">7 Días</string>
+ <!-- <string name="numDaysHint7">7 Días</string> -->
<string name="use24Hour">Usar formato 24-horas</string>
<!-- <string name="showMultipleEvents">Múltiples Eventos</string> -->
<string name="invalidNumberOfDays">Número de días no válido</string>
View
2 res/values-ru/strings.xml
@@ -41,7 +41,7 @@
<string name="widgetTransparency">Прозрачность виджета</string>
<string name="numDaysToDisplay">Кол-во отображаемых дней</string>
<string name="numDaysHint2">2 дня</string>
- <string name="numDaysHint7">7 дня</string>
+ <!-- <string name="numDaysHint7">7 дня</string> -->
<string name="use24Hour">24-часовой формат</string>
<!-- <string name="showMultipleEvents">Многочисленные события</string> -->
<string name="invalidNumberOfDays">Неверное кол-во дней</string>
View
5 res/values/strings.xml
@@ -38,7 +38,7 @@
<string name="widgetTransparency">Widget Transparency</string>
<string name="numDaysToDisplay">Number of Days to Display</string>
<string name="numDaysHint2">2 days</string>
- <string name="numDaysHint7">7 days</string>
+ <!-- <string name="numDaysHint7">7 days</string> -->
<string name="use24Hour">Use 24-hour format</string>
<!-- <string name="showMultipleEvents">Multiple events</string> -->
<string name="invalidNumberOfDays">Invalid number of days</string>
@@ -51,6 +51,5 @@
<string name="enableClick">Open event on click</string>
<string name="newEvent">New Event</string>
- <string name="updateMessage">-When opening this app by clicking on the widget, events from that widget\'s
- group of selected calendars is displayed (thanks Andrey!)</string>
+ <string name="updateMessage"></string>
</resources>
View
2 src/org/reber/agenda/AgendaActivity.java
@@ -52,7 +52,7 @@ public void onCreate(Bundle savedInstanceState) {
setResult(RESULT_OK, new Intent(AgendaWidgetProvider.WIDGET_UPDATE));
final SharedPreferences pref = getSharedPreferences(Constants.AgendaList.APP_PREFS, Activity.MODE_WORLD_WRITEABLE);
- if (getResources().getIntArray(R.array.versions)[0] > pref.getInt(Constants.AgendaList.VERSION, 0)) {
+ if (getResources().getIntArray(R.array.versions)[0] > pref.getInt(Constants.AgendaList.VERSION, Integer.MAX_VALUE)) {
Dialog dlg = new Dialog(this);
dlg.setTitle(getResources().getString(R.string.changes));

0 comments on commit f3a87ed

Please sign in to comment.
Something went wrong with that request. Please try again.