Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8591f84 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Dialer: add sub filter for msim call log"

parents 0ec6106a 317c578f

res/layout/call_log_spinner_item.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?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" />

res/layout/msim_call_log_activity.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?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>

res/layout/msim_call_log_fragment.xml

0 → 100644
+90 −0
Original line number Diff line number Diff line 
<?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>

res/values-zh-rCN/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -201,4 +201,7 @@ 
    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回复"</string>

    <string name="call_settings_label" msgid="7416182166943714852">"通话设置"</string>

    <string name="call_settings_description" msgid="2756622428019213052">"语音信箱、来电等待及其他"</string>



    <string name="call_log_show_all_slots">"所有卡"</string>

    <string name="call_log_all_calls_header">"所有通话"</string>

</resources>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -810,4 +810,6 @@ 
    <!-- Label for the call settings section description [CHAR LIMIT=80]-->

    <string name="call_settings_description">Voicemail, call waiting, and others</string>



    <string name="call_log_show_all_slots">All SIMs</string>

    <string name="call_log_all_calls_header">All calls</string>

</resources>