diff options
| author | Allan Wang <me@allanwang.ca> | 2019-04-25 13:56:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 13:56:40 -0700 |
| commit | 00e04ce269197053a8cd8ae522c95629541181a1 (patch) | |
| tree | ff913af0ff20f5d415428ac231372da13b9a6639 /app/src/main/res/values | |
| parent | 51e71caf4063702d88ad07b71a2cf9257175f71e (diff) | |
| parent | cf152584b544425e0ee3ae28d765dc7e55a196af (diff) | |
| download | frost-00e04ce269197053a8cd8ae522c95629541181a1.tar.gz frost-00e04ce269197053a8cd8ae522c95629541181a1.tar.bz2 frost-00e04ce269197053a8cd8ae522c95629541181a1.zip | |
Merge pull request #1406 from AllanWang/feature/notif-widget
Feature/notif-widget
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 713bd1b4..847e74cb 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -9,4 +9,6 @@ <dimen name="tab_bar_height">50dp</dimen> <dimen name="intro_bar_height">64dp</dimen> <dimen name="badge_icon_size">20dp</dimen> + + <dimen name="toolbar_icon_size">24dp</dimen> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fd35613..0c2e625c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,4 +62,16 @@ <string name="no_new_notifications">No new notifications found</string> + <string name="today">Today</string> + <string name="yesterday">Today</string> + <!-- + Template used to display human readable string; + For instance: + Today at 1:23 PM + Mar 13 at 9:00 AM + + The first element is the day, and the second element is the time + --> + <string name="time_template">%1s at %2s</string> + </resources> |