filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
620 Commits 1 Branch 0 Tags
2943886850cb94bc51a91d8ecc8a947de229f540
Commit Graph
620 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker 2943886850 Fix showing wrong image on document picker item am: 36a41d3e9d am: a1c4f0dbfc am: 4257e20d79 
Change-Id: I904f43ba704e50ca77d087739b293e7a6ac1eb3b
 2020-02-06 20:52:43 +00:00
Automerger Merge Worker 4257e20d79 Fix showing wrong image on document picker item am: 36a41d3e9d am: a1c4f0dbfc 
Change-Id: Id84dc046302e4657446914978f8b0a7c9d1c95ba
 2020-02-06 20:36:02 +00:00
Automerger Merge Worker a1c4f0dbfc Fix showing wrong image on document picker item am: 36a41d3e9d 
Change-Id: I82556611afe3161a6dc0776a523638427e718700
 2020-02-06 20:23:04 +00:00
Taesu Lee 36a41d3e9d Fix showing wrong image on document picker item 
Set mDetachedRequestDescriptor as null for document picker to prevent
calling setImageResourceId() in onAttachedToWindow().

Test: Manual

Change-Id: Ied5ca200cac350ef4b2420269763dfc240fc97c4
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-02-05 15:53:23 +09:00
Automerger Merge Worker 6ae198cb1f [automerger skipped] Import translations. DO NOT MERGE am: 137fa08640 -s ours am: 7fbbcddfb1 -s ours 
am skip reason: subject contains skip directive

Change-Id: I10d615f1b298cf3b57113a5db9a0efbe65d1cd44
 2020-01-29 18:11:35 +00:00
Automerger Merge Worker 7fbbcddfb1 [automerger skipped] Import translations. DO NOT MERGE am: 137fa08640 -s ours 
am skip reason: subject contains skip directive

Change-Id: If683e41d449eee1ac6049e18b538d5323cd98be4
 2020-01-29 17:57:41 +00:00
Bill Yi 137fa08640 Import translations. DO NOT MERGE 
BUG:148403740

TEST: m messaging

Change-Id: I4b74a267c0ed7cffe04d97ca465f2aa90ae1847a
Auto-generated-cl: translation import
 2020-01-28 14:41:38 -08:00
Automerger Merge Worker 1b0dcaf262 [automerger skipped] Import translations. DO NOT MERGE am: 3bd7b79daa -s ours am: 5d134265c8 -s ours am: bc828e450a -s ours 
am skip reason: subject contains skip directive

Change-Id: I7a04ea865defb1c65e0cafdd0aa4b672e669a3dd
 2020-01-28 03:38:23 +00:00
Automerger Merge Worker bc828e450a [automerger skipped] Import translations. DO NOT MERGE am: 3bd7b79daa -s ours am: 5d134265c8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4780b96966eb6ec59199b27cb8cbc899e450efba
 2020-01-28 03:22:57 +00:00
Bill Yi 5d134265c8 [automerger skipped] Import translations. DO NOT MERGE 
am: 3bd7b79daa -s ours
am skip reason: subject contains skip directive

Change-Id: I8efb4533eb13d266d5d7b7ba0befaf2e066fad41
 2020-01-27 19:08:58 -08:00
Bill Yi 3bd7b79daa Import translations. DO NOT MERGE 
BUG:148403740

TEST: m messaging

Change-Id: I4b74a267c0ed7cffe04d97ca465f2aa90ae1847a
Auto-generated-cl: translation import
 2020-01-27 16:55:48 -08:00
Xin Li 9133660c61 [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 8f27830d2d 
am: 8ef613866d -s ours
am skip reason: subject contains skip directive

Change-Id: I3f207781147ba18feaf27c7063b7762f6c7873c7
 2019-10-30 16:02:53 -07:00
Xin Li 8ef613866d DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
am: 8f27830d2d

Change-Id: I5f62246a1864f7ca2fddd92276a0e64d9d689cbb
 2019-10-30 15:36:50 -07:00
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 5a64e7c27f [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d69430249d -s ours am: e5eb582943 -s ours 
am: a761701291 -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history

Change-Id: If1cfa0bc72c908eb090d0f3e0dc064b5f5435429
 2019-09-11 11:11:07 -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 1162710eef [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours am: 2f8008876a am: 0e1562408a 
am: 025b5c8ef0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdcc1a85dc133e139f89bd30063442204466b168
 2019-09-05 14:15:44 -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 e0490d3537 Move libgiftranscode.so to /product am: 003eb4915a am: 90d0edb3dc am: 7e674a30d8 am: 0e55713ba0 
am: 99d9b31889

Change-Id: I06630c19ae041a6468e12cefafcca2376224aac2
 2019-08-15 19:55:16 -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 c7999edb85 [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 
am: bcf3a7354c -s ours
am skip reason: subject contains skip directive

Change-Id: Id68b61cd5e0dc871f0bb3d011c9182c4550a8ec1
 2019-08-14 15:36:07 -07: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 854de7a353 Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86 am: cc99cd75de am: c628d93012 
am: 89fe3e18f2

Change-Id: I4f1212a4258e6f4974bca0ced87004fa97201eb3
 2019-08-13 22:54:13 -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 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