summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-07-23 16:53:36 -0700
committerYorke Lee <yorkelee@google.com>2013-07-23 18:25:34 -0700
commit481994f4962ec937ba8775578c2bb9d76141fd7f (patch)
treebc4ee7da87d8ad0d30f852e7678074cda13d9756 /res
parentf2dc8a2704486eb031cfa5014d0626e96f5d5a43 (diff)
Redlines for call history screen, as well as most recent call log
* Add and change background and layout for CallLogListItem * Create wrapper view for most recent call log item * Change actionbar background in Call History activity * Hide phone number in call log items * Add tab indicator drawables Change-Id: Ic86c3fac857971aba58ba3ac1d79ddebaf663da6
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/dialer_recent_card_bg.9.pngbin0 -> 191 bytes
-rw-r--r--res/drawable-mdpi/dialer_recent_card_bg.9.pngbin0 -> 178 bytes
-rw-r--r--res/drawable-xhdpi/dialer_recent_card_bg.9.pngbin0 -> 212 bytes
-rw-r--r--res/drawable/action_bar_tab.xml26
-rw-r--r--res/drawable/bottom_border_background.xml2
-rw-r--r--res/drawable/call_history_actionbar_background.xml27
-rw-r--r--res/drawable/tab_selected.xml31
-rw-r--r--res/drawable/tab_selected_focused.xml45
-rw-r--r--res/drawable/tab_selected_pressed.xml36
-rw-r--r--res/drawable/tab_unselected_focused.xml35
-rw-r--r--res/drawable/tab_unselected_pressed.xml26
-rw-r--r--res/layout/new_call_log_list_item.xml14
-rw-r--r--res/values/colors.xml7
-rw-r--r--res/values/dimens.xml3
-rw-r--r--res/values/styles.xml11
15 files changed, 244 insertions, 19 deletions
diff --git a/res/drawable-hdpi/dialer_recent_card_bg.9.png b/res/drawable-hdpi/dialer_recent_card_bg.9.png
new file mode 100644
index 000000000..e58194331
--- /dev/null
+++ b/res/drawable-hdpi/dialer_recent_card_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/dialer_recent_card_bg.9.png b/res/drawable-mdpi/dialer_recent_card_bg.9.png
new file mode 100644
index 000000000..cb1d26fc8
--- /dev/null
+++ b/res/drawable-mdpi/dialer_recent_card_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/dialer_recent_card_bg.9.png b/res/drawable-xhdpi/dialer_recent_card_bg.9.png
new file mode 100644
index 000000000..e1a4b67fd
--- /dev/null
+++ b/res/drawable-xhdpi/dialer_recent_card_bg.9.png
Binary files differ
diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml
new file mode 100644
index 000000000..35df0538f
--- /dev/null
+++ b/res/drawable/action_bar_tab.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@drawable/tab_selected_pressed" android:state_pressed="true" android:state_selected="true"/>
+ <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_selected="true"/>
+ <item android:drawable="@drawable/tab_selected" android:state_selected="true"/>
+ <item android:drawable="@drawable/tab_unselected_pressed" android:state_pressed="true"/>
+ <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true"/>
+
+</selector> \ No newline at end of file
diff --git a/res/drawable/bottom_border_background.xml b/res/drawable/bottom_border_background.xml
index 9a35e8a4d..7dad5a446 100644
--- a/res/drawable/bottom_border_background.xml
+++ b/res/drawable/bottom_border_background.xml
@@ -23,7 +23,7 @@
</item>
<item>
<shape android:shape="rectangle" >
- <solid android:color="@color/background_dial_holo_light" />
+ <solid android:color="@color/background_dialer_list_items" />
</shape>
</item>
</layer-list> \ No newline at end of file
diff --git a/res/drawable/call_history_actionbar_background.xml b/res/drawable/call_history_actionbar_background.xml
new file mode 100644
index 000000000..f781f27b0
--- /dev/null
+++ b/res/drawable/call_history_actionbar_background.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="#c6c6c6" />
+ </shape>
+ </item>
+ <item android:bottom="1dip">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/actionbar_background_color" />
+ </shape>
+ </item>
+</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml
new file mode 100644
index 000000000..25d76fc27
--- /dev/null
+++ b/res/drawable/tab_selected.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#7d7d7d" />
+ </shape>
+ </item>
+ <item android:bottom="6dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/actionbar_background_color" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_selected_focused.xml b/res/drawable/tab_selected_focused.xml
new file mode 100644
index 000000000..8efd7b30e
--- /dev/null
+++ b/res/drawable/tab_selected_focused.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#7d7d7d" />
+ </shape>
+ </item>
+ <item android:bottom="6dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/actionbar_background_color" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#27ffffff" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#00000000" />
+
+ <stroke
+ android:width="2dp"
+ android:color="#27ffffff" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_selected_pressed.xml b/res/drawable/tab_selected_pressed.xml
new file mode 100644
index 000000000..a38344e04
--- /dev/null
+++ b/res/drawable/tab_selected_pressed.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#7d7d7d" />
+ </shape>
+ </item>
+ <item android:bottom="6dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/actionbar_background_color" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#4dffffff" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_unselected_focused.xml b/res/drawable/tab_unselected_focused.xml
new file mode 100644
index 000000000..2aceb63ef
--- /dev/null
+++ b/res/drawable/tab_unselected_focused.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#27ffffff" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#00000000" />
+
+ <stroke
+ android:width="2dp"
+ android:color="#27ffffff" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_unselected_pressed.xml b/res/drawable/tab_unselected_pressed.xml
new file mode 100644
index 000000000..2362b6581
--- /dev/null
+++ b/res/drawable/tab_unselected_pressed.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#4dffffff" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/layout/new_call_log_list_item.xml b/res/layout/new_call_log_list_item.xml
index c674f2e8c..5a6c446a2 100644
--- a/res/layout/new_call_log_list_item.xml
+++ b/res/layout/new_call_log_list_item.xml
@@ -20,6 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:background="@drawable/bottom_border_background"
>
<!--
This layout may represent either a call log item or one of the
@@ -52,11 +53,10 @@
android:layout_height="@dimen/call_log_list_contact_photo_size"
android:nextFocusRight="@id/primary_action_view"
android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
android:focusable="true"
/>
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="@dimen/call_log_inner_margin"
@@ -80,16 +80,6 @@
android:orientation="horizontal"
>
<TextView
- android:id="@+id/number"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/call_log_icon_margin"
- android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="14sp"
- android:singleLine="true"
- android:ellipsize="marquee"
- />
- <TextView
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2534cb5ac..df4b2f45d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -44,7 +44,10 @@
<color name="item_selected">#660099cc</color>
<!-- Background color of new dialer activity -->
- <color name="background_dial_holo_light">#f5f5f5</color>
+ <color name="background_dialer_light">#cecece</color>
+
+ <!-- Background color of dialer list items (contacts, call log entries) -->
+ <color name="background_dialer_list_items">#f5f5f5</color>
<!-- Background color of new dialpad -->
<color name="background_dialpad">#ee020709</color>
@@ -55,7 +58,7 @@
-->
<color name="dialpad_secondary_text_color">#888888</color>
- <!-- Background color of fake action bar in the favorites fragment -->
+ <!-- Background color of action bars -->
<color name="actionbar_background_color">#e6e6e6</color>
<!-- Color of the 1dp divider that separates favorites -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0c5d22e10..0ab27c311 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -57,10 +57,11 @@
<dimen name="smartdial_suggestions_extra_padding">2dp</dimen>
<dimen name="smartdial_confidence_hint_text_size">27dp</dimen>
- <!-- Favorites tile padding -->
+ <!-- Favorites tile and recent call log padding -->
<dimen name="phone_contact_tile_divider_padding">3dp</dimen>
<dimen name="favorites_row_top_padding">8dp</dimen>
<dimen name="favorites_row_bottom_padding">8dp</dimen>
<dimen name="favorites_row_start_padding">8dp</dimen>
<dimen name="favorites_row_end_padding">8dp</dimen>
+ <dimen name="recent_call_log_item_padding">8dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 59322949a..0cdf223e3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -71,8 +71,9 @@
<item name="android:textColorSecondary">@color/dialtacts_secondary_text_color</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:actionBarStyle">@style/DialtactsActionBarStyleNew</item>
+ <item name="android:actionBarTabStyle">@style/DialtactsActionBarTabStyle</item>
<item name="android:windowContentOverlay">@null</item>
- <item name="android:windowBackground">@color/background_dial_holo_light</item>
+ <item name="android:windowBackground">@color/background_dialer_light</item>
<!-- Searchbox Style -->
<item name="android:editTextStyle">@style/DialtactsSearchboxStyle</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
@@ -168,8 +169,8 @@
</style>
<style name="DialtactsActionBarStyleNew" parent="android:Widget.Holo.ActionBar">
- <item name="android:backgroundSplit">@null</item>
- <item name="android:background">@color/actionbar_background_color</item>
+ <item name="android:background">@drawable/call_history_actionbar_background</item>
+ <item name="android:backgroundStacked">@color/actionbar_background_color</item>
<!-- Empty icon -->
<item name="android:icon">@android:color/transparent</item>
<item name="android:displayOptions"></item>
@@ -181,6 +182,10 @@
<item name="android:displayOptions"></item>
</style>
+ <style name="DialtactsActionBarTabStyle" parent="@android:style/Widget.Holo.ActionBar.TabView">
+ <item name="android:background">@drawable/action_bar_tab</item>
+ </style>
+
<style name="ListViewStyle" parent="@android:style/Widget.Holo.Light.ListView">
<item name="android:overScrollMode">always</item>
</style>