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

Commit 2d7a58ad authored by Devci Telephony's avatar Devci Telephony Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Dialer: Fix FC issue and mismatch string in CalllogActivity" into atel.lnx.2.0-dev

parents d4f577c9 741190c4

src/com/android/dialer/calllog/CallLogActivity.java

+14 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ import com.android.dialer.logging.Logger; 
import com.android.dialer.logging.ScreenEvent;

import com.android.dialer.util.DialerUtils;



public class CallLogActivity extends TransactionSafeActivity implements ViewPager.OnPageChangeListener {

public class CallLogActivity extends TransactionSafeActivity implements ViewPager.OnPageChangeListener,

    CallLogFragment.HostInterface {

    private ViewPager mViewPager;

    private ViewPagerTabs mViewPagerTabs;

    private FragmentPagerAdapter mViewPagerAdapter;
@@ -445,6 +446,18 @@ public class CallLogActivity extends TransactionSafeActivity implements ViewPage 
                        LayoutParams.WRAP_CONTENT));

    }



    /**

     * Implemented to satisfy {@link CallLogFragment.HostInterface}

     */

    @Override

    public void showDialpad() {

        finish();

        if (mInSearchUi) {

           exitSearchUi();

        }

        startActivity(new Intent(CallLogActivity.this, DialtactsActivity.class));

    }



    private void showInputMethod(View view) {

        InputMethodManager imm = (InputMethodManager) getSystemService(

                Context.INPUT_METHOD_SERVICE);

src/com/android/dialer/calllog/CallLogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis 
        mLayoutManager = new LinearLayoutManager(getActivity());

        mRecyclerView.setLayoutManager(mLayoutManager);

        mEmptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);

        //mEmptyListView.setImage(R.drawable.empty_call_log);

        mEmptyListView.setImage(R.drawable.empty_call_log);

        mEmptyListView.setActionClickedListener(this);



        int activityType = mIsCallLogActivity ? CallLogAdapter.ACTIVITY_TYPE_CALL_LOG :

src/com/android/dialer/calllog/MSimCallLogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ public class MSimCallLogFragment extends Fragment implements CallLogQueryHandler 
                messageId = R.string.call_log_voicemail_empty;

                break;

            case CallLogQueryHandler.CALL_TYPE_ALL:

                messageId = R.string.call_log_all_empty_action;

                messageId = R.string.recentCalls_empty;

                break;

            default:

                throw new IllegalArgumentException("Unexpected filter type in CallLogFragment: "