diff options
| author | Annie Chin <afchin@google.com> | 2016-10-24 09:04:12 -0700 |
|---|---|---|
| committer | Annie Chin <afchin@google.com> | 2016-11-16 09:17:50 -0800 |
| commit | d0f87d20ad9078fd885b3e1f8366f7a07c9b0ac6 (patch) | |
| tree | fc6c37f9761ac927cb0fa4710705ac219c9478d5 /res/values | |
| parent | 758cb2e5e1c6649d8ec317106c91c3c6ac475a15 (diff) | |
| download | android_packages_apps_ExactCalculator-d0f87d20ad9078fd885b3e1f8366f7a07c9b0ac6.tar.gz android_packages_apps_ExactCalculator-d0f87d20ad9078fd885b3e1f8366f7a07c9b0ac6.tar.bz2 android_packages_apps_ExactCalculator-d0f87d20ad9078fd885b3e1f8366f7a07c9b0ac6.zip | |
Animate CalculatorDisplay text on pulldown.
Bug: 31623549
Bug: 32584801
Change-Id: I07a54cad38c026357082b86ad026392f72693e22
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 9 |
3 files changed, 16 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 5218acd..9de65d5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -20,4 +20,9 @@ <!-- The margin between the pad pages when displayed using a view pager. --> <dimen name="pad_page_margin">24dip</dimen> + <dimen name="history_item_text_padding_top">8dip</dimen> + <dimen name="history_item_text_padding_bottom">16dip</dimen> + <dimen name="history_item_text_padding_start">16dip</dimen> + <dimen name="history_item_text_padding_end">24dip</dimen> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index f6cfad1..8a053cc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -299,4 +299,7 @@ <!-- Title for alert dialog when calculation takes too long (timeout). [CHAR_LIMIT=30] --> <string name="dialog_timeout">Timeout</string> + <!-- Title for "current expression" in history page. [CHAR_LIMIT=40] --> + <string name="title_current_expression">Current Expression</string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index a15cc31..25a3cd0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,7 +18,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DisplayTextStyle" parent="@android:style/Widget.Material.Light.TextView"> - <item name="android:background">@android:color/transparent</item> <item name="android:cursorVisible">false</item> <item name="android:fontFamily">sans-serif-light</item> <item name="android:includeFontPadding">false</item> @@ -46,6 +45,14 @@ <item name="android:textSize">@dimen/result_textsize</item> </style> + <style name="HistoryItemTextStyle" parent="DisplayTextStyle"> + <item name="android:paddingTop">@dimen/history_item_text_padding_top</item> + <item name="android:paddingBottom">@dimen/history_item_text_padding_bottom</item> + <item name="android:paddingStart">@dimen/history_item_text_padding_start</item> + <item name="android:paddingEnd">@dimen/history_item_text_padding_end</item> + <item name="android:textSize">@dimen/result_textsize</item> + </style> + <style name="PadButtonStyle" parent="@android:style/Widget.Material.Light.Button.Borderless"> <item name="android:layout_width">0dip</item> <item name="android:layout_height">0dip</item> |