summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-10-04 11:09:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 11:09:56 -0700
commitacb9de7b5ad314dc758431bbe7236947054efb52 (patch)
tree01c3e849d29b7f51c8ddebfb4697ac6c9b8c3494 /res
parent2d55530c4abad10a042a8b498020b13b836ceac7 (diff)
parentd3238ad24741be446074a6c0d6280831e490caca (diff)
am d3238ad2: am 1ba5a943: am 1f06f0ad: Adds tooltip for Dialer
* commit 'd3238ad24741be446074a6c0d6280831e490caca': Adds tooltip for Dialer
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_arrow.pngbin0 -> 852 bytes
-rw-r--r--res/drawable-hdpi/ic_cancel_holo_light.pngbin0 -> 393 bytes
-rw-r--r--res/drawable-mdpi/ic_arrow.pngbin0 -> 697 bytes
-rw-r--r--res/drawable-mdpi/ic_cancel_holo_light.pngbin0 -> 312 bytes
-rw-r--r--res/drawable-xhdpi/ic_arrow.pngbin0 -> 1017 bytes
-rw-r--r--res/drawable-xhdpi/ic_cancel_holo_light.pngbin0 -> 1477 bytes
-rw-r--r--res/drawable-xxhdpi/ic_arrow.pngbin0 -> 1506 bytes
-rw-r--r--res/drawable-xxhdpi/ic_cancel_holo_light.pngbin0 -> 1637 bytes
-rw-r--r--res/layout/tile_interactions_teaser_view.xml63
-rw-r--r--res/values/dimens.xml4
-rw-r--r--res/values/styles.xml5
11 files changed, 72 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_arrow.png b/res/drawable-hdpi/ic_arrow.png
new file mode 100644
index 000000000..8d0dfcd47
--- /dev/null
+++ b/res/drawable-hdpi/ic_arrow.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_cancel_holo_light.png b/res/drawable-hdpi/ic_cancel_holo_light.png
new file mode 100644
index 000000000..d8cacb44a
--- /dev/null
+++ b/res/drawable-hdpi/ic_cancel_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_arrow.png b/res/drawable-mdpi/ic_arrow.png
new file mode 100644
index 000000000..96440a2be
--- /dev/null
+++ b/res/drawable-mdpi/ic_arrow.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_cancel_holo_light.png b/res/drawable-mdpi/ic_cancel_holo_light.png
new file mode 100644
index 000000000..56705c333
--- /dev/null
+++ b/res/drawable-mdpi/ic_cancel_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_arrow.png b/res/drawable-xhdpi/ic_arrow.png
new file mode 100644
index 000000000..889c33fce
--- /dev/null
+++ b/res/drawable-xhdpi/ic_arrow.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_cancel_holo_light.png b/res/drawable-xhdpi/ic_cancel_holo_light.png
new file mode 100644
index 000000000..630f3fd4c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_cancel_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_arrow.png b/res/drawable-xxhdpi/ic_arrow.png
new file mode 100644
index 000000000..f8e7731d4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_arrow.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cancel_holo_light.png b/res/drawable-xxhdpi/ic_cancel_holo_light.png
new file mode 100644
index 000000000..c2f5b5e1c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cancel_holo_light.png
Binary files differ
diff --git a/res/layout/tile_interactions_teaser_view.xml b/res/layout/tile_interactions_teaser_view.xml
new file mode 100644
index 000000000..ee2b97495
--- /dev/null
+++ b/res/layout/tile_interactions_teaser_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013 Google Inc. -->
+<com.android.dialer.list.TileInteractionTeaserView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/actionbar_background_color"
+ android:paddingBottom="@dimen/favorites_row_bottom_padding"
+ android:paddingTop="@dimen/favorites_row_top_padding">
+
+ <LinearLayout
+ android:id="@+id/swipeable_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:id="@+id/arrow"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="12dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="12dp"
+ android:duplicateParentState="true"
+ android:src="@drawable/ic_arrow"
+ android:visibility="invisible" />
+
+ <TextView
+ android:id="@+id/text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="12dp"
+ android:layout_marginTop="12dp"
+ android:layout_weight="1"
+ android:duplicateParentState="true"
+ android:fontFamily="sans-serif-light"
+ android:text="@string/contact_tooltip"
+ android:textColor="@color/undo_dialogue_text_color"
+ android:textSize="16sp" />
+
+ <View
+ android:id="@+id/dismiss_separator"
+ android:layout_width="1dip"
+ android:layout_height="match_parent"
+ android:background="@color/undo_dialogue_text_color"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="16dp"
+ android:layout_marginLeft="16dp"/>
+
+ <ImageButton
+ android:id="@+id/dismiss_button"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true"
+ android:scaleType="center"
+ android:src="@drawable/ic_cancel_holo_light"
+ style="@style/DismissButtonStyle" />
+
+ </LinearLayout>
+
+</com.android.dialer.list.TileInteractionTeaserView>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d1052d5c7..30adc43ed 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -73,4 +73,8 @@
<dimen name="favorites_row_end_padding">8dp</dimen>
<dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
<dimen name="recent_call_log_item_padding">8dp</dimen>
+
+ <!-- Padding for the tooltip -->
+ <dimen name="dismiss_button_padding_start">20dip</dimen>
+ <dimen name="dismiss_button_padding_end">28dip</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 791adf696..4e918975d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -145,4 +145,9 @@
<item name="android:background">@null</item>
<item name="android:textColorHint">@color/searchbox_text_color</item>
</style>
+
+ <style name="DismissButtonStyle">
+ <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item>
+ <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item>
+ </style>
</resources>