diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-07-26 12:12:00 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:23:03 +0100 |
| commit | 3d944d0296801527efdd075e59dab2aac1919d6d (patch) | |
| tree | e7326b0c7510848b9c76d01e472634b9eb182409 /android/sdremote/res | |
| parent | 0eb5d4014a816e4ab8de38632d2106afeb91b131 (diff) | |
Basic timer code done.
Change-Id: Ida0233b30f29e667c0c147346debc8306503719f
Diffstat (limited to 'android/sdremote/res')
3 files changed, 10 insertions, 5 deletions
diff --git a/android/sdremote/res/layout/presentation_clockbar_countdownbar.xml b/android/sdremote/res/layout/presentation_clockbar_countdownbar.xml index dc510cef0c8f..dafe925e710c 100644 --- a/android/sdremote/res/layout/presentation_clockbar_countdownbar.xml +++ b/android/sdremote/res/layout/presentation_clockbar_countdownbar.xml @@ -21,6 +21,6 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Test" /> + android:text="@string/clock_timer_start" /> </LinearLayout>
\ No newline at end of file diff --git a/android/sdremote/res/layout/presentation_clockbar_stopwatchbar.xml b/android/sdremote/res/layout/presentation_clockbar_stopwatchbar.xml index 49d1edd9b33c..d3f5021e4d66 100644 --- a/android/sdremote/res/layout/presentation_clockbar_stopwatchbar.xml +++ b/android/sdremote/res/layout/presentation_clockbar_stopwatchbar.xml @@ -12,13 +12,13 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Test" /> + android:text="@string/clock_timer_start" /> <Button android:id="@+id/clockbar_stopwatch_reset" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Test" /> + android:text="@string/clock_timer_reset" /> </LinearLayout>
\ No newline at end of file diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index 7c9dae3e4441..991d6929885b 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -7,6 +7,11 @@ <string name="presentation_ui_resizehandle">Handle to resize view.</string> <string name="presentation_blank_screen">Blank Screen</string> <string name="options">Options</string> - <string name="actionbar_timeformat">hh:mm</string> - <string name="actionbar_timerformat">h:m:ss</string> + <string name="actionbar_timeformat">h:mmaa</string> + <string name="actionbar_timerformat">mm:ss</string> + <string name="clock_timer_start">Start</string> + <string name="clock_timer_pause">Pause</string> + <string name="clock_timer_restart">Restart</string> + <string name="clock_timer_reset">Reset</string> + <string name="clock_timer_resume">Resume</string> </resources>
\ No newline at end of file |