diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-03 19:29:34 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-03 19:29:34 +0000 |
commit | 40a59d307038709ed489f0ed61ba94b224416743 (patch) | |
tree | f094ae078807e0486617bc958b984cc9521d5fd9 /java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml | |
parent | 4fd9c153b6f3059bd9204051fb0c27596d2bc72d (diff) | |
parent | a95459f9ccb54f6b694810cf7396ffdefde11d45 (diff) |
Merge changes Ib6415145,Ifde98a8c
* changes:
Adjust the location update frequency for emergency calls
Fix issue that the connection icon is placed a little left from center
Diffstat (limited to 'java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml')
-rw-r--r-- | java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml index 59359c9c1..42066f286 100644 --- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml +++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml @@ -1,4 +1,19 @@ <?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 + --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" @@ -11,11 +26,15 @@ android:id="@id/contactgrid_connection_icon" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginEnd="10dp" android:scaleType="fitCenter" tools:src="@android:drawable/sym_def_app_icon" tools:visibility="visible" /> + <Space + android:id="@id/contactgrid_top_row_space" + android:layout_height="match_parent" + android:layout_width="@dimen/contactgrid_connection_icon_margin_end" + /> <TextView android:id="@id/contactgrid_status_text" android:layout_width="wrap_content" |