diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/call_detail.xml | 155 | ||||
-rw-r--r-- | res/layout/call_log_list_item.xml | 8 |
2 files changed, 85 insertions, 78 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml index c07785159..abc0fbb70 100644 --- a/res/layout/call_detail.xml +++ b/res/layout/call_detail.xml @@ -13,91 +13,98 @@ See the License for the specific language governing permissions and limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/call_detail" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:background="@color/background_dialer_call_log" > + <!-- Caller information "card" --> <LinearLayout - android:id="@+id/call_detail" + android:id="@+id/caller_information" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:background="@color/background_dialer_call_log" > - <!-- Caller information "card" --> + android:layout_height="wrap_content" + android:paddingStart="@dimen/call_detail_horizontal_margin" + android:paddingTop="@dimen/call_detail_top_margin" + android:paddingBottom="@dimen/call_detail_bottom_margin" + android:baselineAligned="false" + android:orientation="horizontal" + android:translationZ="@dimen/call_detail_translation_z" + android:focusable="true" + android:background="@color/background_dialer_white" > + + <QuickContactBadge + android:id="@+id/quick_contact_photo" + android:layout_width="@dimen/contact_photo_size" + android:layout_height="@dimen/contact_photo_size" + android:layout_alignParentStart="true" + android:layout_gravity="top" + android:layout_marginTop="3dp" + android:focusable="true" /> + <LinearLayout - android:id="@+id/caller_information" - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" - android:paddingStart="@dimen/call_detail_horizontal_margin" - android:paddingTop="@dimen/call_detail_top_margin" - android:paddingBottom="@dimen/call_detail_bottom_margin" - android:baselineAligned="false" - android:orientation="horizontal" - android:translationZ="@dimen/call_detail_translation_z" - android:focusable="true" - android:background="@color/background_dialer_white" > + android:layout_weight="1" + android:orientation="vertical" + android:gravity="center_vertical" + android:layout_marginStart="@dimen/call_detail_horizontal_margin"> - <QuickContactBadge - android:id="@+id/quick_contact_photo" - android:layout_width="@dimen/contact_photo_size" - android:layout_height="@dimen/contact_photo_size" - android:layout_alignParentStart="true" - android:layout_gravity="top" - android:layout_marginTop="3dp" - android:focusable="true" - /> + <TextView + android:id="@+id/caller_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?attr/call_log_primary_text_color" + android:textSize="@dimen/call_log_primary_text_size" + android:includeFontPadding="false" + android:layout_marginBottom="5dp" + android:singleLine="true" /> - <LinearLayout + <TextView + android:id="@+id/caller_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_vertical" - android:layout_marginStart="@dimen/call_detail_horizontal_margin" - > - <TextView - android:id="@+id/caller_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?attr/call_log_primary_text_color" - android:textSize="@dimen/call_log_primary_text_size" - android:includeFontPadding="false" - android:layout_marginBottom="5dp" - android:singleLine="true" - /> - <TextView - android:id="@+id/caller_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" - android:layout_marginBottom="1dp" - android:singleLine="true" - /> - <TextView - android:id="@+id/phone_account_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" - android:singleLine="true" - android:visibility="gone" - /> - </LinearLayout> - </LinearLayout> + android:textColor="?attr/call_log_secondary_text_color" + android:textSize="@dimen/call_log_secondary_text_size" + android:layout_marginBottom="1dp" + android:singleLine="true" /> + + <TextView + android:id="@+id/phone_account_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?attr/call_log_secondary_text_color" + android:textSize="@dimen/call_log_secondary_text_size" + android:singleLine="true" + android:visibility="gone" /> - <!-- - The list view is under everything. - It contains a first header element which is hidden under the controls UI. - When scrolling, the controls move up until the name bar hits the top. - --> - <ListView - android:id="@+id/history" - android:layout_width="match_parent" - android:layout_height="fill_parent" - /> + </LinearLayout> + <ImageView + android:id="@+id/call_back_button" + android:layout_width="@dimen/call_button_dimen" + android:layout_height="@dimen/call_button_dimen" + android:layout_marginEnd="16dp" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:src="@drawable/ic_call_24dp" + android:scaleType="center" + android:tint="@color/recent_call_log_item_phone_icon_tint" + android:contentDescription="@string/description_call_log_call_action" + android:visibility="gone" /> </LinearLayout> -</RelativeLayout> + + <!-- + The list view is under everything. + It contains a first header element which is hidden under the controls UI. + When scrolling, the controls move up until the name bar hits the top. + --> + <ListView + android:id="@+id/history" + android:layout_width="match_parent" + android:layout_height="fill_parent" /> + +</LinearLayout> diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index af8cb8b03..7fce595a8 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -138,14 +138,14 @@ <ImageView android:id="@+id/call_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="@dimen/call_button_dimen" + android:layout_height="@dimen/call_button_dimen" android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/call_log_icon_margin" android:background="?android:attr/selectableItemBackgroundBorderless" - android:src="@drawable/ic_card_phone" + android:src="@drawable/ic_call_24dp" + android:scaleType="center" android:tint="@color/recent_call_log_item_phone_icon_tint" - android:alpha="0.3" android:contentDescription="@string/description_call_log_call_action" android:visibility="gone" /> |