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

Commit adb742ca authored by Chiao Cheng's avatar Chiao Cheng
Browse files

Do not use implicit intent to up nav to call log. 

Implemented according to developer docs:
http://developer.android.com/training/implementing-navigation/ancestral.html

Bug: 11116403
Change-Id: I02dd4900fbda921ddeaaa2a1ac8fa780152dc6ec
parent 524bc0b5

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -142,6 +142,7 @@ 
                  android:theme="@style/CallDetailActivityTheme"

                  android:theme="@style/CallDetailActivityTheme"

                  android:screenOrientation="portrait"

                  android:screenOrientation="portrait"

                  android:icon="@mipmap/ic_launcher_phone"

                  android:icon="@mipmap/ic_launcher_phone"

                  android:parentActivityName="com.android.dialer.calllog.CallLogActivity"

            >

            >

            <intent-filter>

            <intent-filter>

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

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

src/com/android/dialer/CallDetailActivity.java

+1 −23
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




package com.android.dialer;

package com.android.dialer;





import android.app.ActionBar;

import android.app.Activity;

import android.app.Activity;

import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.ContentUris;

import android.content.ContentUris;
@@ -281,7 +280,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        mContactPhotoManager = ContactPhotoManager.getInstance(this);

        mContactPhotoManager = ContactPhotoManager.getInstance(this);

        mProximitySensorManager = new ProximitySensorManager(this, mProximitySensorListener);

        mProximitySensorManager = new ProximitySensorManager(this, mProximitySensorListener);

        mContactInfoHelper = new ContactInfoHelper(this, GeoUtil.getCurrentCountryIso(this));

        mContactInfoHelper = new ContactInfoHelper(this, GeoUtil.getCurrentCountryIso(this));

        configureActionBar();

        getActionBar().setDisplayHomeAsUpEnabled(true);

        optionallyHandleVoicemail();

        optionallyHandleVoicemail();

        if (getIntent().getBooleanExtra(EXTRA_FROM_NOTIFICATION, false)) {

        if (getIntent().getBooleanExtra(EXTRA_FROM_NOTIFICATION, false)) {

            closeSystemDialogs();

            closeSystemDialogs();
@@ -796,20 +795,6 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        return super.onPrepareOptionsMenu(menu);

        return super.onPrepareOptionsMenu(menu);

    }

    }





    @Override

    public boolean onMenuItemSelected(int featureId, MenuItem item) {

        switch (item.getItemId()) {

            case android.R.id.home: {

                onHomeSelected();

                return true;

            }



            // All the options menu items are handled by onMenu... methods.

            default:

                throw new IllegalArgumentException();

        }

    }



    public void onMenuRemoveFromCallLog(MenuItem menuItem) {

    public void onMenuRemoveFromCallLog(MenuItem menuItem) {

        final StringBuilder callIds = new StringBuilder();

        final StringBuilder callIds = new StringBuilder();

        for (Uri callUri : getCallLogEntryUris()) {

        for (Uri callUri : getCallLogEntryUris()) {
@@ -854,13 +839,6 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
                });

                });

    }

    }





    private void configureActionBar() {

        ActionBar actionBar = getActionBar();

        if (actionBar != null) {

            actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_HOME);

        }

    }



    /** Invoked when the user presses the home button in the action bar. */

    /** Invoked when the user presses the home button in the action bar. */

    private void onHomeSelected() {

    private void onHomeSelected() {

        Intent intent = new Intent(Intent.ACTION_VIEW, Calls.CONTENT_URI);

        Intent intent = new Intent(Intent.ACTION_VIEW, Calls.CONTENT_URI);