diff options
| author | Brad Ebinger <breadley@google.com> | 2016-04-07 17:15:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-07 17:15:47 +0000 |
| commit | 8607dfb43c2707ca534d68f2dcf728fece01c82b (patch) | |
| tree | 9b7239340c5462010306d4763bb89c10e652e307 /res | |
| parent | d2d5cf44745be6023ac023673cd7d70c20591712 (diff) | |
| parent | 87b9abf1fe4d480e15b2af03876003e6b8808b84 (diff) | |
Merge "Add via number to CallLog Account entry" into nyc-dev
am: 87b9abf
* commit '87b9abf1fe4d480e15b2af03876003e6b8808b84':
Add via number to CallLog Account entry
Change-Id: I36077470df4217ffd623be6eca3f48fb413c5bf2
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_list_item.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 20 |
3 files changed, 22 insertions, 0 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index 469e72ae5..660bca36e 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -125,6 +125,7 @@ android:id="@+id/call_account_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/call_log_call_account_margin_bottom" android:layout_marginEnd="@dimen/call_log_icon_margin" android:textColor="?attr/call_log_secondary_text_color" android:textSize="@dimen/call_log_detail_text_size" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index a9f2702ce..371a1c6ab 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -34,6 +34,7 @@ <dimen name="call_log_start_margin">8dp</dimen> <dimen name="call_log_indent_margin">24dp</dimen> <dimen name="call_log_name_margin_bottom">2dp</dimen> + <dimen name="call_log_call_account_margin_bottom">2dp</dimen> <dimen name="call_log_vertical_padding">12dp</dimen> <dimen name="call_log_list_item_height">56dp</dimen> <dimen name="call_log_list_item_info_margin_start">16dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index ee9418a8b..cb8568411 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -731,6 +731,26 @@ [CHAR LIMIT=NONE] --> <string name="description_phone_account">on <xliff:g id="phoneAccount" example="SIM 1">^1</xliff:g></string> + <!-- String describing the secondary line number the call was received via. + Note: AccessibilityServices use this attribute to announce what the view represents. + [CHAR LIMIT=NONE]--> + <string name="description_via_number">via <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g></string> + + <!-- TextView text item showing the secondary line number the call was received via. + [CHAR LIMIT=NONE]--> + <string name="call_log_via_number">via <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g></string> + + <!-- String describing the PhoneAccount and via number that a call was received on, if both are + visible. + Note: AccessibilityServices use this attribute to announce what the view represents. + [CHAR LIMIT=NONE]--> + <string name="description_via_number_phone_account">on <xliff:g id="phoneAccount" example="SIM 1">%1$s</xliff:g>, via <xliff:g id="number" example="(555) 555-5555">%2$s</xliff:g></string> + + <!-- The order of the PhoneAccount and via number that a call was received on, + if both are visible. + [CHAR LIMIT=NONE]--> + <string name="call_log_via_number_phone_account"><xliff:g id="phoneAccount" example="SIM 1">%1$s</xliff:g> via <xliff:g id="number" example="(555) 555-5555">%2$s</xliff:g></string> + <!-- String describing the phone icon on a call log list item. When tapped, it will place a call to the number represented by that call log entry. [CHAR LIMIT=NONE]--> <string name="description_call_log_call_action">Call</string> |