Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions res/layout/datetime_picker.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<NumberPicker
android:id="@+id/date"
android:layout_width="120dip"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
/>

<NumberPicker
android:id="@+id/hour"
android:layout_width="50dip"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:focusable="true"
android:focusableInTouchMode="true"
/>

<NumberPicker
android:id="@+id/minute"
android:layout_width="50dip"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:focusable="true"
android:focusableInTouchMode="true"
/>

<NumberPicker
android:id="@+id/amPm"
android:layout_width="50dip"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:focusable="true"
android:focusableInTouchMode="true"
/>
</LinearLayout>
7 changes: 3 additions & 4 deletions res/menu/call_note_edit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@
<item
android:id="@+id/menu_send_to_desktop"
android:title="@string/menu_send_to_desktop"/>
<!--
<item
android:id="@+id/menu_alert"
android:title="@string/menu_alert" /> -->
android:title="@string/menu_alert" />

<!--
<item
android:id="@+id/menu_delete_remind"
android:title="@string/menu_remove_remind" /> -->
android:title="@string/menu_remove_remind" />
</menu>
7 changes: 3 additions & 4 deletions res/menu/note_edit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@
android:id="@+id/menu_send_to_desktop"
android:title="@string/menu_send_to_desktop"/>

<!--
<item
android:id="@+id/menu_alert"
android:title="@string/menu_alert" /> -->
<!--
android:title="@string/menu_alert" />

<item
android:id="@+id/menu_delete_remind"
android:title="@string/menu_remove_remind" /> -->
android:title="@string/menu_remove_remind" />
</menu>
3 changes: 3 additions & 0 deletions res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<string name="notelist_string_info">...</string>
<string name="notelist_menu_new">新建便签</string>
<string name="delete_remind_time_message">成功删除提醒</string>
<string name="set_remind_time_message">创建提醒</string>
<string name="note_alert_expired">已过期</string>
<string name="format_date_ymd">yyyyMMdd</string>
<string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
Expand Down Expand Up @@ -116,6 +117,8 @@
<string name="search_hint">搜索便签</string>
<string name="search_setting_description">便签中的文字</string>
<string name="search">便签</string>
<string name="datetime_dialog_ok">设置</string>
<string name="datetime_dialog_cancel">取消</string>
<plurals name="search_results_title">
<item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
</plurals>
Expand Down
7 changes: 7 additions & 0 deletions res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@
<dimen name="text_font_size_medium">20sp</dimen>
<dimen name="text_font_size_normal">17sp</dimen>
<dimen name="text_font_size_small">14sp</dimen>
<!-- Layout attributes for DateTimePicker -->
<dimen name="width_date_spinner_24_hourview">140dip</dimen>
<dimen name="width_date_spinner_12_houwview">120dip</dimen>
<dimen name="width_hour_spinner_24_hourview">70dip</dimen>
<dimen name="width_hour_spinner_12_hourview">50dip</dimen>
<dimen name="width_minute_spinner_24_hourview">70dip</dimen>
<dimen name="width_minute_spinner_12_hourview">50dip</dimen>
</resources>
3 changes: 3 additions & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<string name="notelist_string_info">...</string>
<string name="notelist_menu_new">Add note</string>
<string name="delete_remind_time_message">Delete reminder successfully</string>
<string name="set_remind_time_message">Set reminder</string>
<string name="note_alert_expired">Expired</string>
<string name="format_date_ymd">yyyyMMdd</string>
<string name="format_datetime_mdhm">MMMd kk:mm</string>
Expand Down Expand Up @@ -123,6 +124,8 @@
<string name="search_hint">Search notes</string>
<string name="search_setting_description">Text in your notes</string>
<string name="search">Notes</string>
<string name="datetime_dialog_ok">set</string>
<string name="datetime_dialog_cancel">cancel</string>
<plurals name="search_results_title">
<item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
<!-- Case of 0 or 2 or more results. -->
Expand Down
Loading