diff options
| author | Nancy Chen <nancychen@google.com> | 2014-08-19 18:03:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-19 18:03:36 +0000 |
| commit | 5fc53d00405f259b9fab73fd12765dc7a3c5eff7 (patch) | |
| tree | e836a9669141c6a98f124bebc36442a1d1bbb6c4 /res | |
| parent | 21ade5b98d4fda9080c2bcd77ba679c513adf734 (diff) | |
| parent | e78797f8dd02b209f24c0e9261e8cac81facf0b1 (diff) | |
am e78797f8: Merge "Reveal InCallUI from touch point in Dialer. COMPLETED." into lmp-dev
* commit 'e78797f8dd02b209f24c0e9261e8cac81facf0b1':
Reveal InCallUI from touch point in Dialer. COMPLETED.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_list_item.xml | 1 | ||||
| -rwxr-xr-x | res/layout/phone_disambig_item.xml | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index 4dcffb19b..3fbe7e9ce 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -137,6 +137,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/call_log_icon_margin" android:src="@drawable/ic_card_phone" android:tint="@color/recent_call_log_item_phone_icon_tint" android:alpha="0.3" diff --git a/res/layout/phone_disambig_item.xml b/res/layout/phone_disambig_item.xml index a097ce798..27bbda134 100755 --- a/res/layout/phone_disambig_item.xml +++ b/res/layout/phone_disambig_item.xml @@ -14,7 +14,8 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout" + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -39,4 +40,4 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textDirection="ltr" /> -</LinearLayout> +</view> |