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

Commit 04710264 authored by Chiao Cheng's avatar Chiao Cheng Committed by Android (Google) Code Review
Browse files

Merge "Turn on reverse lookup by default." into klp-dev

parents 8e5c8b11 9fd02a67

res/layout/call_log_list_item_extra.xml

+11 −3
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
                  android:layout_height="wrap_content"

                  android:paddingStart="@dimen/call_log_outer_margin"

                  android:paddingEnd="@dimen/call_log_outer_margin"

                  android:paddingTop="4dip"

                  android:paddingBottom="4dip"

                  android:paddingTop="0dip"

                  android:paddingBottom="0dip"

                  android:background="?android:attr/selectableItemBackground"

                  android:clickable="true">

        <ImageView android:layout_width="wrap_content"
@@ -45,6 +45,14 @@ 
                  android:layout_height="wrap_content"

                  android:id="@+id/badge_text"

                  android:textColor="@color/dialpad_primary_text_color"

                  android:layout_gravity="center_vertical"/>

                  android:layout_gravity="center_vertical"

                  android:layout_weight="1"/>

        <ImageView android:id="@+id/dismiss_button"

                   android:layout_width="wrap_content"

                   android:layout_height="wrap_content"

                   android:paddingTop="8dip"

                   android:src="@drawable/ic_close_dk"

                   android:background="?android:attr/selectableItemBackground"

                   android:visibility="gone"/>

    </LinearLayout>

</FrameLayout>
 
 No newline at end of file

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

+6 −5
Original line number Diff line number Diff line
@@ -640,7 +640,13 @@ public class CallLogAdapter extends GroupingListAdapter 
        if (!mIsCallLog) {

            final int numMissed = getNumMissedCalls(callType);

            final ViewStub stub = (ViewStub) view.findViewById(R.id.link_stub);



            if (shouldShowBadge(numMissed, info, details)) {

                // Do not process if the data has not changed (optimization since bind view is

                // called multiple times due to contact lookup).

                if (numMissed == mNumMissedCallsShown) {

                    return;

                }



                // stub will be null if it was already inflated.

                if (stub != null) {
@@ -718,11 +724,6 @@ public class CallLogAdapter extends GroupingListAdapter 
     */

    protected boolean shouldShowBadge(int numMissedCalls, ContactInfo info,

            PhoneCallDetails details) {

        // Do not process if the data has not changed (optimization since bind view is called

        // multiple times due to contact lookup).

        if (numMissedCalls == mNumMissedCallsShown) {

            return false;

        }

        return numMissedCalls > 0;

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public class ContactInfo { 


    public static String GEOCODE_AS_LABEL = "";



    public int sourceType = 0;



    @Override

    public int hashCode() {

        // Uses only name and contactUri to determine hashcode.