auto import from //branches/cupcake/...@131421
diff --git a/res/drawable-finger/btn_circle.xml b/res/drawable-finger/btn_circle.xml
new file mode 100644
index 0000000..9208010
--- /dev/null
+++ b/res/drawable-finger/btn_circle.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:state_window_focused="false" android:state_enabled="true"
+ android:drawable="@drawable/btn_circle_normal" />
+ <item android:state_window_focused="false" android:state_enabled="false"
+ android:drawable="@drawable/btn_circle_disable" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/btn_circle_pressed" />
+ <item android:state_focused="true" android:state_enabled="true"
+ android:drawable="@drawable/btn_circle_selected" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/btn_circle_normal" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/btn_circle_disable_focused" />
+ <item
+ android:drawable="@drawable/btn_circle_disable" />
+</selector>
diff --git a/res/drawable-finger/btn_circle_disable.png b/res/drawable-finger/btn_circle_disable.png
new file mode 100644
index 0000000..33b74a6
--- /dev/null
+++ b/res/drawable-finger/btn_circle_disable.png
Binary files differ
diff --git a/res/drawable-finger/btn_circle_disable_focused.png b/res/drawable-finger/btn_circle_disable_focused.png
new file mode 100644
index 0000000..005ad8d
--- /dev/null
+++ b/res/drawable-finger/btn_circle_disable_focused.png
Binary files differ
diff --git a/res/drawable-finger/btn_circle_longpress.png b/res/drawable-finger/btn_circle_longpress.png
new file mode 100644
index 0000000..f27d411
--- /dev/null
+++ b/res/drawable-finger/btn_circle_longpress.png
Binary files differ
diff --git a/res/drawable-finger/btn_circle_normal.png b/res/drawable-finger/btn_circle_normal.png
new file mode 100644
index 0000000..51268af
--- /dev/null
+++ b/res/drawable-finger/btn_circle_normal.png
Binary files differ
diff --git a/res/drawable-finger/btn_circle_pressed.png b/res/drawable-finger/btn_circle_pressed.png
new file mode 100644
index 0000000..8f40afd
--- /dev/null
+++ b/res/drawable-finger/btn_circle_pressed.png
Binary files differ
diff --git a/res/drawable-finger/btn_circle_selected.png b/res/drawable-finger/btn_circle_selected.png
new file mode 100644
index 0000000..0828a7b
--- /dev/null
+++ b/res/drawable-finger/btn_circle_selected.png
Binary files differ
diff --git a/res/drawable-finger/btn_contact_picture.xml b/res/drawable-finger/btn_contact_picture.xml
new file mode 100644
index 0000000..643231a
--- /dev/null
+++ b/res/drawable-finger/btn_contact_picture.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:state_window_focused="false"
+ android:drawable="@drawable/contact_picture_border_normal" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/contact_picture_border_pressed" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/contact_picture_border_highlight" />
+ <item
+ android:drawable="@drawable/contact_picture_border_normal" />
+</selector>
diff --git a/res/drawable-finger/contact_picture_border_highlight.9.png b/res/drawable-finger/contact_picture_border_highlight.9.png
new file mode 100644
index 0000000..fc4e01d
--- /dev/null
+++ b/res/drawable-finger/contact_picture_border_highlight.9.png
Binary files differ
diff --git a/res/drawable-finger/contact_picture_border_longpress.9.png b/res/drawable-finger/contact_picture_border_longpress.9.png
new file mode 100644
index 0000000..c89a55a
--- /dev/null
+++ b/res/drawable-finger/contact_picture_border_longpress.9.png
Binary files differ
diff --git a/res/drawable-finger/contact_picture_border_normal.9.png b/res/drawable-finger/contact_picture_border_normal.9.png
new file mode 100644
index 0000000..37451ae
--- /dev/null
+++ b/res/drawable-finger/contact_picture_border_normal.9.png
Binary files differ
diff --git a/res/drawable-finger/contact_picture_border_pressed.9.png b/res/drawable-finger/contact_picture_border_pressed.9.png
new file mode 100644
index 0000000..11eaae5
--- /dev/null
+++ b/res/drawable-finger/contact_picture_border_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/ic_btn_round_minus.png b/res/drawable-finger/ic_btn_round_minus.png
new file mode 100644
index 0000000..96dbb17
--- /dev/null
+++ b/res/drawable-finger/ic_btn_round_minus.png
Binary files differ
diff --git a/res/drawable-finger/ic_btn_round_more.png b/res/drawable-finger/ic_btn_round_more.png
new file mode 100644
index 0000000..ebdc55c
--- /dev/null
+++ b/res/drawable-finger/ic_btn_round_more.png
Binary files differ
diff --git a/res/drawable-finger/ic_btn_round_plus.png b/res/drawable-finger/ic_btn_round_plus.png
new file mode 100644
index 0000000..1ec8a95
--- /dev/null
+++ b/res/drawable-finger/ic_btn_round_plus.png
Binary files differ
diff --git a/res/layout-finger/edit_contact.xml b/res/layout-finger/edit_contact.xml
index a33d447..a3a1849 100644
--- a/res/layout-finger/edit_contact.xml
+++ b/res/layout-finger/edit_contact.xml
@@ -18,7 +18,6 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
- android:scrollbarStyle="insideInset"
android:fillViewport="true">
<LinearLayout
@@ -37,22 +36,21 @@
>
<FrameLayout
- android:layout_width="84dip"
- android:layout_height="84dip"
+ android:layout_width="76dip"
+ android:layout_height="76dip"
android:layout_marginTop="4dip"
- android:layout_marginLeft="3dip"
- android:layout_marginBottom="3dip"
+ android:layout_marginLeft="6dip"
+ android:layout_marginBottom="6dip"
android:layout_marginRight="2dip"
>
<ImageView android:id="@+id/photoImage"
- style="?android:attr/imageWellStyle"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_menu_add_picture"
android:scaleType="center"
- android:background="@drawable/border"
+ android:background="@drawable/btn_contact_picture"
/>
</FrameLayout>
@@ -60,7 +58,7 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:layout_marginRight="4dip"
+ android:layout_marginRight="?android:attr/scrollbarSize"
android:gravity="center_vertical"
android:inputType="textPersonName|textCapWords"
android:hint="@string/ghostData_name"
@@ -76,18 +74,12 @@
<!-- "Phonetic name" entry widget, visible only in certain locales -->
<include layout="@layout/edit_phonetic_name"/>
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
-
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="vertical"
- >
+ >
<!-- The edit items -->
<LinearLayout android:id="@+id/list"
@@ -96,104 +88,25 @@
android:orientation="vertical"
/>
- <!-- Send to voicemail checkbox -->
- <RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="6dip"
- >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:text="@string/send_to_voicemail_checkbox"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
-
- <CheckBox android:id="@+id/send_to_voicemail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentRight="true"
- />
-
- </RelativeLayout>
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:background="@android:drawable/dark_header"
- android:textColor="?android:attr/textColorSecondary"
- android:textStyle="bold"
- android:textSize="14sp"
- android:text="@string/listSeparatorMore_edit"
- android:paddingLeft="8dip"
- />
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:baselineAligned="false"
- >
-
- <!-- The add more button -->
- <Button android:id="@+id/addMore"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/add_more_items"
- android:gravity="left|center_vertical"
- android:background="@android:drawable/btn_dropdown"
- />
-
- </LinearLayout>
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="32dip"
- />
-
</LinearLayout>
<LinearLayout
- android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingTop="5dip"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
- android:paddingBottom="1dip"
- android:background="@android:drawable/bottom_bar"
+ android:orientation="horizontal"
+ style="@android:style/ButtonBar"
>
<Button android:id="@+id/saveButton"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/menu_done"
/>
<Button android:id="@+id/discardButton"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/menu_doNotSave"
/>
diff --git a/res/layout-finger/edit_contact_entry.xml b/res/layout-finger/edit_contact_entry.xml
index 8512dd4..d17fdf7 100644
--- a/res/layout-finger/edit_contact_entry.xml
+++ b/res/layout-finger/edit_contact_entry.xml
@@ -17,40 +17,35 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
->
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
+ android:layout_marginLeft="4dip"
+ android:layout_marginBottom="3dip"
+ android:orientation="horizontal"
+ android:baselineAligned="false"
+ android:gravity="top"
+ android:paddingRight="?android:attr/scrollbarSize"
>
- <Button android:id="@+id/label"
- android:layout_width="100dip"
- android:layout_height="wrap_content"
- android:gravity="left|center_vertical"
+ <Button android:id="@+id/label"
+ android:layout_width="80dip"
+ android:layout_height="wrap_content"
+ android:gravity="left|center_vertical"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
/>
- <EditText android:id="@+id/data"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_marginLeft="4dip"
+ <EditText android:id="@+id/data"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="2dip"
+ android:layout_marginRight="2dip"
/>
- <ImageButton android:id="@+id/delete"
- android:src="@android:drawable/ic_delete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <ImageButton android:id="@+id/delete"
+ style="@style/MinusButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
/>
- </LinearLayout>
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
</LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_org.xml b/res/layout-finger/edit_contact_entry_org.xml
index a2f5863..9daf3d1 100644
--- a/res/layout-finger/edit_contact_entry_org.xml
+++ b/res/layout-finger/edit_contact_entry_org.xml
@@ -17,76 +17,45 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
->
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:baselineAligned="false"
+ android:gravity="top"
+ android:paddingRight="?android:attr/scrollbarSize"
>
- <Button android:id="@+id/label"
- android:layout_width="100dip"
- android:layout_height="wrap_content"
- android:gravity="left|center_vertical"
+ <Button android:id="@+id/label"
+ android:layout_width="100dip"
+ android:layout_height="wrap_content"
+ android:gravity="left|center_vertical"
/>
- <LinearLayout
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:baselineAligned="false"
+ android:gravity="center_vertical"
+ >
+
+ <EditText android:id="@+id/data"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- >
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- >
+ android:layout_marginLeft="4dip"
+ />
- <EditText android:id="@+id/data"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_marginLeft="4dip"
- />
+ <EditText android:id="@+id/data2"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dip"
+ />
- <ImageButton android:id="@+id/delete"
- android:src="@android:drawable/ic_delete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- >
-
- <EditText android:id="@+id/data2"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_marginLeft="4dip"
- />
-
- <ImageButton android:id="@+id/delete2"
- android:src="@android:drawable/ic_delete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- </LinearLayout>
</LinearLayout>
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
+ <ImageButton android:id="@+id/delete"
+ style="@style/MinusButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
</LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_ringtone.xml b/res/layout-finger/edit_contact_entry_ringtone.xml
index b1665d7..f2a171f 100644
--- a/res/layout-finger/edit_contact_entry_ringtone.xml
+++ b/res/layout-finger/edit_contact_entry_ringtone.xml
@@ -15,44 +15,54 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/entry_ringtone"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="3dip"
- android:orientation="vertical"
->
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
+ android:paddingRight="?android:attr/scrollbarSize"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:background="@android:drawable/list_selector_background"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:focusable="true"
+ android:clickable="true"
>
- <!-- We still provide a label for our parent, but we keep it hidden -->
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="14dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip"
+ android:layout_weight="1"
+ android:duplicateParentState="true"
+ >
+
<TextView android:id="@+id/label"
- android:layout_width="0dip"
- android:layout_height="0dip"
- android:visibility="gone"
- />
-
- <Button android:id="@+id/data"
- android:layout_width="fill_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMediumInverse"
- android:baselineAligned="false"
- android:background="@android:drawable/btn_dropdown"
- android:gravity="left|center_vertical"
- android:maxLines="1"
- android:layout_marginTop="6dip"
- android:layout_marginBottom="6dip"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:duplicateParentState="true"
+ />
+
+ <TextView android:id="@+id/data"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/label"
+ android:layout_alignLeft="@+id/label"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:maxLines="2"
+ android:duplicateParentState="true"
+ />
+
+ </RelativeLayout>
+
+ <ImageView
+ style="@style/MoreButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
/>
- </LinearLayout>
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
</LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_static_label.xml b/res/layout-finger/edit_contact_entry_static_label.xml
index 12c8148..5e40631 100644
--- a/res/layout-finger/edit_contact_entry_static_label.xml
+++ b/res/layout-finger/edit_contact_entry_static_label.xml
@@ -17,43 +17,38 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
->
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
+ android:layout_marginLeft="4dip"
+ android:layout_marginBottom="3dip"
+ android:orientation="horizontal"
+ android:baselineAligned="false"
+ android:gravity="top"
+ android:paddingRight="?android:attr/scrollbarSize"
>
- <TextView android:id="@+id/label"
- android:layout_width="102dip"
- android:layout_height="fill_parent"
- android:paddingLeft="4dip"
- android:gravity="left|center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ <!-- Hide this TextView because this layout is only used for Note entries -->
+ <TextView android:id="@+id/label"
+ android:layout_width="80dip"
+ android:layout_height="wrap_content"
+ android:gravity="left|center_vertical"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:visibility="gone"
/>
- <EditText android:id="@+id/data"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dip"
+ <EditText android:id="@+id/data"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="2dip"
+ android:layout_marginRight="2dip"
+ android:gravity="top"
/>
- <ImageButton android:id="@+id/delete"
- android:src="@android:drawable/ic_delete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <ImageButton android:id="@+id/delete"
+ style="@style/MinusButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
/>
- </LinearLayout>
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
</LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_voicemail.xml b/res/layout-finger/edit_contact_entry_voicemail.xml
new file mode 100644
index 0000000..7b66500
--- /dev/null
+++ b/res/layout-finger/edit_contact_entry_voicemail.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/checkable"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="?android:attr/scrollbarSize"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:background="@android:drawable/list_selector_background"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:focusable="true"
+ android:clickable="true"
+ >
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="14dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip"
+ android:layout_weight="1"
+ android:duplicateParentState="true"
+ >
+
+ <TextView android:id="@+id/label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:duplicateParentState="true"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/label"
+ android:layout_alignLeft="@+id/label"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="@string/send_to_voicemail_checkbox"
+ android:maxLines="2"
+ android:duplicateParentState="true"
+ />
+
+ </RelativeLayout>
+
+ <CheckBox android:id="@+id/checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:focusable="false"
+ android:clickable="false"
+ />
+
+ <!-- Need to provide a data view to make binder happy -->
+ <TextView android:id="@+id/data"
+ android:layout_width="0dip"
+ android:layout_height="0dip"
+ android:visibility="gone"
+ />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-finger/edit_divider.xml b/res/layout-finger/edit_divider.xml
new file mode 100644
index 0000000..1dbb563
--- /dev/null
+++ b/res/layout-finger/edit_divider.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/listDivider"
+ />
diff --git a/res/layout-finger/edit_separator.xml b/res/layout-finger/edit_separator.xml
index 82fc12e..f638ade 100644
--- a/res/layout-finger/edit_separator.xml
+++ b/res/layout-finger/edit_separator.xml
@@ -19,25 +19,39 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="3dip"
android:orientation="vertical"
->
+ >
- <TextView android:id="@+id/text"
+ <LinearLayout
+ android:id="@+id/separator"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:background="@android:drawable/dark_header"
- android:textColor="?android:attr/textColorSecondary"
- android:textStyle="bold"
- android:textSize="14sp"
- android:paddingLeft="8dip"
- />
+ android:layout_marginLeft="14dip"
+ android:layout_marginTop="3dip"
+ android:layout_marginBottom="1dip"
+ android:layout_marginRight="?android:attr/scrollbarSize"
+ android:orientation="horizontal"
+ android:gravity="bottom"
+ android:focusable="true"
+ android:clickable="true"
+ >
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- />
+ <TextView android:id="@+id/text"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginBottom="8dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ />
+
+ <ImageView android:id="@+id/add"
+ style="@style/PlusButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:duplicateParentState="true"
+ />
+
+ </LinearLayout>
</LinearLayout>
-
diff --git a/res/layout-finger/edit_separator_alone.xml b/res/layout-finger/edit_separator_alone.xml
new file mode 100644
index 0000000..c42af1c
--- /dev/null
+++ b/res/layout-finger/edit_separator_alone.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<!-- Layout used for edit separators. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/separator"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="14dip"
+ android:paddingRight="?android:attr/scrollbarSize"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:background="@android:drawable/list_selector_background"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:focusable="true"
+ android:clickable="true"
+ >
+
+ <TextView android:id="@+id/text"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:duplicateParentState="true"
+ />
+
+ <ImageView android:id="@+id/add"
+ style="@style/PlusButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ />
+
+</LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b87ef27..e3eef4e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"Odeslat e-mail"</string>
<string name="listSeparatorSendEmail_edit">"E-mailové adresy"</string>
<string name="listSeparatorSendIm">"Odeslat zprávu chatu"</string>
- <string name="listSeparatorSendIm_edit">"Rychlé zasílání zpráv"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Adresa na mapě"</string>
- <string name="listSeparatorMapAddress_edit">"Adresa na mapě"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organizace"</string>
<string name="listSeparatorOtherInformation">"Ostatní informace"</string>
<string name="listSeparatorOtherInformation_edit">"Další možnosti"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Akce"</string>
<string name="ringtone_spinner">"Vyzváněcí tón: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Přidat další položky"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 489d43f..d1fcdc8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"E-Mail senden"</string>
<string name="listSeparatorSendEmail_edit">"E-Mail-Adressen"</string>
<string name="listSeparatorSendIm">"Per Chat kontaktieren"</string>
- <string name="listSeparatorSendIm_edit">"Instant Messenger"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Adresse in Maps"</string>
- <string name="listSeparatorMapAddress_edit">"Adresse auf der Karte"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organisationen"</string>
<string name="listSeparatorOtherInformation">"Mehr Informationen"</string>
<string name="listSeparatorOtherInformation_edit">"Sonstige Optionen"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Aktionen"</string>
<string name="ringtone_spinner">"Klingelton: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Weitere Elemente hinzufügen"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644
index 67bf0cf..0000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="contactsList">"Contacts"</string>
- <string name="shortcutContact">"Contact"</string>
- <string name="starredList">"Starred"</string>
- <string name="frequentList">"Frequent"</string>
- <string name="strequentList">"Favourites"</string>
- <string name="viewContactTitle">"Contact details"</string>
- <string name="viewContactDesription">"View contact"</string>
- <string name="editContactDescription">"Edit contact"</string>
- <string name="insertContactDescription">"Create contact"</string>
- <string name="searchHint">"Search contacts"</string>
- <string name="menu_newContact">"New contact"</string>
- <string name="menu_viewContact">"View contact"</string>
- <!-- unknown placeholder CONTACT in menu_callNumber -->
- <skip />
- <string name="menu_addStar">"Add to favourites"</string>
- <string name="menu_removeStar">"Remove from favourites"</string>
- <!-- no translation found for menu_showBarcode (4627916987700748636) -->
- <skip />
- <string name="menu_editContact">"Edit contact"</string>
- <string name="menu_deleteContact">"Delete contact"</string>
- <string name="menu_call">"Call"</string>
- <string name="menu_sendSMS">"Send SMS/MMS"</string>
- <string name="menu_sendEmail">"Send email"</string>
- <string name="menu_viewAddress">"Map address"</string>
- <string name="menu_makeDefaultNumber">"Make default number"</string>
- <string name="deleteConfirmation_title">"Delete"</string>
- <string name="deleteConfirmation">"This contact will be deleted."</string>
- <string name="menu_done">"Save"</string>
- <string name="menu_doNotSave">"Discard changes"</string>
- <string name="editContact_title_edit">"Edit contact"</string>
- <string name="editContact_title_insert">"New contact"</string>
- <string name="menu_addItem">"More info"</string>
- <string name="label_notes">"Notes"</string>
- <string name="label_ringtone">"Ringtone"</string>
- <string name="ghostData_name">"First and Last"</string>
- <string name="ghostData_company">"Company"</string>
- <string name="ghostData_title">"Position"</string>
- <string name="ghostData_im">"IM name"</string>
- <string name="ghostData_notes">"My note"</string>
- <string name="ghostData_phone">"Phone number"</string>
- <string name="ghostData_email">"Email address"</string>
- <string name="ghostData_postal">"Postal address"</string>
- <string name="invalidContactMessage">"The contact does not exist."</string>
- <string name="pickerNewContactHeader">"Create new contact"</string>
- <string name="selectLabel">"Select label"</string>
- <string name="phoneLabelsGroup">"Phone"</string>
- <string name="emailLabelsGroup">"Email"</string>
- <string name="imLabelsGroup">"IM"</string>
- <string name="postalLabelsGroup">"Postal address"</string>
- <string name="otherLabelsGroup">"Other"</string>
- <!-- no translation found for otherLabels:0 (3318569574569948132) -->
- <!-- no translation found for otherLabels:1 (3325413568383685728) -->
- <string name="errorDialogTitle">"No pictures"</string>
- <string name="photoPickerNotFoundText">"No pictures are available on the phone."</string>
- <string name="attachToContact">"Contact icon"</string>
- <string name="customLabelPickerTitle">"Custom label"</string>
- <string name="menu_displayGroup">"Display group"</string>
- <string name="syncGroupPreference">"Sync groups"</string>
- <string name="importFromSim">"Import from SIM card"</string>
- <string name="send_to_voicemail_checkbox">"Send calls directly to voicemail."</string>
- <string name="send_to_voicemail_view">"Calls are sent directly to voicemail."</string>
- <string name="default_ringtone">"Default"</string>
- <string name="addPicture">"Add icon"</string>
- <string name="removePicture">"Remove icon"</string>
- <string name="noContacts">"No contacts."</string>
- <string name="noContactsWithPhoneNumbers">"No contacts with phone numbers."</string>
- <string name="noFavorites">"No favourites."</string>
- <string name="select_group_title">"Select group to display"</string>
- <string name="groupEmpty">"Your \"<xliff:g id="GROUPNAME">%s</xliff:g>\" group is empty."</string>
- <string name="showAllGroups">"All contacts"</string>
- <string name="syncAllGroups">"Sync all contacts"</string>
- <string name="groupNameMyContacts">"My Contacts"</string>
- <string name="groupNameWithPhones">"Contacts with phone numbers"</string>
- <string name="contactCreatedToast">"Contact created."</string>
- <string name="contactSavedToast">"Contact saved."</string>
- <string name="listSeparatorCallNumber">"Dial number"</string>
- <string name="listSeparatorSendSmsMms">"Send SMS/MMS"</string>
- <string name="listSeparatorSendEmail">"Send email"</string>
- <string name="listSeparatorSendIm">"Send instant message"</string>
- <string name="listSeparatorMapAddress">"Map address"</string>
- <string name="listSeparatorOrganizations">"Organisations"</string>
- <string name="listSeparatorOtherInformation">"Other information"</string>
- <string name="contactsIconLabel">"Contacts"</string>
- <string name="contactsFavoritesLabel">"Favourites"</string>
- <string name="dialerIconLabel">"Dialer"</string>
- <string name="recentCallsIconLabel">"Call log"</string>
- <!-- no translation found for liveFolderAll (5991510762804226223) -->
- <skip />
- <!-- no translation found for liveFolderFavorites (8755759874416875970) -->
- <skip />
- <!-- no translation found for liveFolderPhone (3440101264360244544) -->
- <skip />
- <string name="menu_sendTextMessage">"Send SMS message"</string>
- <!-- unknown placeholder WHO in recentCalls_callNumber -->
- <skip />
- <string name="recentCalls_editNumberBeforeCall">"Edit number before call"</string>
- <string name="recentCalls_addToContact">"Add to contacts"</string>
- <string name="recentCalls_removeFromRecentList">"Remove from call log"</string>
- <string name="recentCalls_deleteAll">"Clear call log"</string>
- <string name="recentCalls_empty">"Call log is empty."</string>
- <string name="imei">"IMEI"</string>
- <string name="voicemail">"Voicemail"</string>
- <string name="unknown">"Unknown"</string>
- <string name="private_num">"Private number"</string>
- <string name="dialerKeyboardHintText">"Use keyboard to dial"</string>
- <string name="simContacts_emptyLoading">"Loading from SIM card…"</string>
- <string name="simContacts_title">"SIM card contacts"</string>
- <!-- no translation found for contactsSyncPlug (1549212649158409469) -->
- <skip />
- <!-- no translation found for noContactsHelpText (6155730972704522463) -->
- <skip />
- <!-- no translation found for seclectSyncGroups_title (7675331949118054911) -->
- <skip />
- <!-- no translation found for liveFolder_all_label (3716551598022430019) -->
- <skip />
- <!-- no translation found for liveFolder_favorites_label (9053985659909059395) -->
- <skip />
- <!-- no translation found for liveFolder_phones_label (8943901400107401868) -->
- <skip />
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0f750b9..b7a9914 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"Enviar mensaje de correo electrónico"</string>
<string name="listSeparatorSendEmail_edit">"Direcciones de correo electrónico"</string>
<string name="listSeparatorSendIm">"Enviar mensaje instantáneo"</string>
- <string name="listSeparatorSendIm_edit">"Mensajería instantánea"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Dirección en mapa"</string>
- <string name="listSeparatorMapAddress_edit">"Asignar dirección"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organizaciones"</string>
<string name="listSeparatorOtherInformation">"Otra información"</string>
<string name="listSeparatorOtherInformation_edit">"Otras opciones"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Acciones"</string>
<string name="ringtone_spinner">"Tono de llamada: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Añadir más elementos"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9d921c0..c65567e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"Envoyer un e-mail"</string>
<string name="listSeparatorSendEmail_edit">"Adresses e-mail"</string>
<string name="listSeparatorSendIm">"Envoyer un message instantané"</string>
- <string name="listSeparatorSendIm_edit">"Instant Messenger"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Adresse sur un plan"</string>
- <string name="listSeparatorMapAddress_edit">"Adresse postale"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organisations"</string>
<string name="listSeparatorOtherInformation">"Autres informations"</string>
<string name="listSeparatorOtherInformation_edit">"Autres options"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Actions"</string>
<string name="ringtone_spinner">"Sonnerie : <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Ajouter d\'autres éléments"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0b00fac..22d50aa 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"Invia email"</string>
<string name="listSeparatorSendEmail_edit">"Indirizzi email"</string>
<string name="listSeparatorSendIm">"Invia msg IM"</string>
- <string name="listSeparatorSendIm_edit">"Messaggistica istantanea"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Indirizzo su mappa"</string>
- <string name="listSeparatorMapAddress_edit">"Visualizza indirizzo nella mappa"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organizzazioni"</string>
<string name="listSeparatorOtherInformation">"Altre informazioni"</string>
<string name="listSeparatorOtherInformation_edit">"Altre opzioni"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Azioni"</string>
<string name="ringtone_spinner">"Suoneria: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Aggiungi ulteriori elementi"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6c09fb5..9586e29 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"メールを送信"</string>
<string name="listSeparatorSendEmail_edit">"メールアドレス"</string>
<string name="listSeparatorSendIm">"インスタントメッセージを送信"</string>
- <string name="listSeparatorSendIm_edit">"インスタントメッセンジャー"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"地図でみる"</string>
- <string name="listSeparatorMapAddress_edit">"マップアドレス"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"勤務先情報"</string>
<string name="listSeparatorOtherInformation">"その他の情報"</string>
<string name="listSeparatorOtherInformation_edit">"その他のオプション"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"操作"</string>
<string name="ringtone_spinner">"着信音: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"その他の項目を追加"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d7ebcb6..5868fc6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"이메일 보내기"</string>
<string name="listSeparatorSendEmail_edit">"이메일 주소"</string>
<string name="listSeparatorSendIm">"인스턴트 메시지 보내기"</string>
- <string name="listSeparatorSendIm_edit">"인스턴트 메신저"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"지도상의 주소"</string>
- <string name="listSeparatorMapAddress_edit">"지도 주소"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"조직"</string>
<string name="listSeparatorOtherInformation">"기타 정보"</string>
<string name="listSeparatorOtherInformation_edit">"기타 옵션"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"작업"</string>
<string name="ringtone_spinner">"벨소리: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"항목 더 추가"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a5ee768..bed3c27 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -85,7 +85,7 @@
<string name="noContactsWithPhoneNumbers">"Ingen kontakter med telefonnummer."</string>
<string name="noFavorites">"Ingen favoritter."</string>
<string name="select_group_title">"Grupper"</string>
- <string name="groupEmpty">"Gruppen \\\"<xliff:g id="GROUPNAME">%s</xliff:g>\\\" er tom."</string>
+ <string name="groupEmpty">"Gruppen \\\\\\\"<xliff:g id="GROUPNAME">%s</xliff:g>\\\\\\\" er tom."</string>
<string name="showAllGroups">"Alle kontakter"</string>
<string name="syncAllGroups">"Synkroniser alle kontakter"</string>
<string name="groupNameMyContacts">"Mine kontakter"</string>
@@ -98,11 +98,9 @@
<string name="listSeparatorSendEmail">"Send e-post"</string>
<string name="listSeparatorSendEmail_edit">"E-postadresser"</string>
<string name="listSeparatorSendIm">"Send lynmelding"</string>
- <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
- <skip />
+ <string name="listSeparatorSendIm_edit">"Prateadresser"</string>
<string name="listSeparatorMapAddress">"Se i kart"</string>
- <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
- <skip />
+ <string name="listSeparatorMapAddress_edit">"Postadresser"</string>
<string name="listSeparatorOrganizations">"Organisasjoner"</string>
<string name="listSeparatorOtherInformation">"Annen informasjon"</string>
<string name="listSeparatorOtherInformation_edit">"Andre alternativer"</string>
@@ -150,22 +148,13 @@
<string name="header_actions">"Handlinger"</string>
<string name="ringtone_spinner">"Ringetone: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Legg til flere elementer"</string>
- <!-- no translation found for actionCall (695145166039381504) -->
- <skip />
- <!-- no translation found for actionEmail (3870371552333656807) -->
- <skip />
- <!-- no translation found for actionText (6399049224844880108) -->
- <skip />
- <!-- no translation found for actionChat (31079429748650300) -->
- <skip />
- <!-- no translation found for actionMap (1977955782051732775) -->
- <skip />
- <!-- no translation found for actionIncomingCall (6028930669817038600) -->
- <skip />
- <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
- <skip />
- <!-- no translation found for detailsRingtone (4052108748982701775) -->
- <skip />
- <!-- no translation found for callBack (5498224409038809224) -->
- <skip />
+ <string name="actionCall">"Ring <xliff:g id="TYPE">%s</xliff:g>"</string>
+ <string name="actionEmail">"Send e-post til <xliff:g id="TYPE">%s</xliff:g>"</string>
+ <string name="actionText">"Send SMS til <xliff:g id="TYPE">%s</xliff:g>"</string>
+ <string name="actionChat">"Prat over <xliff:g id="TYPE">%s</xliff:g>"</string>
+ <string name="actionMap">"Vis <xliff:g id="TYPE">%s</xliff:g>adresse"</string>
+ <string name="actionIncomingCall">"Innkommende samtaler"</string>
+ <string name="detailIncomingCallsGoToVoicemail">"Vil bli sendt rett til telefonsvarer"</string>
+ <string name="detailsRingtone">"Sett til <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
+ <string name="callBack">"Ring tilbake"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b7f137b..110e6c8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"E-mail verzenden"</string>
<string name="listSeparatorSendEmail_edit">"E-mailadressen"</string>
<string name="listSeparatorSendIm">"Chatbericht verzenden"</string>
- <string name="listSeparatorSendIm_edit">"Instant messenger"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Adres op kaart weergeven"</string>
- <string name="listSeparatorMapAddress_edit">"Adres op kaart"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organisaties"</string>
<string name="listSeparatorOtherInformation">"Overige informatie"</string>
<string name="listSeparatorOtherInformation_edit">"Andere opties"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Acties"</string>
<string name="ringtone_spinner">"Beltoon: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Meer items toevoegen"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ca5790d..01cc51a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"Wyślij wiadomość e-mail"</string>
<string name="listSeparatorSendEmail_edit">"Adresy e-mail"</string>
<string name="listSeparatorSendIm">"Wyślij wiadomość błyskawiczną"</string>
- <string name="listSeparatorSendIm_edit">"Komunikator internetowy"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Pokaż adres na mapie"</string>
- <string name="listSeparatorMapAddress_edit">"Adres na mapie"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Organizacje"</string>
<string name="listSeparatorOtherInformation">"Inne informacje"</string>
<string name="listSeparatorOtherInformation_edit">"Inne opcje"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Czynności"</string>
<string name="ringtone_spinner">"Dźwięk dzwonka: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Dodaj więcej elementów"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c1f3310..8b847b0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"Отправить сообщение электронной почты"</string>
<string name="listSeparatorSendEmail_edit">"Адреса электронной почты"</string>
<string name="listSeparatorSendIm">"Отправить мгновенное сообщение"</string>
- <string name="listSeparatorSendIm_edit">"Instant messenger"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"Адрес на карте"</string>
- <string name="listSeparatorMapAddress_edit">"Адрес на карте"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"Организации"</string>
<string name="listSeparatorOtherInformation">"Другие сведения"</string>
<string name="listSeparatorOtherInformation_edit">"Другие параметры"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"Действия"</string>
<string name="ringtone_spinner">"Мелодия: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"Добавление контактов"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 368e074..c2e033e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"发送电子邮件"</string>
<string name="listSeparatorSendEmail_edit">"电子邮件地址"</string>
<string name="listSeparatorSendIm">"发送即时消息"</string>
- <string name="listSeparatorSendIm_edit">"即时通讯软件"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"地图地址"</string>
- <string name="listSeparatorMapAddress_edit">"地图地址"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"组织"</string>
<string name="listSeparatorOtherInformation">"其他信息"</string>
<string name="listSeparatorOtherInformation_edit">"其他选项"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"操作"</string>
<string name="ringtone_spinner">"铃声：<xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"添加更多项目"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b011f19..d56c253 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -98,9 +98,11 @@
<string name="listSeparatorSendEmail">"傳送電子郵件"</string>
<string name="listSeparatorSendEmail_edit">"電子郵件地址"</string>
<string name="listSeparatorSendIm">"傳送即時訊息"</string>
- <string name="listSeparatorSendIm_edit">"即時通訊程式"</string>
+ <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+ <skip />
<string name="listSeparatorMapAddress">"在地圖上顯示地址"</string>
- <string name="listSeparatorMapAddress_edit">"以地圖顯示地址"</string>
+ <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+ <skip />
<string name="listSeparatorOrganizations">"組織"</string>
<string name="listSeparatorOtherInformation">"其他資訊"</string>
<string name="listSeparatorOtherInformation_edit">"其他選項"</string>
@@ -148,4 +150,22 @@
<string name="header_actions">"動作"</string>
<string name="ringtone_spinner">"鈴聲：<xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
<string name="add_more_items">"新增更多項目"</string>
+ <!-- no translation found for actionCall (695145166039381504) -->
+ <skip />
+ <!-- no translation found for actionEmail (3870371552333656807) -->
+ <skip />
+ <!-- no translation found for actionText (6399049224844880108) -->
+ <skip />
+ <!-- no translation found for actionChat (31079429748650300) -->
+ <skip />
+ <!-- no translation found for actionMap (1977955782051732775) -->
+ <skip />
+ <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+ <skip />
+ <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+ <skip />
+ <!-- no translation found for detailsRingtone (4052108748982701775) -->
+ <skip />
+ <!-- no translation found for callBack (5498224409038809224) -->
+ <skip />
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bd09510..0edfcab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,7 +101,7 @@
<string name="menu_done">Done</string>
<!-- Menu item to indicate you want to stop editing a contact and NOT save the changes you've made -->
- <string name="menu_doNotSave">Discard changes</string>
+ <string name="menu_doNotSave">Revert</string>
<!-- The title of the activity that edits and existing contact -->
<string name="editContact_title_edit">Edit contact</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..e43842c
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<resources>
+
+ <style name="MinusButton">
+ <item name="android:background">@drawable/btn_circle</item>
+ <item name="android:src">@drawable/ic_btn_round_minus</item>
+ </style>
+
+ <style name="PlusButton">
+ <item name="android:background">@drawable/btn_circle</item>
+ <item name="android:src">@drawable/ic_btn_round_plus</item>
+ </style>
+
+ <style name="MoreButton">
+ <item name="android:background">@drawable/btn_circle</item>
+ <item name="android:src">@drawable/ic_btn_round_more</item>
+ </style>
+
+</resources>
