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

Commit 013580b3 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents 24e2e376 ff8ad3a3

res/menu/call_details_options.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ 
    <item

        android:id="@+id/menu_add_to_blacklist"

        android:title="@string/menu_add_to_blacklist"

        android:onClick="onMenuAddToBlacklist"

        android:onClick="onMenuBlacklist"

    />

</menu>

res/menu/call_stats_details_options.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ 
    <item

        android:id="@+id/menu_add_to_blacklist"

        android:title="@string/menu_add_to_blacklist"

        android:onClick="onMenuAddToBlacklist"

        android:onClick="onMenuBlacklist"

    />

</menu>

res/values/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 


    <string name="menu_add_to_blacklist">Add to blacklist</string>

    <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> added to blacklist</string>

    <string name="menu_delete_from_blacklist">Delete from blacklist</string>

    <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> deleted from blacklist</string>



    <!-- Forward lookup -->

    <string name="nearby_places">Nearby places</string>

res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ 
<resources>

    <bool name="call_recording_enabled">false</bool>

    <integer name="call_recording_audio_source">1</integer>

    <integer name="call_recording_audio_encoder">0</integer>

    <bool name="call_durationtype_enabled">false</bool>

</resources>

src/com/android/dialer/CallDetailActivity.java

+26 −3
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage; 
import com.android.dialer.voicemail.VoicemailStatusHelperImpl;

import com.android.services.callrecorder.CallRecordingDataStore;

import com.android.internal.telephony.MSimConstants;

import com.android.internal.telephony.util.BlacklistUtils;



import java.util.List;
@@ -142,6 +143,9 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    private CallRecordingDataStore mCallRecordingDataStore = new CallRecordingDataStore();

    private CallRecordingPlayer mCallRecordingPlayer = new CallRecordingPlayer();



    private MenuItem mBlackListItem;

    private boolean mBlackListed;



    /** Listener to changes in the proximity sensor state. */

    private class ProximitySensorListener implements ProximitySensorManager.Listener {

        /** Used to show a blank view and hide the action bar. */
@@ -589,10 +593,25 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        menu.findItem(R.id.menu_calllog_detail_video_call).setVisible(mCallDetailHeader.hasVideoCallOption());

        menu.findItem(R.id.menu_remove_from_call_log).setVisible(mHasRemoveFromCallLogOption);

        menu.findItem(R.id.menu_edit_number_before_call).setVisible(mHasEditNumberBeforeCallOption);

        menu.findItem(R.id.menu_add_to_blacklist).setVisible(mHasAddToBlacklistOption);

        mBlackListItem = menu.findItem(R.id.menu_add_to_blacklist);

        updateBlacklistItem();

        menu.findItem(R.id.menu_trash).setVisible(mHasTrashOption);

        return super.onPrepareOptionsMenu(menu);

    }



    private void updateBlacklistItem() {

        int isBlacklisted = BlacklistUtils.isListed(this, mNumber, BlacklistUtils.BLOCK_CALLS);

        mBlackListed = isBlacklisted != BlacklistUtils.MATCH_NONE;

        System.out.println("Blacklisted " + mBlackListed);

        mBlackListItem.setVisible(mHasAddToBlacklistOption);



        int blacklistTitleId = R.string.menu_add_to_blacklist;

        if (mBlackListed) {

            blacklistTitleId = R.string.menu_delete_from_blacklist;

        }

        mBlackListItem.setTitle(blacklistTitleId);

    }



    public void onMenuVTCall(MenuItem menuItem) {

        startActivity(CallDetailHeader.getVTCallIntent(mNumber));

    }
@@ -625,9 +644,13 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        startActivity(new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(mNumber)));

    }



    public void onMenuAddToBlacklist(MenuItem menuItem) {

    public void onMenuBlacklist(MenuItem menuItem) {

        if (mBlackListed) {

            mContactInfoHelper.removeNumberFromBlacklist(mNumber);

        } else {

            mContactInfoHelper.addNumberToBlacklist(mNumber);

        }

    }



    public void onMenuTrashVoicemail(MenuItem menuItem) {

        final Uri voicemailUri = getVoicemailUri();