summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/fab_teal_background.pngbin2233 -> 2805 bytes
-rw-r--r--res/drawable-mdpi/fab_teal_background.pngbin1508 -> 1841 bytes
-rw-r--r--res/drawable-xhdpi/fab_teal_background.pngbin3304 -> 4085 bytes
-rw-r--r--res/drawable-xxhdpi/fab_teal_background.pngbin5232 -> 7009 bytes
-rw-r--r--res/layout/call_detail.xml18
-rw-r--r--res/layout/call_detail_history_item.xml18
-rw-r--r--res/layout/playback_layout.xml44
-rw-r--r--res/values/colors.xml13
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/styles.xml10
10 files changed, 51 insertions, 54 deletions
diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_teal_background.png
index e2f01e87a..b36439e53 100644
--- a/res/drawable-hdpi/fab_teal_background.png
+++ b/res/drawable-hdpi/fab_teal_background.png
Binary files differ
diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_teal_background.png
index c95d1240e..55f9bb5cc 100644
--- a/res/drawable-mdpi/fab_teal_background.png
+++ b/res/drawable-mdpi/fab_teal_background.png
Binary files differ
diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_teal_background.png
index f94f75935..d6379c215 100644
--- a/res/drawable-xhdpi/fab_teal_background.png
+++ b/res/drawable-xhdpi/fab_teal_background.png
Binary files differ
diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_teal_background.png
index cc0ba27b6..76d68ac6a 100644
--- a/res/drawable-xxhdpi/fab_teal_background.png
+++ b/res/drawable-xxhdpi/fab_teal_background.png
Binary files differ
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 9ca30a898..f08531b0c 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -15,17 +15,16 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent" >
<LinearLayout
android:id="@+id/call_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/background_dialer_list_items"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- >
+ android:background="@color/background_dialer_list_items" >
<!-- Caller information "card" -->
<LinearLayout
android:id="@+id/caller_information"
@@ -39,7 +38,7 @@
android:gravity="center_vertical"
android:translationZ="@dimen/call_detail_translation_z"
android:focusable="true"
- android:background="@color/background_dialer_white">
+ android:background="@color/background_dialer_white" >
<QuickContactBadge
android:id="@+id/quick_contact_photo"
@@ -85,11 +84,20 @@
>
<include layout="@layout/call_log_voicemail_status"/>
</FrameLayout>
+ <TextView
+ android:id="@+id/voicemail_transcription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/call_detail_horizontal_margin"
+ android:paddingEnd="@dimen/call_detail_horizontal_margin"
+ android:paddingTop="@dimen/transcription_top_margin"
+ android:paddingBottom="@dimen/transcription_bottom_margin"
+ android:background="@color/background_dialer_list_items" />
<LinearLayout
android:id="@+id/voicemail_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:paddingBottom="@dimen/call_detail_button_spacing"
android:visibility="gone"
>
diff --git a/res/layout/call_detail_history_item.xml b/res/layout/call_detail_history_item.xml
index cc06d2151..0e5dcf2f4 100644
--- a/res/layout/call_detail_history_item.xml
+++ b/res/layout/call_detail_history_item.xml
@@ -23,41 +23,35 @@
android:paddingStart="@dimen/call_detail_horizontal_margin"
android:paddingEnd="@dimen/call_log_outer_margin"
android:orientation="vertical"
- android:background="@color/background_dialer_list_items"
->
+ android:background="@color/background_dialer_list_items" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
+ android:orientation="horizontal" >
<view
class="com.android.dialer.calllog.CallTypeIconsView"
android:id="@+id/call_type_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- />
+ android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/call_type_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/call_log_icon_margin"
android:textColor="?attr/call_log_primary_text_color"
- android:textSize="@dimen/call_log_primary_text_size"
- />
+ android:textSize="@dimen/call_log_primary_text_size" />
</LinearLayout>
<TextView
android:id="@+id/date"
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:textSize="@dimen/call_log_secondary_text_size" />
<TextView
android:id="@+id/duration"
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:textSize="@dimen/call_log_secondary_text_size" />
</LinearLayout>
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
index 2f4d33c7a..500ed96b5 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/playback_layout.xml
@@ -14,10 +14,11 @@
limitations under the License.
-->
-<RelativeLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:background="@color/background_dialer_list_items"
>
<!-- Mute, playback, trash buttons. -->
@@ -26,44 +27,31 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_alignParentTop="true"
>
- <LinearLayout
+ <ImageButton
+ android:id="@+id/playback_start_stop"
android:layout_width="match_parent"
- android:layout_height="58dip"
+ android:layout_height="58dp"
android:layout_marginEnd="@dimen/call_detail_button_spacing"
android:layout_weight="1"
- >
- <ImageButton
- android:id="@+id/playback_start_stop"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_hold_pause"
- android:contentDescription="@string/voicemail_play_start_pause"
- />
- </LinearLayout>
- <LinearLayout
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_hold_pause"
+ android:contentDescription="@string/voicemail_play_start_pause"
+ />
+ <ImageButton
+ android:id="@+id/playback_speakerphone"
android:layout_width="match_parent"
android:layout_height="58dip"
android:layout_weight="1"
- android:background="@color/background_dialer_list_items"
- >
- <ImageButton
- android:id="@+id/playback_speakerphone"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_speakerphone_on"
- android:contentDescription="@string/description_playback_speakerphone"
- />
- </LinearLayout>
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_speakerphone_on"
+ android:contentDescription="@string/description_playback_speakerphone"
+ />
</LinearLayout>
<RelativeLayout
android:id="@+id/seek_container"
android:layout_width="match_parent"
android:layout_height="80dip"
- android:layout_below="@id/buttons_linear_layout"
android:layout_marginTop="@dimen/call_detail_button_spacing"
>
<!-- SeekBar left-right margin decreased from redlines 72dip by 8dip to account for
@@ -137,4 +125,4 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 44346bc8e..bc8ff734e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,9 +16,9 @@
<resources>
<!-- Primary text color in the Dialer -->
- <color name="dialtacts_primary_text_color">#000000</color>
+ <color name="dialtacts_primary_text_color">#333</color>
<!-- Secondary text color in the Dialer -->
- <color name="dialtacts_secondary_text_color">#888888</color>
+ <color name="dialtacts_secondary_text_color">#737373</color>
<color name="dialer_accent_color">#eeff41</color>
<!-- Color for the setting text. -->
@@ -48,6 +48,11 @@
<!-- Standard color for selected items. -->
<color name="item_selected">#660099cc</color>
+
+ <!-- Primary background color for dialer -->
+ <color name="background_dialer_primary">#fafafa</color>
+ <!-- Secondary background color for dialer -->
+ <color name="background_dialer_secondary">#f9f9f9</color>
<!-- White background for dialer -->
<color name="background_dialer_white">#ffffff</color>
<!-- Background color of new dialer activity -->
@@ -81,10 +86,10 @@
<color name="call_log_expanded_background_color">#ffffff</color>
<!-- Color of actions in expanded call log entries. This text color represents actions such
as call back, play voicemail, etc. -->
- <color name="call_log_action_text">#1dc7db</color>
+ <color name="call_log_action_text">@color/dialer_theme_color</color>
<!-- Color of view full call history item text. -->
- <color name="view_full_call_history_color">#1dc7db</color>
+ <color name="view_full_call_history_color">@color/dialer_theme_color</color>
<!-- Color for missed call icons. -->
<color name="missed_call">#ff2e58</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b7aceef28..176680ee6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -40,6 +40,8 @@
<dimen name="call_detail_bottom_margin">32dp</dimen>
<dimen name="call_detail_header_top_margin">24dp</dimen>
<dimen name="call_detail_translation_z">0.5dp</dimen>
+ <dimen name="transcription_top_margin">18dp</dimen>
+ <dimen name="transcription_bottom_margin">18dp</dimen>
<!-- Size of call provider icon width and height -->
<dimen name="call_provider_small_icon_size">12dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index eb39c9dd7..bda26cdab 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -45,7 +45,7 @@
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
<item name="list_item_background_color">@color/background_dialer_light</item>
<item name="list_item_header_text_indent">8dip</item>
- <item name="list_item_header_text_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
<item name="list_item_header_text_size">14sp</item>
<item name="list_item_header_height">30dip</item>
<item name="list_item_data_width_weight">5</item>
@@ -58,8 +58,8 @@
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<item name="list_item_text_offset_top">-2dp</item>
<!-- CallLog -->
- <item name="call_log_primary_text_color">@color/contact_list_name_text_color</item>
- <item name="call_log_primary_background_color">#000000</item>
+ <item name="call_log_primary_text_color">@color/dialtacts_primary_text_color</item>
+ <item name="call_log_primary_background_color">@color/background_dialer_secondary</item>
<item name="call_log_secondary_text_color">@color/dialtacts_secondary_text_color</item>
<item name="call_log_secondary_background_color">#333333</item>
<item name="call_log_header_color">#33b5e5</item>
@@ -70,8 +70,8 @@
<item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
<!-- Favorites -->
<item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
- <item name="android:colorPrimary">@color/actionbar_background_color</item>
- <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item>
+ <item name="android:colorPrimary">@color/dialer_theme_color</item>
+ <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
<item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item>
</style>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 20:47:12 +0000