filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Android 14 QPR2 to AOSP main

Browse Source 
Bug: 319669529
Merged-In: I3a7b6043fc086e561ff08cfe2aa62b63d7111725
Change-Id: Ie3b6eef7da0cfdc72cc9d8fe38b5496bb4fe5a61
This commit is contained in:
Xin Li
2024-03-06 09:30:05 -08:00
parent 7c4e41b7dc 39d9a7cff7
commit a268d72062
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java
View File

@@ -19,7 +19,6 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.AsyncTask; import android.os.AsyncTask;
import androidx.appcompat.R;
import android.text.Editable; import android.text.Editable;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.TextWatcher; import android.text.TextWatcher;
@@ -33,6 +32,7 @@ import android.widget.TextView;
import com.android.ex.chips.RecipientEditTextView; import com.android.ex.chips.RecipientEditTextView;
import com.android.ex.chips.RecipientEntry; import com.android.ex.chips.RecipientEntry;
import com.android.ex.chips.recipientchip.DrawableRecipientChip; import com.android.ex.chips.recipientchip.DrawableRecipientChip;
import com.android.messaging.R;
import com.android.messaging.datamodel.data.ParticipantData; import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.util.ContactRecipientEntryUtils; import com.android.messaging.util.ContactRecipientEntryUtils;
import com.android.messaging.util.ContactUtil; import com.android.messaging.util.ContactUtil;
@@ -114,7 +114,7 @@ public class ContactRecipientAutoCompleteView extends RecipientEditTextView {
setOnFocusListShrinkRecipients(false); setOnFocusListShrinkRecipients(false);
setBackground(context.getResources().getDrawable( setBackground(context.getResources().getDrawable(
R.drawable.abc_textfield_search_default_mtrl_alpha)); androidx.appcompat.R.drawable.abc_textfield_search_default_mtrl_alpha));
} }
public void setContactChipsListener(final ContactChipsChangeListener listener) { public void setContactChipsListener(final ContactChipsChangeListener listener) {

25
tools/messagegen/fillsms Executable file → Normal file
View File

@@ -100,9 +100,11 @@ image_list_file=$1
shift shift
sql_file=$1 sql_file=$1
shift shift
echo $image_list_file
dict_lines=`wc -l < $DICT` dict_lines=`wc -l < $DICT`
image_files=`wc -l < $image_list_file` image_files=`wc -l < $image_list_file`
echo $image_files
if [ $mms_per_thread -gt "0" ]; then if [ $mms_per_thread -gt "0" ]; then
if [ ! -f $image_list_file ]; then if [ ! -f $image_list_file ]; then
@@ -123,7 +125,7 @@ random_value ()
dict_word () dict_word ()
{ {
local v=$(random_value 30000) local v=$(random_value $dict_lines)
sed $v"q;d" $DICT sed $v"q;d" $DICT
} }
@@ -156,6 +158,11 @@ adb_sql ()
adb shell sqlite3 data/data/com.android.providers.telephony/databases/mmssms.db "$1" adb shell sqlite3 data/data/com.android.providers.telephony/databases/mmssms.db "$1"
} }
adb_sql_with_quotes ()
{
echo $1
adb shell "sqlite3 data/data/com.android.providers.telephony/databases/mmssms.db \"$1\""
}
###################################################################################### ######################################################################################
###################################################################################### ######################################################################################
@@ -163,6 +170,7 @@ if [ $opt_exec_only -eq "0" ]; then
# clean up sql file # clean up sql file
rm -f $sql_file rm -f $sql_file
add_sql "PRAGMA trusted_schema=1;"
# add sql to clean up database # add sql to clean up database
add_sql "delete from pdu where _id>=$TABLE_SMS_START_ID;" add_sql "delete from pdu where _id>=$TABLE_SMS_START_ID;"
add_sql "delete from part where _id>=$TABLE_SMS_START_ID;" add_sql "delete from part where _id>=$TABLE_SMS_START_ID;"
@@ -197,6 +205,7 @@ if [ $opt_exec_only -eq "0" ]; then
# Generate SMS # Generate SMS
if [ $sms_per_thread -gt "0" ]; then if [ $sms_per_thread -gt "0" ]; then
add_sql "PRAGMA trusted_schema=1;"
half_timestamp_inc=$(( 500 + ((($sms_per_thread + $mms_per_thread) * $TIMESTAMP_INC_IN_SECONDS) * 500 / $sms_per_thread) )) half_timestamp_inc=$(( 500 + ((($sms_per_thread + $mms_per_thread) * $TIMESTAMP_INC_IN_SECONDS) * 500 / $sms_per_thread) ))
for j in `seq 1 $sms_per_thread`; for j in `seq 1 $sms_per_thread`;
do do
@@ -268,20 +277,22 @@ if [ $opt_sql_only -eq "0" ]; then
echo echo
adb_sql ".read /data/fillsms" adb_sql ".read /data/fillsms"
echo echo
adb_sql "select count(*) from canonical_addresses where _id>=$TABLE_CANONICAL_ADDRESSES_START_ID;" add_sql "PRAGMA trusted_schema=1;"
echo echo
adb_sql "select count(*) from threads where _id>=$TABLE_THREADS_START_ID;" adb_sql_with_quotes "select count(*) from canonical_addresses where _id>=$TABLE_CANONICAL_ADDRESSES_START_ID;"
echo
adb_sql_with_quotes "select count(*) from threads where _id>=$TABLE_THREADS_START_ID;"
echo echo
if [ $sms_per_thread -gt "0" ]; then if [ $sms_per_thread -gt "0" ]; then
adb_sql "select count(*) from sms where _id>=$TABLE_SMS_START_ID;" adb_sql_with_quotes "select count(*) from sms where _id>=$TABLE_SMS_START_ID;"
echo echo
fi fi
if [ $mms_per_thread -gt "0" ]; then if [ $mms_per_thread -gt "0" ]; then
adb_sql "select count(*) from pdu where _id>=$TABLE_SMS_START_ID;" adb_sql_with_quotes "select count(*) from pdu where _id>=$TABLE_SMS_START_ID;"
echo echo
adb_sql "select count(*) from part where _id>=$TABLE_SMS_START_ID;" adb_sql_with_quotes "select count(*) from part where _id>=$TABLE_SMS_START_ID;"
echo echo
adb_sql "select count(*) from addr where _id>=$TABLE_SMS_START_ID;" adb_sql_with_quotes "select count(*) from addr where _id>=$TABLE_SMS_START_ID;"
echo echo
fi fi
fi fi