summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_remove_highlight.pngbin717 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_remove_highlight.pngbin587 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_remove_highlight.pngbin974 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_remove_highlight.pngbin1590 -> 0 bytes
-rw-r--r--res/drawable/action_button_background.xml3
-rw-r--r--res/drawable/call_log_background.xml3
-rw-r--r--res/drawable/floating_action_button.xml3
-rw-r--r--res/drawable/recent_lists_footer_background.xml3
-rw-r--r--res/drawable/view_pager_tab_background.xml2
-rw-r--r--res/layout/dialtacts_activity.xml43
-rw-r--r--res/layout/lists_fragment.xml86
-rw-r--r--res/layout/phone_favorite_tile_view.xml5
-rw-r--r--res/values/colors.xml6
-rw-r--r--res/values/dimens.xml4
-rw-r--r--res/values/styles.xml7
15 files changed, 83 insertions, 82 deletions
diff --git a/res/drawable-hdpi/ic_remove_highlight.png b/res/drawable-hdpi/ic_remove_highlight.png
deleted file mode 100644
index 435ee36b0..000000000
--- a/res/drawable-hdpi/ic_remove_highlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_remove_highlight.png b/res/drawable-mdpi/ic_remove_highlight.png
deleted file mode 100644
index 6a961cbb2..000000000
--- a/res/drawable-mdpi/ic_remove_highlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_remove_highlight.png b/res/drawable-xhdpi/ic_remove_highlight.png
deleted file mode 100644
index 57949e317..000000000
--- a/res/drawable-xhdpi/ic_remove_highlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_remove_highlight.png b/res/drawable-xxhdpi/ic_remove_highlight.png
deleted file mode 100644
index 23ee8f6da..000000000
--- a/res/drawable-xxhdpi/ic_remove_highlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml
index fd5bc6123..ea7434f24 100644
--- a/res/drawable/action_button_background.xml
+++ b/res/drawable/action_button_background.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorControlHighlight"
- android:pinned="true">
+ android:color="?android:attr/colorControlHighlight">
<!-- Transparent background constrains the touch feedback ripple to the button, but also allows
touch feedback ripples in the parent to show under the button. -->
<item>
diff --git a/res/drawable/call_log_background.xml b/res/drawable/call_log_background.xml
index 4857fb54a..1b3dbc979 100644
--- a/res/drawable/call_log_background.xml
+++ b/res/drawable/call_log_background.xml
@@ -15,5 +15,4 @@
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorControlHighlight"
- android:pinned="false" /> \ No newline at end of file
+ android:color="?android:attr/colorControlHighlight" /> \ No newline at end of file
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index e4a9bb53e..d518dddd4 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -16,7 +16,6 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/dialer_accent_color"
- android:pinned="true">
+ android:color="@color/dialer_accent_color">
<item android:drawable="@drawable/fab_teal_background" />
</ripple>
diff --git a/res/drawable/recent_lists_footer_background.xml b/res/drawable/recent_lists_footer_background.xml
index 021174a16..b5029afcb 100644
--- a/res/drawable/recent_lists_footer_background.xml
+++ b/res/drawable/recent_lists_footer_background.xml
@@ -16,8 +16,7 @@
~ limitations under the License
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorControlHighlight"
- android:pinned="false">
+ android:color="?android:attr/colorControlHighlight">
<!-- Mask to constrain the ripple to the bounds of the view. -->
<item android:id="@android:id/mask">
<color android:color="@android:color/white" />
diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml
index 53f891c76..1ba6c57e0 100644
--- a/res/drawable/view_pager_tab_background.xml
+++ b/res/drawable/view_pager_tab_background.xml
@@ -15,7 +15,7 @@
~ limitations under the License
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/tab_ripple_color">
+ android:color="@color/tab_ripple_color">
<item android:id="@android:id/mask">
<color android:color="@android:color/white" />
</item>
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index c7a788da8..71e58cb48 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -35,49 +35,8 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:id="@+id/dialtacts_frame"
- android:clipChildren="false"
- >
- </FrameLayout>
- <!-- Search entry box and remove view -->
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:id="@+id/search_and_remove_view_container"
- android:visibility="gone"
- >
- </FrameLayout>
+ android:clipChildren="false" />
</RelativeLayout>
- <com.android.dialer.list.RemoveView
- android:layout_width="match_parent"
- android:layout_height="56dp"
- android:id="@+id/remove_view"
- android:layout_alignParentTop="true"
- >
- <LinearLayout
- android:id="@+id/remove_view_container"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:gravity="center"
- android:orientation="horizontal"
- android:visibility="gone" >
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/remove_view_icon"
- android:src="@drawable/ic_remove"
- android:contentDescription="@string/remove_contact"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/remove_view_text"
- android:textSize="@dimen/remove_text_size"
- android:textColor="@color/remove_text_color"
- android:text="@string/remove_contact"
- />
- </LinearLayout>
- </com.android.dialer.list.RemoveView >
<FrameLayout
android:id="@+id/floating_action_button_container"
android:layout_width="@dimen/floating_action_button_width"
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml
index 02dcbe3a0..1de8364b7 100644
--- a/res/layout/lists_fragment.xml
+++ b/res/layout/lists_fragment.xml
@@ -16,10 +16,11 @@
<com.android.dialer.widget.OverlappingPaneLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/lists_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:animateLayoutChanges="true"
- android:id="@+id/lists_frame">
+ android:animateLayoutChanges="true" >
+
<ListView
android:id="@+id/shortcut_card_list"
android:layout_width="match_parent"
@@ -29,24 +30,71 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:divider="@null" />
- <LinearLayout
+
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
- <com.android.dialer.list.ViewPagerTabs
- android:id="@+id/lists_pager_header"
+ android:layout_height="match_parent">
+
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/tab_height"
- android:textAllCaps="true"
- android:orientation="horizontal"
- android:layout_gravity="top"
- android:elevation="@dimen/tab_elevation"
- style="@style/DialtactsActionBarTabTextStyle" />
- <android.support.v4.view.ViewPager
- android:id="@+id/lists_pager"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.android.dialer.list.ViewPagerTabs
+ android:id="@+id/lists_pager_header"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/tab_height"
+ android:textAllCaps="true"
+ android:orientation="horizontal"
+ android:layout_gravity="top"
+ android:elevation="@dimen/tab_elevation"
+ style="@style/DialtactsActionBarTabTextStyle" />
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/lists_pager"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" />
+
+ </LinearLayout>
+
+ <com.android.dialer.list.RemoveView
+ android:id="@+id/remove_view"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
- </android.support.v4.view.ViewPager>
- </LinearLayout>
+ android:layout_height="@dimen/tab_height"
+ android:layout_alignParentTop="true" >
+
+ <LinearLayout
+ android:id="@+id/remove_view_content"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:background="@color/actionbar_background_color"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:visibility="gone" >
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp"
+ android:id="@+id/remove_view_icon"
+ android:src="@drawable/ic_remove"
+ android:contentDescription="@string/remove_contact"
+ android:tint="@color/remove_text_color" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/remove_view_text"
+ android:textSize="@dimen/remove_text_size"
+ android:textColor="@color/remove_text_color"
+ android:text="@string/remove_contact" />
+
+ </LinearLayout>
+
+ </com.android.dialer.list.RemoveView >
+
+ </FrameLayout>
+
</com.android.dialer.widget.OverlappingPaneLayout>
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 1e6b999b1..d34dc7a73 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -17,7 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contact_tile"
class="com.android.dialer.list.PhoneFavoriteSquareTileView"
- android:paddingEnd="@dimen/contact_tile_divider_width">
+ android:paddingEnd="@dimen/contact_tile_divider_width"
+ android:paddingBottom="@dimen/contact_tile_divider_width">
<RelativeLayout
android:id="@+id/contact_favorite_card"
@@ -50,8 +51,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/contact_tile_text_side_padding"
- android:paddingRight="@dimen/contact_tile_text_side_padding"
android:paddingStart="@dimen/contact_tile_text_side_padding"
android:paddingEnd="@dimen/contact_tile_text_side_padding"
android:paddingBottom="@dimen/contact_tile_text_bottom_padding"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a5ad64167..9264e3093 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,7 +40,7 @@
<color name="item_selected">#660099cc</color>
<!-- Background color of new dialer activity -->
- <color name="background_dialer_light">#fbfbfb</color>
+ <color name="background_dialer_light">#f6f6f6</color>
<!-- Background color of dialer list items (contacts, call log entries) -->
<color name="background_dialer_list_items">@color/background_dialer_light</color>
@@ -72,8 +72,7 @@
<!-- Text color for no favorites message -->
<color name="nofavorite_text_color">#777777</color>
- <!-- Text color for the "Remove" text in its regular state -->
- <color name="remove_text_color">#555555</color>
+ <color name="remove_text_color">#ffffff</color>
<!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
<color name="remove_highlighted_text_color">#FF3F3B</color>
@@ -81,6 +80,7 @@
<!-- Color of the bottom border below the contacts grid on the main dialer screen. -->
<color name="contacts_grid_bottom_border_color">#16000000</color>
+ <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>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4db5ae41b..53292e166 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,7 +51,7 @@
<item name="contact_tile_height_to_width_ratio" type="dimen">76%</item>
<dimen name="contact_tile_text_side_padding">12dp</dimen>
<dimen name="contact_tile_text_bottom_padding">9dp</dimen>
- <dimen name="favorites_row_top_padding">1dp</dimen>
+ <dimen name="favorites_row_top_padding">2dp</dimen>
<dimen name="favorites_row_bottom_padding">0dp</dimen>
<dimen name="favorites_row_start_padding">1dp</dimen>
@@ -111,7 +111,7 @@
<dimen name="search_box_right_padding">8dp</dimen>
<!-- Padding around the icon in the search box. -->
<dimen name="search_box_icon_margin">4dp</dimen>
- <dimen name="search_box_search_icon_padding">4dp</dimen>
+ <dimen name="search_box_search_icon_padding">2dp</dimen>
<dimen name="search_box_collapsed_text_margin_left">24dp</dimen>
<dimen name="search_box_expanded_text_margin_left">26dp</dimen>
<!-- Size of the icon (voice search, close search) in the search box. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0c56d9898..40428947b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -36,7 +36,7 @@
<item name="list_item_padding_top">12dp</item>
<item name="list_item_padding_right">32dp</item>
<item name="list_item_padding_bottom">12dp</item>
- <item name="list_item_padding_left">0dip</item>
+ <item name="list_item_padding_left">16dp</item>
<item name="list_item_gap_between_image_and_text">8dip</item>
<item name="list_item_gap_between_label_and_data">5dip</item>
<item name="list_item_presence_icon_margin">4dip</item>
@@ -51,7 +51,7 @@
<item name="list_item_header_height">30dip</item>
<item name="list_item_data_width_weight">5</item>
<item name="list_item_label_width_weight">3</item>
- <item name="contact_browser_list_padding_left">16dp</item>
+ <item name="contact_browser_list_padding_left">0dp</item>
<item name="contact_browser_list_padding_right">0dp</item>
<item name="contact_browser_background">@color/background_dialer_light</item>
<item name="list_item_name_text_color">@color/contact_list_name_text_color</item>
@@ -141,8 +141,7 @@
parent="android:style/Widget.Material.Light.ActionBar.TabText">
<item name="android:textColor">@color/tab_text_color</item>
<item name="android:textSize">@dimen/tab_text_size</item>
- <item name="android:fontFamily">@string/tab_font_family</item>
- <item name="android:textStyle">bold</item>
+ <item name="android:fontFamily">"sans-serif-medium"</item>
</style>
<style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-19 13:37:00 +0000