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

Commit 066b90ea authored by linus_lee's avatar linus_lee
Browse files

Merge code and add CallStats in multi sim 

The MultiSim call fragment merged the different fragments under a spinner
and also allowed you to filter call type instead of using different fragments.
I ripped out the old code and adapter the multisim fragment to handle both
multi and single scenarios.  Added the call stats and adapter it to handle both
multi and single scenarios as well.

Change-Id: I41389bbab302ff38bf0dac002c7ac8b10280fac2
parent 46bf6237

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ 
        <activity android:name="com.android.dialer.calllog.CallLogActivity"

            android:label="@string/call_log_activity_title"

            android:theme="@style/DialtactsThemeWithoutActionBarOverlay"

            android:screenOrientation="nosensor"

            android:icon="@mipmap/ic_launcher_phone">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

res/layout/call_spinner.xml

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

<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: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>
 
 No newline at end of file

res/layout/call_stats_filter_spinner.xml

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

-->

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    style="@style/DialtactsActionBarSpinner" />

res/layout/call_stats_fragment.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
    android:showDividers="end"

    android:background="@color/background_dialer_list_items" >



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



    <LinearLayout

        android:id="@+id/call_stats_header"

        android:layout_width="wrap_content"

res/layout/msim_call_log_activity.xml

deleted100644 → 0
+0 −37
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>