summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-02-12 22:15:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-12 22:15:33 +0000
commitfa6dee0a5ba820e9ac391c5d4bcbac9ccdd916c2 (patch)
tree4286896d33f1767157893bb745047210e4059610 /res
parent6fc940293804e91cf53bcde5fa2104519e682e83 (diff)
parent55b030a8bbb0323a4823fc34f3167a248a0ff899 (diff)
Merge "Smart Dialling v2 with phone number support"
Diffstat (limited to 'res')
-rw-r--r--res/layout/dialpad_fragment.xml5
-rw-r--r--res/layout/dialpad_smartdial_item.xml33
-rw-r--r--res/values/colors.xml1
3 files changed, 26 insertions, 13 deletions
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index e672551bb..27ba2da46 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -56,17 +56,16 @@
android:src="@drawable/ic_dial_action_delete" />
</LinearLayout>
- <View style="@style/DialpadHorizontalSeparator"/>
-
<!-- Smard dial suggestion section -->
<GridView
android:id="@+id/dialpad_smartdial_list"
android:layout_width="match_parent"
- android:layout_height="42sp"
+ android:layout_height="50sp"
android:columnWidth="0dp"
android:numColumns="3"
android:stretchMode="columnWidth"
android:gravity="center"
+ android:layout_marginTop="@dimen/dialpad_vertical_margin"
android:background="@drawable/dialpad_background"/>
<!-- Keypad section -->
diff --git a/res/layout/dialpad_smartdial_item.xml b/res/layout/dialpad_smartdial_item.xml
index eed257035..54f2a084e 100644
--- a/res/layout/dialpad_smartdial_item.xml
+++ b/res/layout/dialpad_smartdial_item.xml
@@ -13,16 +13,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<com.android.dialer.dialpad.SmartDialTextView
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/contact_name"
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="42sp"
- android:padding="@dimen/smartdial_suggestions_padding"
- android:textColor="#39caff"
- android:textSize="16sp"
- android:singleLine="true"
- android:ellipsize="none"
- android:gravity="center"
+ android:layout_height="46sp">
+
+ <com.android.dialer.dialpad.SmartDialTextView
+ android:id="@+id/contact_name"
+ android:layout_width="match_parent"
+ android:layout_height="28sp"
+ android:padding="@dimen/smartdial_suggestions_padding"
+ android:textColor="@color/smartdial_primary_text_color"
+ android:textSize="16sp"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:gravity="center"
+ />
+ <com.android.dialer.dialpad.SmartDialTextView
+ android:id="@+id/contact_number"
+ android:layout_width="match_parent"
+ android:layout_height="16sp"
+ android:textColor="@color/dialtacts_secondary_text_color"
+ android:textSize="13sp"
+ android:gravity="center"
/>
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ebdc2f60e..288f58b64 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,6 +19,7 @@
<!-- Secondary text color in the Phone app -->
<color name="dialtacts_secondary_text_color">#888888</color>
<color name="smartdial_confidence_drawable_color">#39caff</color>
+ <color name="smartdial_primary_text_color">#39caff</color>
<color name="smartdial_highlighted_text_color">#ffffff</color>
<!-- Color of the text describing an unconsumed missed call. -->