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

Commit 5226272d authored by Danny Baumann's avatar Danny Baumann
Browse files

Don't use a different call log for MSIM. 

Change-Id: Ic5a0a4f8521e66d5d78416302a76a4314e3cb0b4
parent 12bbdb5a

res/layout/call_log_fragment.xml

+27 −5
Original line number Diff line number Diff line
@@ -15,19 +15,41 @@ 
-->



<!-- Layout parameters are set programmatically. -->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

<android.support.design.widget.CoordinatorLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:design="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/background_dialer_call_log">

    android:background="@color/background_dialer_call_log"

    design:statusBarBackground="@null">



    <android.support.design.widget.AppBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:outlineProvider="bounds"

        android:elevation="1dp">



        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            design:layout_scrollFlags="scroll|enterAlways">



            <include layout="@layout/call_spinner" />



        </FrameLayout>



    </android.support.design.widget.AppBarLayout>



    <android.support.v7.widget.RecyclerView android:id="@+id/recycler_view"

    <android.support.v7.widget.RecyclerView

        android:id="@+id/recycler_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/background_dialer_call_log"

        android:clipToPadding="false"

        android:paddingStart="@dimen/call_log_horizontal_margin"

        android:paddingEnd="@dimen/call_log_horizontal_margin"

        android:paddingBottom="@dimen/floating_action_button_list_bottom_padding" />

        android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"

        design:layout_behavior="@string/appbar_scrolling_view_behavior" />



    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"
@@ -36,4 +58,4 @@ 
        android:layout_gravity="center"

        android:visibility="gone" />



</FrameLayout>
 
</android.support.design.widget.CoordinatorLayout>

res/layout/msim_call_log_activity.xml

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (c) 2013-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, 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

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (c) 2013-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, 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:background="@color/background_dialer_call_log">



    <include layout="@layout/msim_call_log_spinner" />



    <android.support.v7.widget.RecyclerView android:id="@+id/recycler_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/background_dialer_call_log"

        android:paddingStart="@dimen/call_log_horizontal_margin"

        android:paddingEnd="@dimen/call_log_horizontal_margin" />



    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:visibility="gone" />



</LinearLayout>

res/layout/msim_call_log_spinner.xml

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
<?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, 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.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    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:textSize="@dimen/call_log_spinner_text_size"

        android:textColor="@color/list_all_call"

        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:textSize="@dimen/call_log_spinner_text_size"

        android:textColor="@color/list_all_call"

        android:layout_height="@dimen/list_section_divider_min_height"

        android:layout_weight="2"

        android:layout_marginTop="5dip" />

</LinearLayout>

res/layout/msim_call_log_spinner_item.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (c) 2013-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, 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:paddingTop="5dp"

    android:layout_height="50dip"

    android:paddingLeft="16dip"

    android:paddingRight="12dip"

    android:paddingBottom="8dp" />