summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorPaul Soulos <psoulos@google.com>2014-05-27 16:21:23 -0700
committerBrian Attwell <brianattwell@google.com>2014-06-11 14:17:34 -0700
commit2b9563d4c3aa7d3f57ab16ea4cb98cd9e588c50d (patch)
tree2157c7ae84b10ee196b086b4854500ec0c0c4b3b /res
parent39a7dee5afe13de8e84afa3177ba60949b865a5e (diff)
downloadpackages_apps_Contacts-2b9563d4c3aa7d3f57ab16ea4cb98cd9e588c50d.tar.gz
packages_apps_Contacts-2b9563d4c3aa7d3f57ab16ea4cb98cd9e588c50d.tar.bz2
packages_apps_Contacts-2b9563d4c3aa7d3f57ab16ea4cb98cd9e588c50d.zip
Uses a floating action button for adding new contact
Change-Id: I47cc26e857f7b3da8537bc52c8cb08b969af44b7
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_person_add_24dp.pngbin0 -> 374 bytes
-rw-r--r--res/drawable-hdpi/profile_ic_fab_yellow.pngbin0 -> 3932 bytes
-rw-r--r--res/drawable-mdpi/ic_person_add_24dp.pngbin0 -> 283 bytes
-rw-r--r--res/drawable-mdpi/profile_ic_fab_yellow.pngbin0 -> 2213 bytes
-rw-r--r--res/drawable-xhdpi/ic_person_add_24dp.pngbin0 -> 422 bytes
-rw-r--r--res/drawable-xhdpi/profile_ic_fab_yellow.pngbin0 -> 6280 bytes
-rw-r--r--res/drawable-xxhdpi/ic_person_add_24dp.pngbin0 -> 574 bytes
-rw-r--r--res/drawable-xxhdpi/profile_ic_fab_yellow.pngbin0 -> 18501 bytes
-rw-r--r--res/drawable/floating_action_button.xml22
-rw-r--r--res/layout/people_activity.xml22
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/strings.xml4
12 files changed, 48 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_person_add_24dp.png b/res/drawable-hdpi/ic_person_add_24dp.png
new file mode 100644
index 000000000..1b71ff146
--- /dev/null
+++ b/res/drawable-hdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/profile_ic_fab_yellow.png b/res/drawable-hdpi/profile_ic_fab_yellow.png
new file mode 100644
index 000000000..9287aa5dd
--- /dev/null
+++ b/res/drawable-hdpi/profile_ic_fab_yellow.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_person_add_24dp.png b/res/drawable-mdpi/ic_person_add_24dp.png
new file mode 100644
index 000000000..b6cf02df3
--- /dev/null
+++ b/res/drawable-mdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/profile_ic_fab_yellow.png b/res/drawable-mdpi/profile_ic_fab_yellow.png
new file mode 100644
index 000000000..257be13d2
--- /dev/null
+++ b/res/drawable-mdpi/profile_ic_fab_yellow.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_person_add_24dp.png b/res/drawable-xhdpi/ic_person_add_24dp.png
new file mode 100644
index 000000000..2d265e10b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/profile_ic_fab_yellow.png b/res/drawable-xhdpi/profile_ic_fab_yellow.png
new file mode 100644
index 000000000..a6e183bea
--- /dev/null
+++ b/res/drawable-xhdpi/profile_ic_fab_yellow.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_person_add_24dp.png b/res/drawable-xxhdpi/ic_person_add_24dp.png
new file mode 100644
index 000000000..6091312b9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/profile_ic_fab_yellow.png b/res/drawable-xxhdpi/profile_ic_fab_yellow.png
new file mode 100644
index 000000000..3e4b89834
--- /dev/null
+++ b/res/drawable-xxhdpi/profile_ic_fab_yellow.png
Binary files differ
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
new file mode 100644
index 000000000..96748e636
--- /dev/null
+++ b/res/drawable/floating_action_button.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@color/contacts_accent_color"
+ android:pinned="true">
+ <item android:drawable="@drawable/profile_ic_fab_yellow" />
+</ripple>
diff --git a/res/layout/people_activity.xml b/res/layout/people_activity.xml
index 589e4a950..bcdf08f25 100644
--- a/res/layout/people_activity.xml
+++ b/res/layout/people_activity.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -42,4 +42,22 @@
android:layout_height="match_parent"
android:layout_width="match_parent" />
</FrameLayout>
-</FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/floating_action_button_container"
+ android:layout_width="@dimen/floating_action_button_width"
+ android:layout_height="@dimen/floating_action_button_height"
+ android:layout_marginRight="@dimen/floating_action_button_margin_right"
+ android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true">
+
+ <ImageButton
+ android:id="@+id/floating_action_button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/floating_action_button"
+ android:contentDescription="@string/action_menu_add_new_contact_button"
+ android:src="@drawable/ic_person_add_24dp"/>
+ </FrameLayout>
+</RelativeLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 51dbd716f..d1ea3b06b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -41,4 +41,6 @@
<!-- Color of the selected tab underline (overriding value in ContactsCommon) -->
<color name="tab_selected_color">#ffeeff41</color>
+ <color name="contacts_accent_color">#00acc1</color>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 305a6482c..f40dbb0c6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -644,4 +644,8 @@
<!-- Description when picture in the contact detail view is selected. [CHAR LIMIT=NONE] -->
<string name="contact_detail_picture_description">Picture. Select to change</string>
+
+ <!-- Content description for the button that adds a new contact
+ [CHAR LIMIT=NONE] -->
+ <string name="action_menu_add_new_contact_button">add new contact</string>
</resources>