From f1e8069bcd1755d9ef2322b705d8d9d6b83728f0 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Wed, 18 Nov 2009 09:53:03 -0500 Subject: [PATCH] UI tweaks to meet Jeff's spec. Colors and text sizes are exactly how Jeff specified in the pdf. I tried to match the size of everything based on looks but I might be a little off in padding. The shadow effect on the bottom clock has been left out for now since there are no specifics in the spec for each of the shadow components and I cannot figure it out based on the drawing. --- res/drawable-hdpi/ic_menu_add.png | Bin 0 -> 3765 bytes res/drawable-mdpi/ic_menu_add.png | Bin 0 -> 2017 bytes res/drawable/indicator_bar_onoff.xml | 22 +++++++++++++ res/drawable/indicator_clock_onoff.xml | 5 +-- res/layout/alarm_clock.xml | 20 +++++++---- res/layout/alarm_time.xml | 33 +++++++++++-------- res/menu/alarm_list_menu.xml | 6 ++++ res/menu/context_menu.xml | 2 ++ res/values-cs/strings.xml | 1 - res/values-da/strings.xml | 1 - res/values-de/strings.xml | 1 - res/values-el/strings.xml | 1 - res/values-es-rUS/strings.xml | 1 - res/values-es/strings.xml | 1 - res/values-fr/strings.xml | 1 - res/values-it/strings.xml | 1 - res/values-ja/strings.xml | 1 - res/values-ko/strings.xml | 1 - res/values-nb/strings.xml | 1 - res/values-nl/strings.xml | 1 - res/values-pl/strings.xml | 1 - res/values-pt-rPT/strings.xml | 1 - res/values-pt/strings.xml | 1 - res/values-ru/strings.xml | 1 - res/values-sv/strings.xml | 1 - res/values-tr/strings.xml | 1 - res/values-zh-rCN/strings.xml | 1 - res/values-zh-rTW/strings.xml | 1 - res/values/strings.xml | 11 ++++--- res/values/styles.xml | 4 +-- src/com/android/deskclock/AlarmClock.java | 53 +++++++++++++++++++----------- 31 files changed, 106 insertions(+), 70 deletions(-) create mode 100755 res/drawable-hdpi/ic_menu_add.png create mode 100644 res/drawable-mdpi/ic_menu_add.png create mode 100644 res/drawable/indicator_bar_onoff.xml diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png new file mode 100755 index 0000000000000000000000000000000000000000..65cc01eb7e495bc84f02b57305f6f60707436285 GIT binary patch literal 3765 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 literal 0 HcmV?d00001 diff --git a/res/drawable/indicator_bar_onoff.xml b/res/drawable/indicator_bar_onoff.xml new file mode 100644 index 0000000..e3d8caa --- /dev/null +++ b/res/drawable/indicator_bar_onoff.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/res/drawable/indicator_clock_onoff.xml b/res/drawable/indicator_clock_onoff.xml index f44563c..3fea6c0 100644 --- a/res/drawable/indicator_clock_onoff.xml +++ b/res/drawable/indicator_clock_onoff.xml @@ -17,8 +17,5 @@ - - + diff --git a/res/layout/alarm_clock.xml b/res/layout/alarm_clock.xml index ed8b757..6e70259 100644 --- a/res/layout/alarm_clock.xml +++ b/res/layout/alarm_clock.xml @@ -23,7 +23,6 @@ + + + android:textSize="48sp" + android:textColor="?android:attr/textColorPrimary" /> + android:textColor="?android:attr/textColorPrimary" /> diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml index 6ab5a66..9f8c12a 100644 --- a/res/layout/alarm_time.xml +++ b/res/layout/alarm_time.xml @@ -22,6 +22,14 @@ android:layout_height="wrap_content" android:orientation="horizontal"> + + android:button="@null" /> + android:paddingLeft="16dip" + android:paddingRight="16dip"> + android:textSize="28sp" + android:textColor="?android:attr/textColorPrimary"/> + android:textColor="?android:attr/textColorPrimary"/> @@ -97,8 +104,8 @@ android:includeFontPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textSize="10sp" - android:textColor="@color/grey"/> + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary"/> diff --git a/res/menu/alarm_list_menu.xml b/res/menu/alarm_list_menu.xml index a8d1911..1b727b3 100644 --- a/res/menu/alarm_list_menu.xml +++ b/res/menu/alarm_list_menu.xml @@ -15,6 +15,12 @@ --> + + diff --git a/res/menu/context_menu.xml b/res/menu/context_menu.xml index 25a62be..797bafb 100644 --- a/res/menu/context_menu.xml +++ b/res/menu/context_menu.xml @@ -17,6 +17,8 @@ + diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 0283d2a..df1d737 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -20,7 +20,6 @@ "Přidat budík" "Smazat budík" "Aktivovat budík" - "Deaktivovat budík" "Tento budík bude smazán." "Zobrazit hodiny" "Skrýt hodiny" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 00713e6..1c1c25d 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -20,7 +20,6 @@ "Tilføj alarm" "Slet alarm" "Aktiver alarm" - "Deaktiver alarm" "Denne alarm slettes." "Vis ur" "Skjul ur" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 8f74995..fb0384d 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -20,7 +20,6 @@ "Wecker hinzufügen" "Wecker löschen" "Wecker aktivieren" - "Wecker deaktivieren" "Dieser Alarm wird gelöscht." "Uhr anzeigen" "Uhr ausblenden" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index e6288ff..cc79f77 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -20,7 +20,6 @@ "Προσθήκη ξυπνητηριού" "Διαγραφή ξυπνητηριού" "Ενεργοποίηση ξυπνητηριού" - "Απενεργοποίηση ξυπνητηριού" "Αυτό το ξυπνητήρι θα διαγραφεί." "Εμφάνιση ρολογιού" "Απόκρυψη ρολογιού" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index e4fd90a..f1838cc 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -20,7 +20,6 @@ "Agregar alarma" "Eliminar alarma" "Activar alarma" - "Desactivar alarma" "Esta alarma se eliminará" "Mostrar reloj" "Ocultar reloj" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 4200abf..ebcd0da 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -20,7 +20,6 @@ "Añadir alarma" "Eliminar alarma" "Activar alarma" - "Desactivar alarma" "Esta alarma se eliminará." "Mostrar reloj" "Ocultar reloj" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 7f54303..202006e 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -20,7 +20,6 @@ "Ajouter alarme" "Supprimer l\'alarme" "Activer l\'alarme" - "Désactiver l\'alarme" "Cette alarme va être supprimée." "Afficher l\'horloge" "Masquer l\'horloge" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 24d2f26..8731dfe 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -20,7 +20,6 @@ "Aggiungi allarme" "Elimina allarme" "Attiva allarme" - "Disattiva allarme" "Questa sveglia verrà eliminata." "Mostra orologio" "Nascondi orologio" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 3db9923..8a9c57c 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -20,7 +20,6 @@ "アラームの設定" "アラームを削除" "アラームON" - "アラームOFF" "このアラームを削除します。" "時計を表示" "時計を隠す" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 00199df..44492a4 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -20,7 +20,6 @@ "알람 추가" "알람 삭제" "알람 사용" - "알람 사용 중지" "알람이 삭제됩니다." "시계 표시" "시계 숨기기" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index fa67254..42d5343 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -20,7 +20,6 @@ "Legg til alarm" "Slett alarm" "Aktiver alarm" - "Deaktiver alarm" "Denne alarmen vil bli slettet." "Vis klokke" "Skjul klokke" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5aacd03..3eacdaa 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -20,7 +20,6 @@ "Alarm toevoegen" "Alarm verwijderen" "Alarm inschakelen" - "Alarm uitschakelen" "Dit alarm wordt verwijderd." "Klok weergeven" "Klok verbergen" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index c003376..0297a18 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -20,7 +20,6 @@ "Dodaj alarm" "Usuń alarm" "Włącz alarm" - "Wyłącz alarm" "Ten zegar zostanie usunięty." "Pokaż zegar" "Ukryj zegar" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index b915994..1fb6e54 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -20,7 +20,6 @@ "Adicionar alarme" "Eliminar alarme" "Activar alarme" - "Desactivar alarme" "Este alarme será eliminado." "Mostrar relógio" "Ocultar relógio" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 0c98cf5..727ac2b 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -20,7 +20,6 @@ "Adicionar alarme" "Excluir alarme" "Ativar alarme" - "Desativar alarme" "Este alarme será excluído." "Mostrar relógio" "Ocultar relógio" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 276f05e..405aec9 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -20,7 +20,6 @@ "Добавить будильник" "Удалить будильник" "Включить будильник" - "Отключить будильник" "Сигнал будет удален." "Показать часы" "Спрятать часы" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index ab13701..1b2bba7 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -20,7 +20,6 @@ "Lägg till alarm" "Ta bort alarm" "Aktivera alarmet" - "Inaktivera alarmet" "Alarmet tas bort." "Visa klocka" "Dölj klocka" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 85f9005..823e4c5 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -20,7 +20,6 @@ "Alarm ekle" "Alarmı sil" "Alarmı etkinleştir" - "Alarmı devre dışı bırak" "Bu alarm silinecek." "Saati göster" "Saati gizle" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 536acde..6a13aef 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -20,7 +20,6 @@ "添加闹钟" "取消闹钟" "启用闹钟" - "停用闹钟" "将会取消此闹钟。" "显示时钟" "隐藏时钟" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 703f398..7edac1f 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -22,7 +22,6 @@ "新增鬧鐘" "刪除鬧鐘" "啟用鬧鐘" - "停用鬧鐘" "刪除此鬧鐘？" "顯示時鐘" "隱藏時鐘" diff --git a/res/values/strings.xml b/res/values/strings.xml index ef2817e..d14b740 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -25,14 +25,17 @@ Add alarm + + Desk clock + + + Edit alarm + Delete alarm - Enable alarm - - - Disable alarm + Turn alarm on/off This alarm will be deleted. diff --git a/res/values/styles.xml b/res/values/styles.xml index 11a6550..3cfb5c9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -54,7 +54,7 @@ diff --git a/src/com/android/deskclock/AlarmClock.java b/src/com/android/deskclock/AlarmClock.java index acf42b3..e872ead 100644 --- a/src/com/android/deskclock/AlarmClock.java +++ b/src/com/android/deskclock/AlarmClock.java @@ -192,6 +192,12 @@ public class AlarmClock extends Activity implements OnItemClickListener { } return true; + case R.id.edit_alarm: + Intent intent = new Intent(this, SetAlarm.class); + intent.putExtra(Alarms.ALARM_ID, id); + startActivity(intent); + return true; + default: break; } @@ -221,17 +227,7 @@ public class AlarmClock extends Activity implements OnItemClickListener { View addAlarm = findViewById(R.id.add_alarm); addAlarm.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Uri uri = Alarms.addAlarm(getContentResolver()); - // FIXME: scroll to new item? - String segment = uri.getPathSegments().get(1); - int newId = Integer.parseInt(segment); - if (Log.LOGV) { - Log.v("In AlarmClock, new alarm id = " + newId); - } - Intent intent = - new Intent(AlarmClock.this, SetAlarm.class); - intent.putExtra(Alarms.ALARM_ID, newId); - startActivity(intent); + addNewAlarm(); } }); @@ -244,6 +240,18 @@ public class AlarmClock extends Activity implements OnItemClickListener { }); } + private void addNewAlarm() { + Uri uri = Alarms.addAlarm(getContentResolver()); + String segment = uri.getPathSegments().get(1); + int newId = Integer.parseInt(segment); + if (Log.LOGV) { + Log.v("In AlarmClock, new alarm id = " + newId); + } + Intent intent = new Intent(this, SetAlarm.class); + intent.putExtra(Alarms.ALARM_ID, newId); + startActivity(intent); + } + @Override protected void onDestroy() { super.onDestroy(); @@ -278,25 +286,30 @@ public class AlarmClock extends Activity implements OnItemClickListener { // Set the custom view on the menu. menu.setHeaderView(v); - // Change the text to "disable" if the alarm is already enabled. - if (alarm.enabled) { - menu.findItem(R.id.enable_alarm).setTitle(R.string.disable_alarm); - } } @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.menu_item_settings) { - startActivity(new Intent(this, SettingsActivity.class)); - return true; + switch (item.getItemId()) { + case R.id.menu_item_settings: + startActivity(new Intent(this, SettingsActivity.class)); + return true; + case R.id.menu_item_desk_clock: + startActivity(new Intent(this, DeskClock.class)); + return true; + case R.id.menu_item_add_alarm: + addNewAlarm(); + return true; + default: + break; } - return false; + return super.onOptionsItemSelected(item); } @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.alarm_list_menu, menu); - return true; + return super.onCreateOptionsMenu(menu); } public void onItemClick(AdapterView parent, View v, int pos, long id) { -- 2.11.0