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

Commit 2c0726d8 authored by Wysie's avatar Wysie
Browse files

2.61: 

- Fixed a bug. [url]http://code.google.com/p/cyanogenmod/issues/detail?id=783[/url]
- Added various clearing logs function when viewing an individual's call log. Press menu or long press on number to see them. Preferences may be implemented in future.
- Layout of individual's call log is changed. Time and date is now the focus instead of number. Also added labels for the number type.
- Cleaned up code quite a lot.
parent 8d71b3b5

res/layout-finger/call_detail.xml

+3 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
            android:scrollbarStyle="outsideOverlay"

        />

        

        <!--

        <ScrollView android:id="@android:id/empty"

                android:layout_width="fill_parent"

                android:layout_height="fill_parent"
@@ -108,6 +109,7 @@ 
                android:lineSpacingMultiplier="0.92"/>



        </ScrollView>

        -->



    </FrameLayout>

res/layout-finger/call_detail_list_item.xml

+20 −5
Original line number Diff line number Diff line
@@ -188,18 +188,33 @@ 
                android:layout_marginBottom="8dip"

                android:layout_marginTop="-8dip"

                android:layout_marginLeft="5dip"

                android:textAppearance="?android:attr/textAppearanceMedium"

            />

            

            <TextView android:id="@+id/label"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="5dip"

                android:layout_alignParentLeft="true"

                android:layout_alignParentTop="true"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:gravity="center_vertical"            

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textStyle="bold"

            /> 

            

            <TextView android:id="@+id/type"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="5dip"

                android:layout_alignParentLeft="true"

                android:layout_alignParentTop="true"

                android:layout_toRightOf="@id/label"

                android:layout_toLeftOf="@id/duration"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:gravity="center_vertical|left"            

                android:layout_alignBaseline="@id/label"

                android:layout_alignWithParentIfMissing="true"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:gravity="center_vertical"            

                android:singleLine="true"

                android:ellipsize="marquee"

            />

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ 
    

    <string name="title_cl_grouping_settings">Group call log settings</string>

    <string name="title_cl_use_exp_grouping">Group unknown numbers (Experimental)</string>

    <string name="summary_cl_use_exp_grouping">Attempts to group unsaved numbers together</string>

    <string name="summary_cl_use_exp_grouping">Attempts to group unsaved numbers together. Affects clearing of logs as well.</string>

    <string name="title_cl_exp_grouping_num">Number of digits to compare</string>

    <string name="summary_cl_exp_grouping_num">Higher number = stricter</string>
@@ -851,7 +851,7 @@ 
    <string name="title_about_name">Mod Name</string>

    <string name="summary_about_name">Wysie Contacts</string>

    <string name="title_about_version">Version</string>

    <string name="summary_about_version">2.6</string>

    <string name="summary_about_version">2.61</string>

    <string name="title_about_credits">Credits</string>

    <string name="summary_about_credits">ChainsDD, geesun and the rest of XDA! :)</string>

src/com/android/contacts/CallDetailActivity.java

+150 −77

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/contacts/RecentCallsListActivity.java

+10 −10
Original line number Diff line number Diff line
@@ -1558,8 +1558,7 @@ public class RecentCallsListActivity extends ListActivity 
        startActivity(intent);

    }

    

    //Wysie_Soh: WIP. Attempt to clear numbers more effectively

    private void clearCallLogNumbers(final String number) {

	private String getShortestNumber(final String number) {

        String num = number;

        Uri callUri = Uri.withAppendedPath(Calls.CONTENT_FILTER_URI, Uri.encode(number));        

        Cursor callCursor = getContentResolver().query(callUri, CALL_LOG_PROJECTION, null, null, Calls.DEFAULT_SORT_ORDER);
@@ -1576,8 +1575,7 @@ public class RecentCallsListActivity extends ListActivity 
            }while(callCursor.moveToNext());

        }

        

        getContentResolver().delete(Calls.CONTENT_URI, CallLog.Calls.NUMBER + " LIKE '%" + num + "'", null);

        startQuery();

        return num;

	}
@@ -1598,8 +1596,9 @@ public class RecentCallsListActivity extends ListActivity 
                public void onClick(DialogInterface dialog, int whichButton) {

                    if (type.equals(CallLog.Calls.NUMBER) && !(label.equals(getString(R.string.unknown)) ||

                        label.equals(getString(R.string.private_num)) || label.equals(getString(R.string.payphone)) ||

                        label.equals(getString(R.string.voicemail))) && value.length() >= compareLength) {

                        clearCallLogNumbers(value);

                        label.equals(getString(R.string.voicemail))) && value.length() >= compareLength && useExpGroup) {

                        String num = getShortestNumber(value);

                        deleteCallLog(type + " LIKE '%" + num + "'", null);

                    }

                    else {

                        deleteCallLog(type + "=?", new String[] { value });
@@ -1616,8 +1615,9 @@ public class RecentCallsListActivity extends ListActivity 
        } else {

            if (type.equals(CallLog.Calls.NUMBER) && !(label.equals(getString(R.string.unknown)) ||

                label.equals(getString(R.string.private_num)) || label.equals(getString(R.string.payphone)) ||

                label.equals(getString(R.string.voicemail))) && value.length() >= compareLength) {

                    clearCallLogNumbers(value);

                label.equals(getString(R.string.voicemail))) && value.length() >= compareLength && useExpGroup) {

                    String num = getShortestNumber(value);

                    deleteCallLog(type + " LIKE '%" + num + "'", null);

            }

            else {

                deleteCallLog(type + "=?", new String[] { value });