summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-07-23 17:57:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-23 17:57:40 +0000
commitf2dc8a2704486eb031cfa5014d0626e96f5d5a43 (patch)
tree5adaccbfc2434fb0526129d7dd93d4d52779d957 /res
parent365344bcb99ac7a72948a13f2babaadc19efe0e6 (diff)
parentd99993213962df64c9d76005df86c2fb83fca074 (diff)
Merge "Style and layout changes to match redlines"
Diffstat (limited to 'res')
-rw-r--r--res/anim/slide_in.xml2
-rw-r--r--res/anim/slide_out.xml2
-rw-r--r--res/drawable-hdpi/ic_ab_dialer_holo_light.pngbin0 -> 1696 bytes
-rw-r--r--res/drawable-hdpi/ic_close_dk.pngbin0 -> 956 bytes
-rw-r--r--res/drawable-hdpi/ic_contact_info.pngbin0 -> 831 bytes
-rw-r--r--res/drawable-hdpi/ic_dialer_menu_dialpad_dk.pngbin0 -> 747 bytes
-rw-r--r--res/drawable-hdpi/ic_dialer_menu_history_dk.pngbin0 -> 1605 bytes
-rw-r--r--res/drawable-hdpi/ic_menu_overflow_dark.pngbin0 -> 647 bytes
-rw-r--r--res/drawable-hdpi/ic_play_holo_light.pngbin0 -> 1050 bytes
-rw-r--r--res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_light.pngbin0 -> 1154 bytes
-rw-r--r--res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_light.pngbin0 -> 2245 bytes
-rw-r--r--res/drawable-mdpi/ic_close_dk.pngbin0 -> 839 bytes
-rw-r--r--res/drawable-mdpi/ic_contact_info.pngbin0 -> 598 bytes
-rw-r--r--res/drawable-mdpi/ic_dialer_menu_dialpad_dk.pngbin0 -> 897 bytes
-rw-r--r--res/drawable-mdpi/ic_dialer_menu_history_dk.pngbin0 -> 1107 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_overflow_dark.pngbin0 -> 616 bytes
-rw-r--r--res/drawable-mdpi/ic_play_holo_light.pngbin0 -> 769 bytes
-rw-r--r--res/drawable-xhdpi/ic_close_dk.pngbin0 -> 1347 bytes
-rw-r--r--res/drawable-xhdpi/ic_contact_info.pngbin0 -> 1186 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.pngbin0 -> 1363 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialer_menu_history_dk.pngbin0 -> 2289 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_overflow_dark.pngbin0 -> 800 bytes
-rw-r--r--res/drawable-xhdpi/ic_people_info.pngbin0 -> 2270 bytes
-rw-r--r--res/drawable-xhdpi/ic_play_holo_light.pngbin0 -> 1312 bytes
-rw-r--r--res/drawable/bottom_border_background.xml29
-rw-r--r--res/layout/new_dialtacts_activity.xml29
-rw-r--r--res/layout/new_phone_favorites_fragment.xml11
-rw-r--r--res/layout/phone_favorite_regular_row_view.xml49
-rw-r--r--res/layout/phone_favorite_tile_view.xml12
-rw-r--r--res/values/colors.xml13
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/values/styles.xml10
33 files changed, 99 insertions, 67 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml
index b7836f0c3..31502a971 100644
--- a/res/anim/slide_in.xml
+++ b/res/anim/slide_in.xml
@@ -15,7 +15,7 @@
-->
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:anim/linear_interpolator"
+ android:interpolator="@android:anim/decelerate_interpolator"
android:valueFrom="0.67"
android:valueTo="0"
android:valueType="floatType"
diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml
index 7df102dfa..e037009f7 100644
--- a/res/anim/slide_out.xml
+++ b/res/anim/slide_out.xml
@@ -15,7 +15,7 @@
-->
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:anim/linear_interpolator"
+ android:interpolator="@android:anim/decelerate_interpolator"
android:valueFrom="0"
android:valueTo="0.67"
android:valueType="floatType"
diff --git a/res/drawable-hdpi/ic_ab_dialer_holo_light.png b/res/drawable-hdpi/ic_ab_dialer_holo_light.png
new file mode 100644
index 000000000..7e3457661
--- /dev/null
+++ b/res/drawable-hdpi/ic_ab_dialer_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_close_dk.png b/res/drawable-hdpi/ic_close_dk.png
new file mode 100644
index 000000000..f5e378fbc
--- /dev/null
+++ b/res/drawable-hdpi/ic_close_dk.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_info.png b/res/drawable-hdpi/ic_contact_info.png
new file mode 100644
index 000000000..9c23000d9
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_info.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png b/res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png
new file mode 100644
index 000000000..4da8f2855
--- /dev/null
+++ b/res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialer_menu_history_dk.png b/res/drawable-hdpi/ic_dialer_menu_history_dk.png
new file mode 100644
index 000000000..b8d1944b2
--- /dev/null
+++ b/res/drawable-hdpi/ic_dialer_menu_history_dk.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow_dark.png b/res/drawable-hdpi/ic_menu_overflow_dark.png
new file mode 100644
index 000000000..69741cbf0
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_overflow_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_play_holo_light.png b/res/drawable-hdpi/ic_play_holo_light.png
new file mode 100644
index 000000000..684df0074
--- /dev/null
+++ b/res/drawable-hdpi/ic_play_holo_light.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_light.png b/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_light.png
new file mode 100644
index 000000000..1bc02cc98
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_light.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_light.png b/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_light.png
new file mode 100644
index 000000000..8a25e7004
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_close_dk.png b/res/drawable-mdpi/ic_close_dk.png
new file mode 100644
index 000000000..13f68ee36
--- /dev/null
+++ b/res/drawable-mdpi/ic_close_dk.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_info.png b/res/drawable-mdpi/ic_contact_info.png
new file mode 100644
index 000000000..5d35ec579
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_info.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png b/res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png
new file mode 100644
index 000000000..5a3ac0c33
--- /dev/null
+++ b/res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialer_menu_history_dk.png b/res/drawable-mdpi/ic_dialer_menu_history_dk.png
new file mode 100644
index 000000000..d9306baf6
--- /dev/null
+++ b/res/drawable-mdpi/ic_dialer_menu_history_dk.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow_dark.png b/res/drawable-mdpi/ic_menu_overflow_dark.png
new file mode 100644
index 000000000..2a477c827
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_overflow_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_play_holo_light.png b/res/drawable-mdpi/ic_play_holo_light.png
new file mode 100644
index 000000000..f36edf93b
--- /dev/null
+++ b/res/drawable-mdpi/ic_play_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_close_dk.png b/res/drawable-xhdpi/ic_close_dk.png
new file mode 100644
index 000000000..4f965fe6b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_close_dk.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_info.png b/res/drawable-xhdpi/ic_contact_info.png
new file mode 100644
index 000000000..88d367b65
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_info.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png b/res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png
new file mode 100644
index 000000000..317bf6611
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialer_menu_history_dk.png b/res/drawable-xhdpi/ic_dialer_menu_history_dk.png
new file mode 100644
index 000000000..63ad62b39
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dialer_menu_history_dk.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow_dark.png b/res/drawable-xhdpi/ic_menu_overflow_dark.png
new file mode 100644
index 000000000..8cbd50827
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_overflow_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_people_info.png b/res/drawable-xhdpi/ic_people_info.png
new file mode 100644
index 000000000..b933bbc0f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_people_info.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_play_holo_light.png b/res/drawable-xhdpi/ic_play_holo_light.png
new file mode 100644
index 000000000..f79757664
--- /dev/null
+++ b/res/drawable-xhdpi/ic_play_holo_light.png
Binary files differ
diff --git a/res/drawable/bottom_border_background.xml b/res/drawable/bottom_border_background.xml
new file mode 100644
index 000000000..9a35e8a4d
--- /dev/null
+++ b/res/drawable/bottom_border_background.xml
@@ -0,0 +1,29 @@
+<?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="@color/favorite_contacts_separator_color" />
+ <padding android:bottom="1dp" />
+ </shape>
+</item>
+<item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/background_dial_holo_light" />
+ </shape>
+</item>
+</layer-list> \ No newline at end of file
diff --git a/res/layout/new_dialtacts_activity.xml b/res/layout/new_dialtacts_activity.xml
index a9960d8e3..7845d0fef 100644
--- a/res/layout/new_dialtacts_activity.xml
+++ b/res/layout/new_dialtacts_activity.xml
@@ -22,17 +22,36 @@
android:clipChildren="false"
android:id="@+id/dialtacts_container"
>
+ <!-- Overlapping dialpad fragment is inserted here -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:orientation="vertical" >
- <SearchView
- android:id="@+id/search_view"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:iconifiedByDefault="false"
- android:inputType="textFilter" />
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dp"
+ android:paddingRight="23dp"
+ android:id="@+id/search_view_container"
+ android:background="@color/searchbox_background_color"
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+ <EditText
+ android:id="@+id/search_view"
+ android:layout_width="0dp"
+ android:layout_height="56dp"
+ android:layout_weight="1"
+ android:inputType="textFilter"/>
+ <ImageView
+ android:id="@+id/search_close_button"
+ android:layout_height="40dp"
+ android:layout_width="40dp"
+ android:padding="6dp"
+ android:src="@drawable/ic_close_dk"
+ android:background="?android:attr/selectableItemBackground"
+ android:visibility="gone" />
+ </LinearLayout>
<FrameLayout
android:layout_height="0dp"
android:layout_weight="1"
diff --git a/res/layout/new_phone_favorites_fragment.xml b/res/layout/new_phone_favorites_fragment.xml
index 33a3eb43a..90d0aacd2 100644
--- a/res/layout/new_phone_favorites_fragment.xml
+++ b/res/layout/new_phone_favorites_fragment.xml
@@ -46,9 +46,10 @@
android:textAppearance="?android:attr/textAppearanceLarge"/>
</FrameLayout>
<FrameLayout
- android:layout_height="?android:attr/actionBarSize"
+ android:layout_height="48dp"
android:layout_width="match_parent"
- android:id="@+id/fake_action_bar">
+ android:id="@+id/fake_action_bar"
+ android:background="@color/actionbar_background_color">
<ImageButton
android:id="@+id/call_history_button"
android:layout_width="@dimen/fake_menu_button_min_width"
@@ -56,7 +57,7 @@
android:layout_gravity="bottom|start"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/description_search_button"
- android:src="@drawable/ic_dial_action_search"/>
+ android:src="@drawable/ic_dialer_menu_history_dk"/>
<ImageButton
android:id="@+id/dialpad_button"
android:layout_width="@dimen/fake_menu_button_min_width"
@@ -64,13 +65,13 @@
android:layout_gravity="bottom|center"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/description_search_button"
- android:src="@drawable/ic_dial_action_search"/>
+ android:src="@drawable/ic_dialer_menu_dialpad_dk"/>
<ImageButton
android:id="@+id/overflow_menu"
android:layout_width="@dimen/fake_menu_button_min_width"
android:layout_height="match_parent"
android:layout_gravity="bottom|end"
- android:src="@drawable/ic_menu_overflow"
+ android:src="@drawable/ic_menu_overflow_dark"
android:contentDescription="@string/action_menu_overflow_description"
android:background="?android:attr/selectableItemBackground"/>
</FrameLayout>
diff --git a/res/layout/phone_favorite_regular_row_view.xml b/res/layout/phone_favorite_regular_row_view.xml
index 30e109f9e..eda5a02c8 100644
--- a/res/layout/phone_favorite_regular_row_view.xml
+++ b/res/layout/phone_favorite_regular_row_view.xml
@@ -52,55 +52,6 @@
android:fadingEdgeLength="3dip"
android:ellipsize="marquee"
android:textAlignment="viewStart" />
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/contact_tile_name"
- android:layout_toRightOf="@id/contact_tile_quick"
- android:layout_toEndOf="@id/contact_tile_quick"
- android:gravity="center_vertical">
-
- <TextView
- android:id="@+id/contact_tile_phone_number"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="?attr/list_item_data_width_weight"
- android:textSize="14sp"
- android:ellipsize="marquee"
- android:textColor="@color/dialtacts_secondary_text_color"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip"
- android:singleLine="true"
- android:layout_gravity="bottom"
- android:textDirection="ltr"
- android:textAlignment="viewStart" />
-
- <TextView
- android:id="@+id/contact_tile_phone_type"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="?attr/list_item_label_width_weight"
- android:textSize="12sp"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/dialtacts_secondary_text_color"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip"
- android:gravity="end"
- android:layout_gravity="bottom" />
-
- </LinearLayout>
-
- <View
- android:id="@+id/contact_tile_horizontal_divider"
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:background="?android:attr/listDivider"
- android:layout_below="@id/contact_tile_quick" />
-
</RelativeLayout>
</view>
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index f6e44d857..bf9020557 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -60,14 +60,16 @@
<ImageButton
android:id="@id/contact_tile_secondary_button"
- android:src="@drawable/ic_contacts_holo_dark"
+ android:src="@drawable/ic_contact_info"
android:background="?android:attr/selectableItemBackground"
android:layout_height="@dimen/contact_tile_shadowbox_height"
android:layout_width="48dip"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- android:paddingStart="8dip"
- android:paddingEnd="8dip"
+ android:paddingLeft="12dip"
+ android:paddingRight="12dip"
+ android:paddingStart="12dip"
+ android:paddingEnd="12dip"
+ android:paddingTop="12dip"
+ android:paddingBottom="12dip"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 672c970b3..2534cb5ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -44,7 +44,7 @@
<color name="item_selected">#660099cc</color>
<!-- Background color of new dialer activity -->
- <color name="background_dial_holo_light">#ffffff</color>
+ <color name="background_dial_holo_light">#f5f5f5</color>
<!-- Background color of new dialpad -->
<color name="background_dialpad">#ee020709</color>
@@ -55,4 +55,15 @@
-->
<color name="dialpad_secondary_text_color">#888888</color>
+ <!-- Background color of fake action bar in the favorites fragment -->
+ <color name="actionbar_background_color">#e6e6e6</color>
+
+ <!-- Color of the 1dp divider that separates favorites -->
+ <color name="favorite_contacts_separator_color">#d0d0d0</color>
+
+ <!-- Background color of the search box -->
+ <color name="searchbox_background_color">#ffffff</color>
+ <!-- Text color of the search box -->
+ <color name="searchbox_text_color">#d3d3d3</color>
+
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 474f57227..0c5d22e10 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -57,4 +57,10 @@
<dimen name="smartdial_suggestions_extra_padding">2dp</dimen>
<dimen name="smartdial_confidence_hint_text_size">27dp</dimen>
+ <!-- Favorites tile 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>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0915fa1c4..8b7d61a1a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -534,4 +534,7 @@
<!-- Menu option to show favorite contacts only -->
<string name="show_favorites_only">Show favorites only</string>
+
+ <!-- Title of activity that displays a list of all calls -->
+ <string name="call_log_activity_title">History</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cb36090cb..59322949a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -73,6 +73,8 @@
<item name="android:actionBarStyle">@style/DialtactsActionBarStyleNew</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowBackground">@color/background_dial_holo_light</item>
+ <!-- Searchbox Style -->
+ <item name="android:editTextStyle">@style/DialtactsSearchboxStyle</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
@@ -167,6 +169,9 @@
<style name="DialtactsActionBarStyleNew" parent="android:Widget.Holo.ActionBar">
<item name="android:backgroundSplit">@null</item>
+ <item name="android:background">@color/actionbar_background_color</item>
+ <!-- Empty icon -->
+ <item name="android:icon">@android:color/transparent</item>
<item name="android:displayOptions"></item>
</style>
@@ -183,4 +188,9 @@
<style name="FragmentActionBarPadding">
<item name="android:paddingBottom">?android:attr/actionBarSize</item>
</style>
+
+ <style name="DialtactsSearchboxStyle" parent="@android:style/Widget.EditText">
+ <item name="android:background">@null</item>
+ <item name="android:textColorHint">@color/searchbox_text_color</item>
+ </style>
</resources>