diff options
author | uabdullah <uabdullah@google.com> | 2017-09-27 17:26:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-27 17:26:55 +0000 |
commit | 065b945b31f7e62c02dd2efb55761a93dbcdc3a1 (patch) | |
tree | 891b91444dd318fe65dba2939ce29b14a9056d57 /java/com/android/dialer/voicemail/listui/res/layout | |
parent | c648f2d6259dc269da9b023379b80cf7494eede0 (diff) | |
parent | 753cfdbfc70bae40b1ea1013fdeb7596c50b807b (diff) |
Merge changes Ifc59f239,Ib8235776,I6f8ed21f
am: 753cfdbfc7
Change-Id: I37ac93f9a45aae764af2d9f707eaa95c4789dcef
Diffstat (limited to 'java/com/android/dialer/voicemail/listui/res/layout')
-rw-r--r-- | java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml (renamed from java/com/android/dialer/voicemail/listui/res/layout/voicemail_fragment.xml) | 15 | ||||
-rw-r--r-- | java/com/android/dialer/voicemail/listui/res/layout/voicemail_call_log_entry.xml | 71 |
2 files changed, 76 insertions, 10 deletions
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml index 3b566daaa..f35ce4dc0 100644 --- a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_fragment.xml +++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml @@ -14,15 +14,10 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<FrameLayout + +<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/new_voicemail_call_log_recycler_view" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <TextView - android:id="@+id/voicemail_fragment_text_view" - android:text="@string/welcome_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"/> -</FrameLayout>
\ No newline at end of file + android:layout_height="match_parent" + android:background="@color/background_dialer_light"/>
\ No newline at end of file diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_call_log_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_call_log_entry.xml new file mode 100644 index 000000000..3986a0e8c --- /dev/null +++ b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_call_log_entry.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/call_log_entry_top_margin" + android:paddingTop="@dimen/call_log_entry_padding_top_start" + android:paddingBottom="@dimen/call_log_entry_padding_bottom_end" + android:paddingStart="@dimen/call_log_entry_padding_top_start" + android:paddingEnd="@dimen/call_log_entry_padding_bottom_end" + android:gravity="center_vertical"> + + <QuickContactBadge + android:id="@+id/quick_contact_photo" + android:layout_width="@dimen/call_log_entry_photo_size" + android:layout_height="@dimen/call_log_entry_photo_size" + android:layout_centerVertical="true" + android:padding="@dimen/call_log_entry_photo_padding" + android:background="@color/dialer_secondary_color" + android:focusable="true"/> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toEndOf="@+id/quick_contact_photo" + android:layout_toStartOf="@+id/menu_button" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:id="@+id/primary_text" + style="@style/PrimaryText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/> + </LinearLayout> + </LinearLayout> + + <!--TODO(uabdullah): Figure out why android:src="@drawable/quantum_ic_more_vert_vd_theme_24" + causes http://gpaste/5400195130982400 --> + <ImageView + android:id="@+id/menu_button" + android:layout_width="@dimen/call_log_entry_menu_button_size" + android:layout_height="@dimen/call_log_entry_menu_button_size" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:scaleType="center" + android:tint="@color/dialer_secondary_text_color"/> +</RelativeLayout> |