diff options
Diffstat (limited to 'java/com/android/dialer/calldetails')
6 files changed, 31 insertions, 16 deletions
diff --git a/java/com/android/dialer/calldetails/AndroidManifest.xml b/java/com/android/dialer/calldetails/AndroidManifest.xml index 9ef05a380..54d9f2fad 100644 --- a/java/com/android/dialer/calldetails/AndroidManifest.xml +++ b/java/com/android/dialer/calldetails/AndroidManifest.xml @@ -16,18 +16,18 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer.calldetails"> - <application android:theme="@style/Theme.AppCompat"> + <application> <activity android:label="@string/call_details" android:exported="false" android:name="com.android.dialer.calldetails.OldCallDetailsActivity" - android:theme="@style/DialerThemeBase.NoActionBar"> + android:theme="@style/Dialer.ThemeBase.NoActionBar"> </activity> <activity android:label="@string/call_details" android:exported="false" android:name="com.android.dialer.calldetails.CallDetailsActivity" - android:theme="@style/DialerThemeBase.NoActionBar"> + android:theme="@style/Dialer.ThemeBase.NoActionBar"> </activity> </application> </manifest> 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 10927af73..950867dc4 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 @@ -29,5 +29,5 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_white"/> + android:background="?android:attr/colorBackground"/> </LinearLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml index 1e989966a..40140971e 100644 --- a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml +++ b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml @@ -30,7 +30,7 @@ <TextView android:id="@+id/call_type" - style="@style/PrimaryText" + style="@style/Dialer.TextAppearance.Primary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/call_entry_text_left_margin" @@ -41,7 +41,7 @@ <TextView android:id="@+id/call_time" - style="@style/SecondaryText" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/call_entry_bottom_padding" @@ -50,7 +50,7 @@ <TextView android:id="@+id/call_duration" - style="@style/PrimaryText" + style="@style/Dialer.TextAppearance.Primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/call_entry_padding" @@ -66,7 +66,7 @@ <TextView android:id="@+id/post_call_note" - style="@style/SecondaryText" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="match_parent" android:layout_height="@dimen/ec_container_height" android:layout_below="@+id/ec_container" @@ -77,7 +77,7 @@ android:visibility="gone"/> <TextView android:id="@+id/rtt_transcript" - style="@style/SecondaryText" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/call_entry_bottom_padding" 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 9506183a0..e0de8dc5f 100644 --- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml +++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml @@ -46,21 +46,21 @@ <com.android.dialer.widget.BidiTextView android:id="@+id/contact_name" - style="@style/PrimaryText" + style="@style/Dialer.TextAppearance.Primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/photo_text_margin"/> <TextView android:id="@+id/phone_number" - style="@style/SecondaryText" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/photo_text_margin"/> <TextView android:id="@+id/network" - style="@style/SecondaryText" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/photo_text_margin" @@ -101,7 +101,7 @@ <TextView android:id="@+id/assisted_dialing_text" - style="@style/SecondaryText" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/ad_text_margin_start" 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 fec3126a5..523191207 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,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 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" @@ -14,7 +29,7 @@ android:layout_centerVertical="true" android:layout_marginStart="1dp" android:maxLines="2" - style="@style/SecondaryText"/> + style="@style/Dialer.TextAppearance.Secondary"/> <FrameLayout android:id="@+id/multimedia_image_container" @@ -39,7 +54,7 @@ android:id="@+id/multimedia_attachments_number" android:layout_width="match_parent" android:layout_height="match_parent" - android:textColor="@color/background_dialer_white" + android:textColor="?android:attr/colorBackground" android:textSize="20sp" android:fontFamily="sans-serif-medium" android:background="#80000000" diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml index 93567ef73..1b4329a23 100644 --- a/java/com/android/dialer/calldetails/res/values/styles.xml +++ b/java/com/android/dialer/calldetails/res/values/styles.xml @@ -34,7 +34,7 @@ <item name="android:textAllCaps">true</item> <item name="textAllCaps">true</item> </style> - <style name="RttTranscriptMessage" parent="SecondaryText"> + <style name="RttTranscriptMessage" parent="Dialer.TextAppearance.Secondary"> <item name="android:fontFamily">sans-serif</item> <item name="android:textAllCaps">false</item> <item name="textAllCaps">false</item> |