diff options
| author | Allan Wang <me@allanwang.ca> | 2019-05-01 16:05:19 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-05-01 16:05:19 -0700 |
| commit | 58f4f9298b09081b3c937227828824849057a835 (patch) | |
| tree | 18d2bf44637b52c9f68817253fc37d4ca699daef /app/src/main/res/values | |
| parent | 576cc1a451a16f2d82ee1e41e83c420a85ded47e (diff) | |
| parent | da93672c2ed6b54e0e7119a6b55715185112df3e (diff) | |
| download | frost-58f4f9298b09081b3c937227828824849057a835.tar.gz frost-58f4f9298b09081b3c937227828824849057a835.tar.bz2 frost-58f4f9298b09081b3c937227828824849057a835.zip | |
Merge dev
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 | 11 |
2 files changed, 13 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 10481b50..5eb1c9e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -64,4 +64,15 @@ <!--Biometrics--> <string name="biometrics_prompt_title">Authenticate Frost</string> + <string name="today">Today</string> + <string name="yesterday">Yesterday</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> |