Xin Li
8f27830d2d
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: If59160cc7c40fde5577b2aa82feb041c0086e8cf
2019-10-30 11:49:53 -07:00
Xin Li
a761701291
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d69430249d -s ours
...
am: e5eb582943 -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history
Change-Id: Ie6f217bd119e850ce3d34ab9829f3a686e48259b
2019-09-08 15:26:42 -07:00
Xin Li
e5eb582943
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: d69430249d -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history
Change-Id: Ic45c1b4f5797f751986f2e6654738c9e778209cc
2019-09-08 14:43:58 -07:00
Xin Li
d69430249d
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
No content change.
Bug: 135460123
Change-Id: I5e64e969936dbbae86d0d71cbad524fb24973af1
Merged-In: I7624257e4cffc690f0df4c844b23cd2accddca4b
2019-09-08 12:45:15 -07:00
Xin Li
025b5c8ef0
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours am: 2f8008876a
...
am: 0e1562408a
Change-Id: Ieda91c49c2f3ec3fde2a6b180b7c38f8bea149f0
2019-09-05 13:35:28 -07:00
Xin Li
0e1562408a
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours
...
am: 2f8008876a
Change-Id: I0f96f85edfe4bf6aa3a62a2267e27eb66fd5ce6d
2019-09-05 12:59:18 -07:00
Xin Li
2f8008876a
[automerger skipped] DO NOT MERGE - Merge Android 10 into master
...
am: 105542679f -s ours
am skip reason: subject contains skip directive
Change-Id: I04b43539e52eae8fd96dc98f36a202c3584d29f4
2019-09-05 12:13:27 -07:00
Xin Li
105542679f
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: I7624257e4cffc690f0df4c844b23cd2accddca4b
2019-09-04 13:34:31 -07:00
Po-Chien Hsueh
99d9b31889
Move libgiftranscode.so to /product am: 003eb4915a am: 90d0edb3dc am: 7e674a30d8
...
am: 0e55713ba0
Change-Id: I9683705c8825af0afc79ac27bc2b8e539573d351
2019-08-15 19:39:16 -07:00
Po-Chien Hsueh
0e55713ba0
Move libgiftranscode.so to /product am: 003eb4915a am: 90d0edb3dc
...
am: 7e674a30d8
Change-Id: I16069c6c80abf267fabec6f220509b9c4bf8e3d9
2019-08-15 19:26:42 -07:00
Po-Chien Hsueh
7e674a30d8
Move libgiftranscode.so to /product am: 003eb4915a
...
am: 90d0edb3dc
Change-Id: I01cdeb2cdb14602330b2958b8d1b4e467563558b
2019-08-15 19:04:42 -07:00
Po-Chien Hsueh
90d0edb3dc
Move libgiftranscode.so to /product
...
am: 003eb4915a
Change-Id: I6130ee3cfcd9b199aaad85cc555c3931f2bb4ce1
2019-08-15 18:49:32 -07:00
Po-Chien Hsueh
003eb4915a
Move libgiftranscode.so to /product
...
libgiftranscode.so is a jni lib for Messaging app, which is usually
overridden by proprietary apps on shipping devices. We have moved
Messaging to /product. Now this CL move libgiftranscode.so too.
Bug: 138282284
Test: Open gif files with Messaging on aosp_crosshatch
Change-Id: Ic104ba8ec5c2258a28c8d19151a00f6c601b5f80
2019-08-15 16:20:06 +08:00
Xin Li
bcf3a7354c
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: e051816567 -s ours am: 893d1265ad
...
am: 9e95d7a4f7
Change-Id: I7c76f6787472d06f624570d9ae172928389dec23
2019-08-14 14:23:26 -07:00
Xin Li
9e95d7a4f7
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: e051816567 -s ours
...
am: 893d1265ad
Change-Id: I9d7d07738190030ebfde126ca3a6a531feafa144
2019-08-14 13:56:47 -07:00
Xin Li
893d1265ad
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: e051816567 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib8d5be333c2d3f87580ed909e5d9a19bb671d44a
2019-08-14 13:32:01 -07:00
Xin Li
e051816567
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: Ib7d990ceba3732de79765f7edf9d27111cbe4bab
2019-08-14 11:35:20 -07:00
Taesu Lee
89fe3e18f2
Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86 am: cc99cd75de
...
am: c628d93012
Change-Id: If9c4156df3b7f7881716292e74f8dc62a41cfa92
2019-08-13 22:42:49 -07:00
Taesu Lee
c628d93012
Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86
...
am: cc99cd75de
Change-Id: Ia95df0b85ca6a1c61fd8f890c062a1a4d54121d5
2019-08-13 22:31:55 -07:00
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
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
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
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
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
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
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