diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-16 11:07:39 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-16 11:12:53 -0700 |
commit | 1019500220518fb5fb023fcb7d370ab3cbf12307 (patch) | |
tree | f638cd81db6951acb34f20caf68d1e5d26191adb /java/com/android/dialer/calldetails/res | |
parent | d5e47f6da5b08b13ecdfa7f1edc7e12aeb83fab9 (diff) | |
download | android_packages_apps_Dialer-1019500220518fb5fb023fcb7d370ab3cbf12307.tar.gz android_packages_apps_Dialer-1019500220518fb5fb023fcb7d370ab3cbf12307.tar.bz2 android_packages_apps_Dialer-1019500220518fb5fb023fcb7d370ab3cbf12307.zip |
Update dialer to tap green cl 150332012.
Test: Treehugger
Change-Id: If2baab1d3fc2dee602a4f784bba532182e7174f5
Diffstat (limited to 'java/com/android/dialer/calldetails/res')
5 files changed, 56 insertions, 48 deletions
diff --git a/java/com/android/dialer/calldetails/res/drawable/multimedia_image_background.xml b/java/com/android/dialer/calldetails/res/drawable/multimedia_image_background.xml index 421bdbfee..8182e247a 100644 --- a/java/com/android/dialer/calldetails/res/drawable/multimedia_image_background.xml +++ b/java/com/android/dialer/calldetails/res/drawable/multimedia_image_background.xml @@ -16,5 +16,5 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners android:radius="2dp"/> + <corners android:radius="8dp"/> </shape> diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml b/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml index 038a8745e..79f283705 100644 --- a/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml +++ b/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml @@ -14,24 +14,25 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> <Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="@color/dialer_theme_color" - android:elevation="4dp" - android:titleTextAppearance="@style/toolbar_title_text" - android:title="@string/call_details" - android:navigationIcon="@drawable/quantum_ic_arrow_back_white_24"/> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="@color/dialer_theme_color" + android:elevation="4dp" + android:titleTextAppearance="@style/toolbar_title_text" + android:title="@string/call_details" + android:navigationIcon="@drawable/quantum_ic_arrow_back_white_24"/> <android.support.v7.widget.RecyclerView - android:id="@+id/recycler_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/background_dialer_white"/> + android:id="@+id/recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/background_dialer_white"/> </LinearLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/layout/contact_container.xml b/java/com/android/dialer/calldetails/res/layout/contact_container.xml index 95fe189b2..bcda55e11 100644 --- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml +++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml @@ -18,6 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/call_details_top_margin" android:gravity="center_vertical" android:padding="@dimen/contact_container_padding"> @@ -25,27 +26,31 @@ android:id="@+id/quick_contact_photo" android:layout_width="@dimen/call_details_contact_photo_size" android:layout_height="@dimen/call_details_contact_photo_size" + android:layout_marginTop="2dp" android:focusable="true"/> - <TextView - android:id="@+id/contact_name" + <LinearLayout + android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/text_bottom_margin" - android:layout_marginStart="@dimen/photo_text_margin" android:layout_toEndOf="@+id/quick_contact_photo" android:layout_toStartOf="@+id/call_back_button" - style="@style/PrimaryText"/> + android:layout_centerVertical="true"> - <TextView - android:id="@+id/phone_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/photo_text_margin" - android:layout_toEndOf="@+id/quick_contact_photo" - android:layout_toStartOf="@+id/call_back_button" - android:layout_below="@+id/contact_name" - style="@style/SecondaryText"/> + <TextView + android:id="@+id/contact_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/photo_text_margin" + style="@style/PrimaryText"/> + + <TextView + android:id="@+id/phone_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/photo_text_margin" + style="@style/SecondaryText"/> + </LinearLayout> <ImageView android:id="@+id/call_back_button" diff --git a/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml b/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml index 5ad7912fa..85cc4ed62 100644 --- a/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml +++ b/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="@dimen/ec_container_height"> @@ -8,6 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="1dp" android:maxLines="2" style="@style/SecondaryText"/> @@ -22,21 +24,21 @@ android:outlineProvider="background" android:visibility="gone"> - <ImageView - android:id="@+id/multimedia_image" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerCrop"/> + <ImageView + android:id="@+id/multimedia_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerCrop"/> - <com.android.incallui.autoresizetext.AutoResizeTextView - android:id="@+id/multimedia_attachments_number" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="4dp" - android:gravity="center" - android:textColor="@color/background_dialer_white" - android:textSize="100sp" - android:background="#80000000" - android:visibility="gone"/> + <TextView + android:id="@+id/multimedia_attachments_number" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:textColor="@color/background_dialer_white" + android:textSize="20sp" + android:fontFamily="sans-serif-medium" + android:background="#80000000" + android:gravity="center" + android:visibility="gone"/> </FrameLayout> </RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/values/dimens.xml b/java/com/android/dialer/calldetails/res/values/dimens.xml index b1a8f1c8e..59f237103 100644 --- a/java/com/android/dialer/calldetails/res/values/dimens.xml +++ b/java/com/android/dialer/calldetails/res/values/dimens.xml @@ -15,9 +15,9 @@ ~ limitations under the License --> <resources> - <dimen name="text_bottom_margin">2dp</dimen> <dimen name="call_details_primary_text_size">16sp</dimen> <dimen name="call_details_secondary_text_size">14sp</dimen> + <dimen name="call_details_top_margin">6dp</dimen> <!-- contact container --> <dimen name="contact_container_padding">16dp</dimen> |