merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c9427ae..3e5d304 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -510,7 +510,7 @@
<string name="voicemail_fetching_timout" msgid="6691792377574905201">"ไม่สามารถดึงข้อความเสียง"</string>
<string name="call_log_new_header" msgid="846546437517724715">"ใหม่"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"เก่ากว่า"</string>
- <string name="call_log_voicemail_header" msgid="4484032064803446806">"สายโทรที่มีข้อความเสียง"</string>
+ <string name="call_log_voicemail_header" msgid="4484032064803446806">"สายที่ฝากข้อความเสียง"</string>
<string name="call_log_incoming_header" msgid="297542827180501480">"สายเรียกเข้า"</string>
<string name="call_log_outgoing_header" msgid="9017138725495067284">"สายโทรออก"</string>
<string name="call_log_missed_header" msgid="2168865291934970151">"สายที่ไม่ได้รับ"</string>
diff --git a/src/com/android/contacts/calllog/CallLogQueryHandler.java b/src/com/android/contacts/calllog/CallLogQueryHandler.java
index 096e882..a6382b6 100644
--- a/src/com/android/contacts/calllog/CallLogQueryHandler.java
+++ b/src/com/android/contacts/calllog/CallLogQueryHandler.java
@@ -26,6 +26,7 @@
import android.database.sqlite.SQLiteDiskIOException;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteFullException;
+import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -49,6 +50,7 @@
private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final String TAG = "CallLogQueryHandler";
+ private static final int NUM_LOGS_TO_DISPLAY = 1000;
/** The token for the query to fetch the new entries from the call log. */
private static final int QUERY_NEW_CALLS_TOKEN = 53;
@@ -193,7 +195,10 @@
selection = String.format("(%s) AND (%s = ?)", selection, Calls.TYPE);
selectionArgs.add(Integer.toString(callType));
}
- startQuery(token, requestId, Calls.CONTENT_URI_WITH_VOICEMAIL,
+ Uri uri = Calls.CONTENT_URI_WITH_VOICEMAIL.buildUpon()
+ .appendQueryParameter(Calls.LIMIT_PARAM_KEY, Integer.toString(NUM_LOGS_TO_DISPLAY))
+ .build();
+ startQuery(token, requestId, uri,
CallLogQuery._PROJECTION, selection, selectionArgs.toArray(EMPTY_STRING_ARRAY),
Calls.DEFAULT_SORT_ORDER);
}