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

Commit 10bd31b0 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Contacts: Add support for Blacklist" into cm-10.1

parents cb9c8674 651685fa

res/menu/call_details_options.xml

+5 −0
Original line number Diff line number Diff line
@@ -31,4 +31,9 @@ 
        android:title="@string/recentCalls_editNumberBeforeCall"

        android:onClick="onMenuEditNumberBeforeCall"

    />

    <item

        android:id="@+id/menu_add_to_blacklist"

        android:title="@string/menu_add_to_blacklist"

        android:onClick="onMenuAddToBlacklist"

    />

</menu>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1894,6 +1894,8 @@ connection to the voicemail server is lost. [CHAR LIMIT=64] --> 
         [CHAR LIMIT=NONE] -->

    <string name="expand_collapse_name_fields_description">Expand or collapse name fields</string>



    <!-- CYANOGENMOD ADDITIONS START -->



    <string name="call_stats_nav_all">All</string>

    <string name="call_stats_nav_incoming">Incoming</string>

    <string name="call_stats_nav_outgoing">Outgoing</string>
@@ -1958,4 +1960,8 @@ connection to the voicemail server is lost. [CHAR LIMIT=64] --> 
        <item quantity="other">%d calls</item>

    </plurals>



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

    <string name="toast_added_to_blacklist">%s added to blacklist.</string>



    <!-- CYANOGENMOD ADDITIONS END -->

</resources>

src/com/android/contacts/CallDetailActivity.java

+14 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    /** If the activity was triggered from a notification. */

    public static final String EXTRA_FROM_NOTIFICATION = "EXTRA_FROM_NOTIFICATION";



    // Blacklist support

    private static final String INSERT_BLACKLIST = "com.android.phone.INSERT_BLACKLIST";

    private static final String BLACKLIST_NUMBER = "number";



    private CallDetailHeader mCallDetailHeader;

    private CallTypeHelper mCallTypeHelper;

    private PhoneNumberHelper mPhoneNumberHelper;
@@ -571,6 +575,16 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
                });

    }



    public void onMenuAddToBlacklist(MenuItem menuItem) {

        Intent intent = new Intent(INSERT_BLACKLIST);

        intent.putExtra(BLACKLIST_NUMBER, mNumber);

        sendBroadcast(intent);



        // Give the user some feedback

        String message = getResources().getString(R.string.toast_added_to_blacklist, mNumber);

        Toast.makeText(CallDetailActivity.this, message, Toast.LENGTH_SHORT).show();

    }



    private void configureActionBar() {

        ActionBar actionBar = getActionBar();

        if (actionBar != null) {