diff options
Diffstat (limited to 'res')
20 files changed, 116 insertions, 237 deletions
diff --git a/res/drawable-hdpi/ic_call_incoming_holo_dark.png b/res/drawable-hdpi/ic_call_incoming_holo_dark.png Binary files differnew file mode 100644 index 000000000..8351f4805 --- /dev/null +++ b/res/drawable-hdpi/ic_call_incoming_holo_dark.png diff --git a/res/drawable-hdpi/ic_call_log_list_incoming_call.png b/res/drawable-hdpi/ic_call_log_list_incoming_call.png Binary files differdeleted file mode 100755 index 15b5e4436..000000000 --- a/res/drawable-hdpi/ic_call_log_list_incoming_call.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_call_log_list_missed_call.png b/res/drawable-hdpi/ic_call_log_list_missed_call.png Binary files differdeleted file mode 100755 index 8dcb2796c..000000000 --- a/res/drawable-hdpi/ic_call_log_list_missed_call.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_call_log_list_outgoing_call.png b/res/drawable-hdpi/ic_call_log_list_outgoing_call.png Binary files differdeleted file mode 100755 index 160c70736..000000000 --- a/res/drawable-hdpi/ic_call_log_list_outgoing_call.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_call_missed_holo_dark.png b/res/drawable-hdpi/ic_call_missed_holo_dark.png Binary files differnew file mode 100644 index 000000000..7c17c3010 --- /dev/null +++ b/res/drawable-hdpi/ic_call_missed_holo_dark.png diff --git a/res/drawable-hdpi/ic_call_outgoing_holo_dark.png b/res/drawable-hdpi/ic_call_outgoing_holo_dark.png Binary files differnew file mode 100644 index 000000000..3b9e0f8a9 --- /dev/null +++ b/res/drawable-hdpi/ic_call_outgoing_holo_dark.png diff --git a/res/drawable-mdpi/ic_call_incoming_holo_dark.png b/res/drawable-mdpi/ic_call_incoming_holo_dark.png Binary files differnew file mode 100644 index 000000000..8dcb350bc --- /dev/null +++ b/res/drawable-mdpi/ic_call_incoming_holo_dark.png diff --git a/res/drawable-mdpi/ic_call_missed_holo_dark.png b/res/drawable-mdpi/ic_call_missed_holo_dark.png Binary files differnew file mode 100644 index 000000000..af030cf13 --- /dev/null +++ b/res/drawable-mdpi/ic_call_missed_holo_dark.png diff --git a/res/drawable-mdpi/ic_call_outgoing_holo_dark.png b/res/drawable-mdpi/ic_call_outgoing_holo_dark.png Binary files differnew file mode 100644 index 000000000..38a01b7a6 --- /dev/null +++ b/res/drawable-mdpi/ic_call_outgoing_holo_dark.png diff --git a/res/drawable-xhdpi/ic_call_incoming_holo_dark.png b/res/drawable-xhdpi/ic_call_incoming_holo_dark.png Binary files differnew file mode 100644 index 000000000..8eb5f3d8b --- /dev/null +++ b/res/drawable-xhdpi/ic_call_incoming_holo_dark.png diff --git a/res/drawable-xhdpi/ic_call_missed_holo_dark.png b/res/drawable-xhdpi/ic_call_missed_holo_dark.png Binary files differnew file mode 100644 index 000000000..6d09a4e95 --- /dev/null +++ b/res/drawable-xhdpi/ic_call_missed_holo_dark.png diff --git a/res/drawable-xhdpi/ic_call_outgoing_holo_dark.png b/res/drawable-xhdpi/ic_call_outgoing_holo_dark.png Binary files differnew file mode 100644 index 000000000..636050403 --- /dev/null +++ b/res/drawable-xhdpi/ic_call_outgoing_holo_dark.png diff --git a/res/drawable-xxhdpi/ic_call_incoming_holo_dark.png b/res/drawable-xxhdpi/ic_call_incoming_holo_dark.png Binary files differnew file mode 100644 index 000000000..12769173b --- /dev/null +++ b/res/drawable-xxhdpi/ic_call_incoming_holo_dark.png diff --git a/res/drawable-xxhdpi/ic_call_missed_holo_dark.png b/res/drawable-xxhdpi/ic_call_missed_holo_dark.png Binary files differnew file mode 100644 index 000000000..8919fd3c9 --- /dev/null +++ b/res/drawable-xxhdpi/ic_call_missed_holo_dark.png diff --git a/res/drawable-xxhdpi/ic_call_outgoing_holo_dark.png b/res/drawable-xxhdpi/ic_call_outgoing_holo_dark.png Binary files differnew file mode 100644 index 000000000..192bbf6a3 --- /dev/null +++ b/res/drawable-xxhdpi/ic_call_outgoing_holo_dark.png diff --git a/res/layout/pick_calls_item.xml b/res/layout/pick_calls_item.xml index bee62cd0e..3adca5670 100644 --- a/res/layout/pick_calls_item.xml +++ b/res/layout/pick_calls_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- * - * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2014, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -28,117 +28,93 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingTop="3dip" - android:paddingBottom="3dip" - > - <LinearLayout - android:layout_width="60dip" - android:layout_weight="0" - android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center_horizontal"> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:minHeight="72dp" + android:descendantFocusability="blocksDescendants"> - <ImageView android:id="@+id/call_type_icon" + <CheckBox + android:id="@+id/pick_contact_check" android:layout_width="wrap_content" - android:layout_weight="1" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" - android:layout_marginStart="4dip"/> - - <TextView android:id="@+id/label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textStyle="bold"/> - </LinearLayout> + android:layout_marginStart="8dip" + android:layout_marginEnd="8dip" + android:layout_gravity="center_vertical" + android:clickable="false" /> <LinearLayout - android:layout_width="wrap_content" - android:layout_weight="1" - android:layout_height="match_parent" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:orientation="horizontal"> + android:layout_gravity="center_vertical" + android:orientation="vertical"> - <TextView android:id="@+id/number" + <TextView + android:id="@+id/name" android:layout_width="wrap_content" - android:layout_weight="1" android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - /> + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:singleLine="true" /> - <TextView android:id="@+id/line1" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceSmall" - android:singleLine="true" - /> + android:orientation="horizontal"> + + <TextView + android:id="@+id/subscription" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="4dip" + android:textAppearance="@android:style/TextAppearance.Material.Caption" + android:textSize="12sp" + android:singleLine="true" + android:ellipsize="marquee" /> + + <TextView + android:id="@+id/label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@android:style/TextAppearance.Material.Caption" + android:singleLine="true" + android:ellipsize="marquee" /> - <TextView android:id="@+id/subscription" - android:layout_width="wrap_content" - android:layout_weight="0" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:singleLine="true" - /> </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="horizontal"> - <TextView android:id="@+id/duration" + <LinearLayout android:layout_width="wrap_content" - android:layout_weight="1" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:singleLine="true" - /> + android:orientation="horizontal"> + + <ImageView + android:id="@+id/call_type_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="4dip" + android:layout_gravity="center_vertical" /> - <TextView android:id="@+id/date" - android:layout_weight="0" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:singleLine="true" - /> + + <TextView + android:id="@+id/call_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="@android:style/TextAppearance.Material.Caption" + android:singleLine="true" /> </LinearLayout> + </LinearLayout> - <View android:id="@+id/divider" - android:layout_weight="0" - android:layout_width="1px" - android:layout_height="match_parent" - android:layout_marginTop="5dip" - android:layout_marginBottom="5dip" - android:layout_marginStart="11dip" - /> + <TextView android:id="@+id/duration" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="4dip" + android:layout_marginEnd="8dip" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:singleLine="true" /> - <CheckBox - android:layout_weight="0" - android:id="@+id/pick_contact_check" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="10dip" - android:layout_centerVertical="true" - android:focusable="false" - android:clickable="false"> - </CheckBox> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/pick_contact.xml b/res/layout/pick_contact.xml deleted file mode 100644 index 2cfb380f3..000000000 --- a/res/layout/pick_contact.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (c) 2015, The Linux Foundation. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of The Linux Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > - <LinearLayout - android:id="@+id/search_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - style="@android:style/ButtonBar"> - - <EditText - android:id="@+id/search_field" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1.0" - android:layout_marginLeft="5dip" - android:layout_marginRight="5dip" - android:singleLine="true" - android:ellipsize="end" - android:inputType="textNoSuggestions" - android:imeOptions="actionDone" - android:hint="@string/search_bar_hint" - android:drawableLeft="@drawable/ic_ab_search" - android:freezesText="true" - /> - <TextView android:id="@+id/select_all_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginRight="5dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:singleLine="true" - android:text="@string/select_all" - /> - <CheckBox - android:id="@+id/select_all_check" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginRight="5dip" - /> - </LinearLayout> - - <ListView android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:fastScrollEnabled="true" - android:id="@android:id/list"> - </ListView> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - style="@android:style/ButtonBar"> - - <Button android:id="@+id/btn_ok" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/btn_ok" - /> - - <Button android:id="@+id/btn_cancel" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/btn_cancel" - /> - </LinearLayout> -</LinearLayout> diff --git a/res/layout/pick_contact_item.xml b/res/layout/pick_contact_item.xml index 2f0fcb693..155e6e352 100644 --- a/res/layout/pick_contact_item.xml +++ b/res/layout/pick_contact_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright (c) 2013-2015, The Linux Foundation. All Rights Reserved. + * Copyright (c) 2014, The Linux Foundation. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -27,49 +27,18 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingTop="3dip" - android:paddingBottom="3dip" - > - <ImageView android:layout_width="@dimen/contact_browser_list_item_photo_size" - android:layout_height="@dimen/contact_browser_list_item_photo_size" - android:layout_marginLeft="10dip" - android:layout_marginRight="5dip" - android:layout_marginTop="5dip" - android:visibility="gone" - android:id="@+id/pick_contact_photo"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/pick_contact_photo" - android:layout_marginLeft="10dip" - android:layout_marginRight="50dip" - android:layout_marginTop="5dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:id="@+id/pick_contact_name"> - </TextView> - <TextView - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_below="@id/pick_contact_name" - android:layout_marginLeft="10dip" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceSmall" - android:id="@+id/pick_contact_number" - android:singleLine="true"> - </TextView> - <CheckBox - android:id="@+id/pick_contact_check" - android:layout_width="wrap_content" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="10dip" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:focusable="false" - android:clickable="false"> - </CheckBox> -</RelativeLayout> + android:orientation="horizontal" + android:minHeight="?android:attr/listPreferredItemHeight" + android:descendantFocusability="blocksDescendants"> + + <com.android.contacts.common.list.ContactListItemView + android:id="@+id/contact" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginEnd="8dip" + android:layout_gravity="center_vertical" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/menu/multi_contact_picker_options.xml b/res/menu/multi_contact_picker_options.xml new file mode 100644 index 000000000..e7fe7148b --- /dev/null +++ b/res/menu/multi_contact_picker_options.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The CyanogenMod 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. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/done" + android:icon="@drawable/ic_done_wht_24dp" + android:title="@string/menu_done" + android:showAsAction="always" /> + <item android:id="@+id/select_all_check" + android:title="@string/select_all" + android:showAsAction="never" + android:checkable="true" /> +</menu> diff --git a/res/values/cm_plurals.xml b/res/values/cm_plurals.xml index c2cdec062..a59d2d2ff 100644 --- a/res/values/cm_plurals.xml +++ b/res/values/cm_plurals.xml @@ -15,10 +15,19 @@ limitations under the License. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <plurals name="contacts_selected"> + <item quantity="one">%d selected</item> + <item quantity="other">%d selected</item> + </plurals> + <plurals name="ContactMultiImportConfirmation"> <item quantity="one">%d contact will be imported.</item> <item quantity="other">%d contacts will be imported.</item> </plurals> + <plurals name="import_progress"> + <item quantity="one">%d contact imported</item> + <item quantity="other">%d contacts imported</item> + </plurals> <plurals name="ContactMultiDeleteConfirmation"> <item quantity="one">%d contact will be deleted.</item> |