Taesu Lee
cc99cd75de
Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3
...
am: 363ee13c86
Change-Id: I056f482a2726f7b6aec3022eb80454007650f196
2019-08-13 22:21:20 -07:00
Taesu Lee
363ee13c86
Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity"
...
am: 05f6de16d3
Change-Id: I0c039776d6a7c71d91dfc391fcb050d425bace4a
2019-08-13 22:10:26 -07:00
Treehugger Robot
05f6de16d3
Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity"
2019-08-14 04:19:19 +00:00
Po-Chien Hsueh
1e619f09c6
Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b am: 2062b1bf71 am: c5a20b7b90
...
am: 9b12d48c20
Change-Id: I364c930d5032c3913652f200a1d224ca31ce79e4
2019-08-13 19:13:36 -07:00
Po-Chien Hsueh
9b12d48c20
Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b am: 2062b1bf71
...
am: c5a20b7b90
Change-Id: I3cdecf88858eab7ab9e794983770d0be43e488fc
2019-08-13 19:01:08 -07:00
Po-Chien Hsueh
c5a20b7b90
Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b
...
am: 2062b1bf71
Change-Id: I454e8a0b7a4a4ec086479910567e4783a27ca932
2019-08-13 18:48:37 -07:00
Po-Chien Hsueh
2062b1bf71
Merge "Move Messaging to /product" am: 4fa5f17013
...
am: 5106de587b
Change-Id: I1dad50fef8979dbcf7598d470ed72fa13100fac6
2019-08-13 18:37:11 -07:00
Po-Chien Hsueh
5106de587b
Merge "Move Messaging to /product"
...
am: 4fa5f17013
Change-Id: I119d06489c572b928a8ba24a7ad1c09c3d214338
2019-08-13 18:23:40 -07:00
Po-Chien Hsueh
4fa5f17013
Merge "Move Messaging to /product"
2019-08-14 00:35:31 +00:00
Po-Chien Hsueh
8e173329e0
Move Messaging to /product
...
Move Messaging to /product as we usually override it by proprietary
apps on shipping devices.
Bug: 138283161
Test: Run this app on aosp_crosshatch
Change-Id: I30e1f291f249e15b0d9131cfa72cc9e9f4a37234
2019-08-13 17:06:33 +08:00
Taesu Lee
2b7516e5a0
Fix FATAL EXCEPTION on SmsStorageLowWarningActivity
...
Added new "Translucent" style for SmsStorageLowWarningActivity instead.
Test: am start com.android.messaging/.ui.SmsStorageLowWarningActivity
Change-Id: Ie8b0df64ac046343c93ca8b4ffa93c5e49cc73ad
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-08-13 16:40:16 +09:00
Taesu Lee
6312e723a3
Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c am: 3c713cc25d am: 4cf93a099b
...
am: a78cfd1a47
Change-Id: I1e4fafce4e2a2cffd6a1009620da4de8a2ff0f10
2019-08-12 13:50:14 -07:00
Taesu Lee
a78cfd1a47
Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c am: 3c713cc25d
...
am: 4cf93a099b
Change-Id: I9b74ef776fe97edebeed67e75febba97d0f05611
2019-08-12 13:40:13 -07:00
Taesu Lee
4cf93a099b
Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c
...
am: 3c713cc25d
Change-Id: Iae59bac71ad6e19dab4bf814d1a2002611506ada
2019-08-12 13:30:13 -07:00
Taesu Lee
3c713cc25d
Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9
...
am: 8ad8631f0c
Change-Id: Iaaf9c615f866e56730c0182e682c26c46405ad24
2019-08-12 13:20:08 -07:00
Taesu Lee
8ad8631f0c
Merge "Sort ParticipantsData in order of the slot id"
...
am: 00228481c9
Change-Id: If4cb521dc1523dad4427dcbfad062f75855b60a4
2019-08-12 13:10:07 -07:00
Treehugger Robot
00228481c9
Merge "Sort ParticipantsData in order of the slot id"
2019-08-12 19:40:44 +00:00
Taesu Lee
bd41aeab6e
Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03 am: 30172868d0 am: 12b4028bb2
...
am: 01ac9dc579
Change-Id: I18aa033e3788460bce21cbaa529f57137dd31955
2019-08-02 16:58:50 -07:00
Taesu Lee
01ac9dc579
Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03 am: 30172868d0
...
am: 12b4028bb2
Change-Id: I82ff65409cd9e71fd52f76570675b0f751ded995
2019-08-02 16:46:40 -07:00
Taesu Lee
12b4028bb2
Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03
...
am: 30172868d0
Change-Id: I54061ce645d3a13b0a13378d1c4d955ab634c268
2019-08-02 16:36:24 -07:00
Taesu Lee
30172868d0
Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f
...
am: 6da2bf2c03
Change-Id: I29dfbb56ec477349c574343b94d422e07d564390
2019-08-02 16:21:19 -07:00
Taesu Lee
6da2bf2c03
Ignore unexpected ACTION_DOWN for SIM avatar icons
...
am: 7ccc6d1b9f
Change-Id: I776323b4fa701202c39be57b08411cea01b540fa
2019-08-02 16:09:19 -07:00
Taesu Lee
7ccc6d1b9f
Ignore unexpected ACTION_DOWN for SIM avatar icons
...
Unexpected ACTION_DOWN raises setColorFilter() for SIM avatar icons in
the SIM switcher. However, other actions to clear the filter cannot be
received due to no clickable attribute.
Test: Click SIM icon in SimSelectorView.
Change-Id: Ic5972522a3442e3087c474b65add38a6d00511a5
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-08-02 16:05:47 +09:00
Taesu Lee
b22bc643ce
Sort ParticipantsData in order of the slot id
...
getSelfParticipants() returns the ParticipantData list arranged in
ascending order of the slot id to show SIM UIs from lowest to highest id
consistently.
Test: Verify SettingsFragment and SimSelector order in multi-sim device
Change-Id: I0f5f27c6467cb21a6d11271d1a0a6beef36630a6
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-08-01 18:38:40 +09:00
Greg Kaiser
4b6fdfa451
Remove --legacy flag
...
We've fixed the improperly formated resource strings, so no longer
need this flag.
Bug: 135617299
Test: TreeHugger
Change-Id: I12dd4e6632acb00e9c8c56b77b1fb8b418e4a8d7
2019-07-12 05:24:19 -07:00
Bill Yi
0106dba207
Import translations. DO NOT MERGE
...
BUG: 135617299
Change-Id: I85918548585981dfc236ac38225deaeba0f45a0b
Auto-generated-cl: translation import
2019-07-11 13:31:36 -07:00
Bill Yi
86c15520a1
Import translations. DO NOT MERGE
...
BUG: 135617299
Change-Id: I1d812712fa47ad6818d1ccd086343e2f48c63c63
Auto-generated-cl: translation import
2019-07-09 15:38:53 -07:00
Raman Tenneti
52bd9a2c6b
AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 am: 22744717a7 am: be2b581a14
...
am: 79843ed39e
Change-Id: I88868fd36ced144bdb46072f50dd34ec8608a21d
2019-07-08 19:04:51 -07:00
Raman Tenneti
79843ed39e
AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 am: 22744717a7
...
am: be2b581a14
Change-Id: I52e7b9b749b7caf3727da615d762392e0da935e4
2019-07-08 18:20:16 -07:00
Raman Tenneti
be2b581a14
AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1
...
am: 22744717a7
Change-Id: Ic00f199d25439fdda93715006afb83e1724e06b2
2019-07-08 18:00:19 -07:00
Raman Tenneti
22744717a7
AOSP/Messaging - Fix many improperly formatted resource strings in Messaging.
...
am: a7a1d07ce1
Change-Id: Ic99684432e0d66d9b7fe685ea66fed39976e7f1f
2019-07-08 17:35:47 -07:00
Raman Tenneti
a7a1d07ce1
AOSP/Messaging - Fix many improperly formatted resource strings in Messaging.
...
TODO: Need to run translation to fix across all languages.
Bug: 135617299
Test: manual - Did a "make -j40" and verified that there are no warnings in strings.xml.
Change-Id: I3f993fcea42c041d609e0f714cf3b0a2a6383816
2019-07-08 19:16:28 +00:00
Taesu Lee
507ec13360
Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 am: 22d93c0406 am: 0512d2078e
...
am: b06eb3a0d3
Change-Id: I1d6ea8dbc57f73cdb0c98ddef737dae7d6017f4e
2019-07-03 19:05:06 -07:00
Taesu Lee
b06eb3a0d3
Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 am: 22d93c0406
...
am: 0512d2078e
Change-Id: Ie3a7cf3f1692be15de61b79f67e1291bc39a15be
2019-07-03 17:23:04 -07:00
Taesu Lee
0512d2078e
Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10
...
am: 22d93c0406
Change-Id: Iea7391e23e36fd7a9d7c449457f46743315458c3
2019-07-03 16:35:23 -07:00
Taesu Lee
22d93c0406
Merge "Replace no error code '0' for SMS with '-1'"
...
am: b7f93e6f10
Change-Id: I0e3d28d6d8849bd855b057aceaedf19f54d52171
2019-07-03 16:23:10 -07:00
Treehugger Robot
b7f93e6f10
Merge "Replace no error code '0' for SMS with '-1'"
2019-07-03 18:08:28 +00:00
Xin Li
5901937596
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 336a8d81ab
...
am: 97041a8763 -s ours
am skip reason: subject contains skip directive
Change-Id: I33b0b697a9a967a1397ceefc225c5cf28f7931a4
2019-07-02 16:20:08 -07:00
Xin Li
97041a8763
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 336a8d81ab
Change-Id: Ic9fe362b86f30ccaa936b64335d65c5fe859c9bf
2019-07-02 13:32:16 -07:00
Xin Li
336a8d81ab
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I973d953e4c10365e594ddd68516bdc4d7dd0de1c
2019-07-01 21:00:01 +00:00
Colin Cross
ff2a232770
Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b am: 443ef0243d am: 570199e8ab
...
am: e5bf830ea2
Change-Id: I7dd4299f24c7af4385b49757f51057fda257c418
2019-06-27 11:26:44 -07:00
Colin Cross
e5bf830ea2
Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b am: 443ef0243d
...
am: 570199e8ab
Change-Id: I93f234a9ad94e4b816b6c57b390235a7698b4af7
2019-06-26 12:34:18 -07:00
Colin Cross
570199e8ab
Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b
...
am: 443ef0243d
Change-Id: Ibedb1e427ecd68b091b2d4388f52b8fbf5c9c2f8
2019-06-26 11:42:10 -07:00
Colin Cross
443ef0243d
Merge "Pass --legacy to aapt2 compile for Messaging"
...
am: db0b50238b
Change-Id: Idc96c3eadb09290d58a005814c79299a6108f321
2019-06-26 11:06:18 -07:00
Colin Cross
db0b50238b
Merge "Pass --legacy to aapt2 compile for Messaging"
2019-06-26 17:05:33 +00:00
Taesu Lee
5d437c17a7
Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e am: b95a19ca46
...
am: e4e98a1f7c
Change-Id: I3c8a694462811c7aa8270990fcecf5fe0ddd9125
2019-06-25 16:11:11 -07:00
Taesu Lee
e4e98a1f7c
Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e
...
am: b95a19ca46
Change-Id: I9292b64d99bafecb52479acfb9877dc6cb4dd0eb
2019-06-25 15:54:02 -07:00
Taesu Lee
b95a19ca46
Fix GetOrCreateConversationActionTest failure am: a019a9da5c
...
am: 3616fb5b3e
Change-Id: Iab4b669f556cec46db72678c2b61624c0418996b
2019-06-25 15:18:38 -07:00
Taesu Lee
3616fb5b3e
Fix GetOrCreateConversationActionTest failure
...
am: a019a9da5c
Change-Id: I3a4d26642c51f4eaaa393929c9c75f10801ffc68
2019-06-25 14:51:55 -07:00
Taesu Lee
a019a9da5c
Fix GetOrCreateConversationActionTest failure
...
Test: atest messagingtests
Change-Id: I62a30f50a64a6e6e3f7ce21c0919cb2873654bc2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-06-25 14:28:08 +09:00