Commit Graph
927 Commits
Author SHA1 Message Date
Xin Li bf70b46b62 [automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12797420

Change-Id: Ic45124f2d068430b60dec959b719de106b90d4ac
2020-10-09 02:24:21 +00:00
Xin Li 79b4382fc3 Skip ab/6749736 in stage.
Merged-In: I0a6ebef1ef342258391bddeb34f5cc719ff28449
Change-Id: I08363195474384d1bc8a5f79b1fb81a724560b67
2020-10-08 17:22:57 -07:00
Taesu Lee 5b6d2cb110 Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316

Change-Id: I2b59d1cc26f6e021ccac3ebac5ee7dbc51261201
2020-10-07 18:25:04 +00:00
Taesu Lee 947784d4f3 Mark messages as failed if SIM is inactive am: 8c08a3f419
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316

Change-Id: I287467e6768f4915706710ab0172455ec6510f8c
2020-10-07 17:57:01 +00:00
Taesu Lee 8c08a3f419 Mark messages as failed if SIM is inactive
If a SIM is inactive, Mark messages corresponding to the SIM as failed
instead of updating selfId as default selfId. The failed messages could
be sent through the SIM manually if the SIM is re-activated.

Test: Manual

Change-Id: I1eee7c12aaedebe8aa3e0c41b4b057758a3b17a2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-10-06 12:33:21 +09:00
Taesu Lee 492f7ee2d1 Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: Ie2d803c9ed06cc4f404a8b0cc05e44d6905cea73
2020-09-16 20:41:35 +00:00
Taesu Lee 71f8b60cdf Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: Ia88e65e4206eef84961c3d7dee3cda7b0330623f
2020-09-16 20:26:32 +00:00
Taesu Lee e7df722655 Fix creating a new conversation including own number am: 9c97af9b83
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: I692d40a9ab2d1f262ed2ad5a12cc47a7cdc46d64
2020-09-16 19:41:45 +00:00
Taesu Lee 9c97af9b83 Fix creating a new conversation including own number
If a device own phone number is unknown and there is only a single
address in all TO and CC for incoming MMS, ignore the address as it is
device own phone number.

Test: Manual

Change-Id: I26de39bd3b71d3ad391372f35cfce0bd5c7b66ed
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-09-16 15:19:58 +09:00
Xin Li c0f9bb1586 [automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: I336273f1955b0fef34ce2647888087226c630acd
2020-09-11 03:33:17 +00:00
Xin Li ea66406522 [automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: I4a04fc1f18f6992ef15e6efa2edcfafb38be50f9
2020-09-11 02:02:25 +00:00
Xin Li d5da09e85f [automerger skipped] Merge Android R am: 1303239498 -s ours
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: I121400cb05ba2cb83d368a5ad03120e8f2c22763
2020-09-11 00:39:45 +00:00
Xin Li 1303239498 Merge Android R
Bug: 168057903
Merged-In: Ia11f7837439c1b4f12ba51e676952659a5fb542f
Change-Id: Id98fe14ac2bebd36dbdd0f46ef723d9af7e889c4
2020-09-08 16:56:05 -07:00
Xin Li fe8699e8bf [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264

Change-Id: I94b8d8c86ffa1b18706238e8383a08870d927f4c
2020-09-01 21:46:29 +00:00
Xin Li 16525d6f36 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264

Change-Id: I1300b2f8a0e23d18c6076c87596d82dfeda964ce
2020-09-01 20:36:54 +00:00
Xin Li dd810e2520 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf
Change-Id: Ia11f7837439c1b4f12ba51e676952659a5fb542f
2020-08-27 10:16:52 -07:00
Xin Li 8f8f706267 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -s ours
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I08396cb0a360e31ddc11e7df164626f4622918d8
2020-08-26 02:11:31 +00:00
Xin Li 26875643c1 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I95ad0e40c35d2279a161e520d504adcf75b6d3d8
2020-08-26 00:34:35 +00:00
Xin Li bfb85db768 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I0146d96c15587fd08193c8cb5942c76d0d3a1a33
2020-08-25 05:57:10 +00:00
Xin Li b8b866e236 Merge stage branch to development trunk.
Bug: 160260413
Merged-In: Ic5eb962d272432725f634d485742e025a15b8011
Change-Id: Ica8ca2884ddb2beb4558e62bc1b5cb640d7e2023
2020-08-24 22:31:56 +00:00
Raman Tenneti 6f8bb7e75e AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 am: 7c76d237bb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: I0a6ebef1ef342258391bddeb34f5cc719ff28449
2020-07-30 02:02:43 +00:00
Raman Tenneti 7c76d237bb AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: I0951034cee454394dd879e85ef5840efaf2e5215
2020-07-30 01:41:52 +00:00
Raman Tenneti 8fe5feae57 AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: Ic5eb962d272432725f634d485742e025a15b8011
2020-07-30 01:26:06 +00:00
Raman Tenneti 4b52654e98 AOSP/Messaging - Update language to comply with Android's inclusive language guidance.
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and make messagingtests
Change-Id: I01c520f1d5e9eab8dbb25b08d133ae34bd301093
2020-07-29 16:43:46 -07:00
Raman Tenneti 4671bcc558 AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c am: 0875a1420e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: Id69fd14fdd4fbda403978ac7502966fa96f309d0
2020-07-10 03:25:35 +00:00
Raman Tenneti 0875a1420e AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf
2020-07-10 03:16:05 +00:00
Raman Tenneti 4c12eb471c AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: I5dad8a738ccecbb85c8788fcd867f7b3631c8deb
2020-07-10 03:10:09 +00:00
Raman Tenneti b1aa213ce9 AOSP/Messaging - Changes to make unit tests to run and pass.
+ Added missing androix libraries to LOCAL_STATIC_ANDROID_LIBRARIES.
+ Added keep class statements for androidx and messaging classes.
+ Deleted Assert.isEngBuild call (this package is the last user of that method).
+ Added import statements for androidx classes.

Test: manual - Tested the messaging UI. Ran the following tests on Pixel phone.

$ make -j 40
$ make messagingtests -j
$ find out -name "messaging*.apk" -print -exec ls -l {} \;
-rw-r----- 1 rtenneti primarygroup 733809 Jul  9 17:42 out/target/product/bonito/testcases/messagingtests/arm64/messagingtests.apk
-rw-r----- 1 rtenneti primarygroup 10799132 Jul  9 18:34 out/target/product/bonito/product/app/messaging/messaging.apk

$ adb install -r -d -t  out/target/product/bonito/product/app/messaging/messaging.apk
$ adb install -r -d -t  out/target/product/bonito/testcases/messagingtests/arm64/messagingtests.apk
$ adb shell am instrument -w com.android.messaging.test

com.android.messaging.datamodel.BindingTest:.......
com.android.messaging.datamodel.BitmapPoolTest:....
com.android.messaging.datamodel.ConversationListTest:.
com.android.messaging.datamodel.DataModelTest:...
com.android.messaging.datamodel.FrequentContactsCursorBuilderTest:...
com.android.messaging.datamodel.MemoryCacheManagerTest:.
com.android.messaging.datamodel.ParticipantRefreshTest:..........
com.android.messaging.datamodel.action.ActionServiceSystemTest:.....
com.android.messaging.datamodel.action.ActionServiceTest:..
com.android.messaging.datamodel.action.ActionTest:.....
com.android.messaging.datamodel.action.GetOrCreateConversationActionTest:.
com.android.messaging.datamodel.action.ReadWriteDraftMessageActionTest:......
com.android.messaging.datamodel.data.ConversationMessageDataTest:...
com.android.messaging.datamodel.data.ConversationParticipantsDataTest:.
com.android.messaging.datamodel.media.ImageRequestTest:..
com.android.messaging.datamodel.media.MediaResourceManagerTest:.....
com.android.messaging.ui.CustomHeaderViewPagerTest:.
com.android.messaging.ui.MultiAttachmentLayoutTest:...
com.android.messaging.ui.attachmentchooser.AttachmentChooserFragmentTest:.
com.android.messaging.ui.contact.ContactListItemViewTest:....
com.android.messaging.ui.contact.ContactPickerFragmentTest:......
com.android.messaging.ui.conversation.ComposeMessageViewTest:..
com.android.messaging.ui.conversation.ConversationActivityUiStateTest:....
com.android.messaging.ui.conversation.ConversationFragmentTest:..
com.android.messaging.ui.conversation.ConversationInputManagerTest:.....
com.android.messaging.ui.conversation.ConversationMessageViewTest:...
com.android.messaging.ui.conversationlist.ConversationListFragmentTest:...
com.android.messaging.ui.conversationlist.ConversationListItemViewTest:....
com.android.messaging.ui.mediapicker.AudioRecordViewTest:.
com.android.messaging.ui.mediapicker.CameraManagerTest:......
com.android.messaging.ui.mediapicker.GalleryGridItemViewTest:.....
com.android.messaging.ui.mediapicker.MediaPickerTest:..
com.android.messaging.util.BugleGservicesTest:.
com.android.messaging.util.YouTubeUtilTest:.
Test results for InstrumentationTestRunner=.........................................
.........................................
...............................
Time: 9.903

OK (113 tests)

Change-Id: If8fd8036791027739eb9bbb1d3849a46211a5137
2020-07-09 18:37:41 -07:00
Treehugger Robot c2c670d15a Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151 am: 55aa308fcb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I4a03b98f431b696afacbb842426db3fcf9ed7421
2020-06-29 17:24:42 +00:00
Treehugger Robot 55aa308fcb Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I323966094ad9d4c62f0a744de762dfb25d4c7c09
2020-06-29 17:02:59 +00:00
Treehugger Robot d67e1db151 Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I3c817f847749649e3540e3827263cc8f7184f2b3
2020-06-29 16:53:27 +00:00
Treehugger Robot 919cb6afdd Merge "Fix NoSuchMethodError for getTypeInfo()" 2020-06-29 16:40:57 +00:00
Bill Yi d9620cc155 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours am: 9d8f501d45 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1350824

Change-Id: Idef9dffb1f089ae74cc46274fd81e5cd9feb5dbd
2020-06-29 16:09:33 +00:00
Bill Yi 9d8f501d45 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1350824

Change-Id: I3116a3be591a59ec30711dc3554e62a7745f2928
2020-06-29 15:54:00 +00:00
Bill Yi a3c59da09d [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1350824

Change-Id: Iaa813c8fc1b91f8270670b9f0f59dfab655432f0
2020-06-29 15:37:55 +00:00
Taesu Lee f2d9199bfb Fix NoSuchMethodError for getTypeInfo()
Load an icon image for audio files from app resources instead because
ContentResolver#getTypeInfo() is for API level >= 29.
And it includes size-fit ic_photo_library_light images also.

Bug: 159987488
Test: Manual

Change-Id: Ie8f766f148a30e105e598e4b7e6b1b22bccda6ae
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-06-29 15:51:07 +09:00
Bill Yi 8e0d3e91f3 Import translations. DO NOT MERGE
BUG:148403740

TEST: m messaging

Merged-In: I4b74a267c0ed7cffe04d97ca465f2aa90ae1847a
Change-Id: Ie6f26f2a9e207adeee475e347f17dd8e0da78d9b
Auto-generated-cl: translation import
(cherry picked from commit 3bd7b79daa)
2020-06-28 18:51:48 +00:00
Taesu Lee 5538d47259 Remove advanced category if no preference am: 392850a825 am: 34ebed2bba am: 45cd97eabf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1351522

Change-Id: Ic6105759c8b90ffcce82c12e70e962e19b50bbd5
2020-06-26 17:15:23 +00:00
Taesu Lee 45cd97eabf Remove advanced category if no preference am: 392850a825 am: 34ebed2bba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1351522

Change-Id: I40e97e119cfefaf90e14efad2760e9e31a46a9b8
2020-06-26 17:00:47 +00:00
Taesu Lee 34ebed2bba Remove advanced category if no preference am: 392850a825
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1351522

Change-Id: Icbed01452b088198a11436aad233c281b4068067
2020-06-26 16:48:17 +00:00
Taesu Lee 392850a825 Remove advanced category if no preference
Test: In debug mode, turn off all the configs for advanced category

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I52ea0905b9d4f03a57b4849e5b575bc5e508dd2d
2020-06-26 19:25:05 +09:00
Raman Tenneti 3debc351f5 AOSP/Messaging - Changed minSdkVersion to 19. am: 8926653a98 am: 58d5681edd am: cc4904c89a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1348203

Change-Id: I7e52857f5f9f31222eb425c8ccd969643051732e
2020-06-23 23:53:38 +00:00
Raman Tenneti cc4904c89a AOSP/Messaging - Changed minSdkVersion to 19. am: 8926653a98 am: 58d5681edd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1348203

Change-Id: I31114ab0e25fc0c2352a42ec2202459730c4bf0a
2020-06-23 23:40:39 +00:00
Raman Tenneti 58d5681edd AOSP/Messaging - Changed minSdkVersion to 19. am: 8926653a98
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1348203

Change-Id: Icbbf5bf2bfa0e59e75fb0a0e87a928ee1fe93bf8
2020-06-23 23:16:24 +00:00
Raman Tenneti 8926653a98 AOSP/Messaging - Changed minSdkVersion to 19.
Bug: 159055957

Test: manual - Tested the messaging UI.

$ make -j 40

Change-Id: I6f89161d7c841e88fcd8496417ae1ab8e964961a
2020-06-23 22:10:34 +00:00
Treehugger Robot 945d572d39 Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" am: be4c269813 am: 92b38533ec am: d43f2fd23c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345449

Change-Id: I861686e60742c88d1cc9dc93c0bdc2d1cc01d862
2020-06-22 17:21:26 +00:00
Taesu Lee 43f98b38f0 Fix app initialization issue if no permissions am: 297a6f7047 am: ba59a36fdb am: 5c393695c6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345448

Change-Id: Ia252373a2a6109a881feee44a5d20be6e5aec464
2020-06-22 17:21:11 +00:00
Treehugger Robot d43f2fd23c Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" am: be4c269813 am: 92b38533ec
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345449

Change-Id: I32963ac99c68803399349b0c4e1f54b9621ba76c
2020-06-22 17:06:51 +00:00
Taesu Lee 5c393695c6 Fix app initialization issue if no permissions am: 297a6f7047 am: ba59a36fdb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345448

Change-Id: I2dd1a3cc46f51f2ca743674bab363c6e90f5f0ad
2020-06-22 17:06:36 +00:00
Treehugger Robot 92b38533ec Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" am: be4c269813
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345449

Change-Id: If661b26336c80e6c4928afd9adc2111eb2a255ee
2020-06-22 16:53:21 +00:00