diff options
author | qqzhou <qqzhou@codeaurora.org> | 2014-07-25 17:36:15 +0800 |
---|---|---|
committer | Matt Garnes <matt@cyngn.com> | 2014-11-13 17:47:21 -0800 |
commit | a8346b50a3e4d6dd4e861d50c3769ca07b2d78cf (patch) | |
tree | be68d8bcedc43d2a8977882723ecb087ea09151f /res | |
parent | 0c5c74b44115f99a7fb234ac6f3c42a7a94c658b (diff) | |
download | android_packages_apps_Dialer-a8346b50a3e4d6dd4e861d50c3769ca07b2d78cf.tar.gz android_packages_apps_Dialer-a8346b50a3e4d6dd4e861d50c3769ca07b2d78cf.tar.bz2 android_packages_apps_Dialer-a8346b50a3e4d6dd4e861d50c3769ca07b2d78cf.zip |
Dialer: add sub filter for msim call log
- add spinner to select "ALL SIMS", "SIM1", "SIM2" to filter
subscription in call log.
- add spinner to select "ALL CALLS", "INCOMING CALLS ONLY",
"OUTGOING CALLS ONLY", "MISSED CALLS ONLY" to filter call
type in call log.
Change-Id: I399b7b15c84076917d8399f1c29523de328d7cad
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_log_spinner_item.xml | 34 | ||||
-rw-r--r-- | res/layout/msim_call_log_activity.xml | 37 | ||||
-rw-r--r-- | res/layout/msim_call_log_fragment.xml | 91 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 10 |
6 files changed, 176 insertions, 0 deletions
diff --git a/res/layout/call_log_spinner_item.xml b/res/layout/call_log_spinner_item.xml new file mode 100644 index 000000000..045deb737 --- /dev/null +++ b/res/layout/call_log_spinner_item.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013-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 +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, Inc. 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. +--> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CallLogSpinnerStyle" + android:layout_width="match_parent" + android:layout_height="40dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" /> diff --git a/res/layout/msim_call_log_activity.xml b/res/layout/msim_call_log_activity.xml new file mode 100644 index 000000000..0315bc32c --- /dev/null +++ b/res/layout/msim_call_log_activity.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013-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 +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, Inc. 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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/calllog_frame"> + <android.support.v4.view.ViewPager + android:id="@+id/call_log_pager" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</FrameLayout> diff --git a/res/layout/msim_call_log_fragment.xml b/res/layout/msim_call_log_fragment.xml new file mode 100644 index 000000000..e6d10b135 --- /dev/null +++ b/res/layout/msim_call_log_fragment.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013-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 +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, Inc. 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. +--> +<!-- Layout parameters are set programmatically. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:divider="?android:attr/dividerHorizontal" + android:showDividers="end" + android:background="@color/background_dialer_list_items"> + + <FrameLayout + android:id="@+id/voicemail_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone"> + <include layout="@layout/call_log_voicemail_status" + /> + </FrameLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingLeft="@dimen/call_log_outer_margin" + android:paddingRight="@dimen/call_log_outer_margin"> + <Spinner + android:id="@+id/filter_sub_spinner" + android:layout_width="0dip" + android:layout_height="@dimen/list_section_divider_min_height" + android:layout_weight="1" + android:layout_marginTop="5dip" + /> + <Spinner + android:id="@+id/filter_status_spinner" + android:layout_width="0dip" + android:layout_height="@dimen/list_section_divider_min_height" + android:layout_weight="2" + android:layout_marginTop="5dip" + /> + </LinearLayout> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fadingEdge="none" + android:scrollbarStyle="outsideOverlay" + android:background="@color/background_dialer_list_items" + android:divider="@null" + android:nestedScrollingEnabled="true" + android:clipChildren="false" + /> + + <include + android:id="@+id/empty_list_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + layout="@layout/empty_list_view" + android:visibility="gone"/> + + </FrameLayout> +</LinearLayout> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 253bea14e..3d37c44df 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -216,4 +216,6 @@ <string name="dialog_speed_dial_airplane_mode_message" >"要呼叫快速拨号,请先关闭飞行模式。"</string> <string name="assignSpeedDialFailToast">此号码已分配了快速拨号键,请选择其它号码。</string> + <string name="call_log_show_all_slots">"所有卡"</string> + <string name="call_log_all_calls_header">"所有通话"</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4420487c6..731436b20 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -825,4 +825,6 @@ <string name="dialog_speed_dial_airplane_mode_message" >"To call Speed dial, first turn off Airplane mode."</string> <string name="assignSpeedDialFailToast">The number has already been assigned to a speed dial key, please select another number.</string> + <string name="call_log_show_all_slots">All SIMs</string> + <string name="call_log_all_calls_header">All calls</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index a0ba5c32a..eb55c534d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -177,4 +177,14 @@ <style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog"> <item name="android:colorAccent">@color/dialtacts_theme_color</item> </style> + + <style name="CallLogSpinnerStyle"> + <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">@android:color/black</item> + <item name="android:gravity">center_vertical</item> + <item name="android:ellipsize">marquee</item> + <item name="android:singleLine">true</item> + <item name="android:textAllCaps">true</item> + </style> </resources> |