filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
142 Commits 1 Branch 0 Tags
d2026f726d40f8208acfa4e66b0ba21aab8b02c1
Commit Graph
142 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Mak d2026f726d Show badge icon if any participant in the conversation is work contact am: 7ad7ac27f1 
am: abff43da92

Change-Id: Ia600581af777a880fc1e2f3a8cbcc726818ee600
 2016-06-29 20:12:34 +00:00
Tony Mak afc03962e1 Set the background of linearlayout to be transparent am: dec1aca348 
am: 0ff0cdd425

Change-Id: Iff28c93310fb644811d26aad0635d4439cdd1931
 2016-06-29 20:12:34 +00:00
Tony Mak 319ece830e Add badge in conversation view if the participant is a work contact am: 2a50ffe57c 
am: 3c2cbaa2a0

Change-Id: I4921a10bb5da0857a30511924aa016b151a96aaf
 2016-06-29 20:12:33 +00:00
Tony Mak abff43da92 Show badge icon if any participant in the conversation is work contact 
am: 7ad7ac27f1

Change-Id: I65217f3af52910a3d93b240e2308d0e176497cc5
 2016-06-29 20:05:17 +00:00
Tony Mak 0ff0cdd425 Set the background of linearlayout to be transparent 
am: dec1aca348

Change-Id: I3335bf634ec9e4664543d5241eb13adb8ff9e130
 2016-06-29 20:05:16 +00:00
Tony Mak 3c2cbaa2a0 Add badge in conversation view if the participant is a work contact 
am: 2a50ffe57c

Change-Id: Ib2a1eb8e89ea5de74b7976507b95733abcb8fcdc
 2016-06-29 20:05:16 +00:00
Tony Mak 7ad7ac27f1 Show badge icon if any participant in the conversation is work contact 
Precompute is_enterprise and stored the value in conversation table.
Include is_enterprise in the ConversationList view.

Change-Id: I2e31bd61c08d25a296aaa3e99cb24631ae2e7976
 2016-06-29 10:58:33 +01:00
Tony Mak dec1aca348 Set the background of linearlayout to be transparent 
Change-Id: Iffe33b61ec8d5caca6007c39be02bdaa2f1cb028
 2016-06-28 15:48:59 +01:00
Tony Mak 2a50ffe57c Add badge in conversation view if the participant is a work contact 
TODO: To handle conversation having more than one participants.

Bug: 29065176
Change-Id: I3820454bf2b76c151dc3a13d9be270502029160d
 2016-06-28 15:44:27 +01:00
Tavis Bohne 84feac7e74 Merge \\\"Messenger refuses all file:///data/ uris\\\" into nyc-dev am: 9de3ed279b am: d112c795ac 
am: 69e2c494bb

Change-Id: Ic9164f55540e27e5160b20a2cdcc0ede692334fd
 2016-06-08 17:14:46 +00:00
Tavis Bohne 6ca1ccf3fb Merge \\\"Messenger refuses all file:///data/ uris\\\" into nyc-dev am: 9de3ed279b am: f0a36952dc 
am: 63a0e39806

Change-Id: I85541bc03d008fabe857f03d9db8e2b56c1c8cfe
 2016-06-08 17:14:45 +00:00
Tavis Bohne 69e2c494bb Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b 
am: d112c795ac

Change-Id: Ia88956bea9f0b93e57a9ad4b21c54097409d41b6
 2016-06-08 17:14:27 +00:00
Tavis Bohne 63a0e39806 Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b 
am: f0a36952dc

Change-Id: I674e2feb8e4d5378765c6ebec371d76cef7d769a
 2016-06-08 17:09:03 +00:00
Tavis Bohne d112c795ac Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev 
am: 9de3ed279b

Change-Id: I2cd79e2d428e421b9159a9e7a665d536ee9b741b
 2016-06-08 17:03:13 +00:00
Tavis Bohne f0a36952dc Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev 
am: 9de3ed279b

Change-Id: I767e29fcbf808a84354b15a511a65f0a4a8a04ae
 2016-06-08 17:03:13 +00:00
Tavis Bohne 9de3ed279b Merge "Messenger refuses all file:///data/ uris" into nyc-dev 2016-06-08 16:46:45 +00:00
Bill Yi 85dc65d6fa Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp 
am: 6b96f314a3

* commit '6b96f314a39f7e7179259848d748ffd6ae05fe6b':

Change-Id: Ic08744dccb5c2dc70ed92c1b9a42674f90f4dea3
 2016-06-03 01:17:08 +00:00
Bill Yi 4c80c414c6 Bump targetSdkVersion to 24 am: f1210c127a am: 5159305b99 
am: 514b607a10

* commit '514b607a107356e896ac89159c4c17ce15e02f9a':
  Bump targetSdkVersion to 24

Change-Id: I56ca574dcf0d2d4c34d4cd9b03f3c571fbe3ae88
 2016-06-03 01:17:08 +00:00
Android Build Merger (Role) 6b96f314a3 Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp 2016-06-03 01:14:44 +00:00
Bill Yi 514b607a10 Bump targetSdkVersion to 24 am: f1210c127a 
am: 5159305b99

* commit '5159305b99d1b1e88687b4b17abb694fa884c8c2':
  Bump targetSdkVersion to 24

Change-Id: I32beacc80deacd958cc191f249638085d6a5b9af
 2016-06-03 01:14:33 +00:00
Bill Yi b3b3b18b4f Bump targetSdkVersion to 24 am: f1210c127a 
am: 4e106215ed

* commit '4e106215eda80700eb52c911111ec2e270c4114f':
  Bump targetSdkVersion to 24

Change-Id: Ib27bc29f75d428c39c8094182d42fcaa83f38ca0
 2016-06-03 01:14:33 +00:00
Bill Yi 5159305b99 Bump targetSdkVersion to 24 
am: f1210c127a

* commit 'f1210c127a4288aa53ec8dd3936a0077c63022eb':
  Bump targetSdkVersion to 24

Change-Id: I6481ab755cacb41adf9924f9d319afda4e28a293
 2016-06-03 01:10:05 +00:00
Bill Yi 4e106215ed Bump targetSdkVersion to 24 
am: f1210c127a

* commit 'f1210c127a4288aa53ec8dd3936a0077c63022eb':
  Bump targetSdkVersion to 24

Change-Id: I856f624362f64374ca8aa20186c665984d652657
 2016-06-03 01:10:04 +00:00
Bill Yi f1210c127a Bump targetSdkVersion to 24 
This will only affect AOSP build.

BUG:28621267
Change-Id: I13f47b838c743674d371901bed2bb7b0e2cfcfc2
 2016-06-02 16:23:08 -07:00
Tavis Bohne 41f3b673f1 Messenger refuses all file:///data/ uris 
We've been informed it's possible for an app to create a world
readable hardlink in L in its own /data directory that links to
another apps private data, including Messenger data. The hardlink
bypassed our existing checks. So now we simply refuse all file: uris
in the /data/ directory.
Other apps shouldn't be sending file uris anyway, and we dont know
of any that send file:///data/ uris.

Bug: 28793303
Change-Id: I778bb2bcb9e11185357093c59fc1fa3f6caa26a1
 2016-05-17 17:36:51 -07:00
Tavis Bohne db1c885d3f Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp 
am: d935ffe467

* commit 'd935ffe46778d26070ded89782853dd1ae59cc52':

Change-Id: I9a92aecb91d7dd4209a3128e418e2695017ab88c
 2016-05-16 18:23:50 +00:00
Tavis Bohne 6998dc5025 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 65e8a2d330 
am: 22e3fb6074

* commit '22e3fb607435e2c24c9d4430a2c4b8d693e3cb80':
  Messaging doesn't allow sharing of its own files

Change-Id: I61a467aa2debeb9a7feb10e753be8b472bca1195
 2016-05-16 18:23:50 +00:00
Android Build Merger (Role) d935ffe467 Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp 2016-05-16 18:21:28 +00:00
Tavis Bohne 22e3fb6074 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d 
am: 65e8a2d330

* commit '65e8a2d33005760f03bb0ca2c412332ab82f7413':
  Messaging doesn't allow sharing of its own files

Change-Id: I5b3a6ffadacd8da1c8db1a626f78ca2bc65a2f7e
 2016-05-16 18:21:17 +00:00
Tavis Bohne 505f79c39b Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d 
am: 0566cc6b9a

* commit '0566cc6b9a0db6a58034e3837adfbc9ba6ab762b':
  Messaging doesn't allow sharing of its own files

Change-Id: Ia4e2da91fa6479011d1966dd5d604211af416745
 2016-05-16 18:21:17 +00:00
Tavis Bohne 65e8a2d330 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev 
am: ca5fc9fa7d

* commit 'ca5fc9fa7dbba6cbab625d4a80f812b7206f0676':
  Messaging doesn't allow sharing of its own files

Change-Id: Ice1aa04a938f9ff14ac3b321344c34bfd152b1dc
 2016-05-16 18:18:56 +00:00
Tavis Bohne 0566cc6b9a Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev 
am: ca5fc9fa7d

* commit 'ca5fc9fa7dbba6cbab625d4a80f812b7206f0676':
  Messaging doesn't allow sharing of its own files

Change-Id: I812ae5e1b37611a69090e024a858c5813a4a155f
 2016-05-16 18:18:56 +00:00
Tavis Bohne ca5fc9fa7d Merge "Messaging doesn't allow sharing of its own files" into nyc-dev 2016-05-16 18:14:20 +00:00
Tony Mak 6eff90f076 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: 722c058dcc" into nyc-mr1-dev-plus-aosp 
am: d67bcb8597

* commit 'd67bcb8597acffc993cf8ee30173f2960b54e7cb':

Change-Id: Iae663ccffa315f422008667efc6d479b13725589
 2016-05-16 15:51:53 +00:00
Tony Mak 6ecbdf7893 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: b5fcc65e0d" into nyc-mr1-dev-plus-aosp 
am: 2672c4df38

* commit '2672c4df384576ef477e64fc38c40e3e529bae6b':
  Add badge icon for work contact in search result

Change-Id: I4fee26d64ec7e20d730d05c543e3479010d7e440
 2016-05-16 15:51:53 +00:00
Tony Mak 0f7d1fce31 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 9cd2bdf010" into nyc-mr1-dev-plus-aosp 
am: d5c6997677

* commit 'd5c6997677e483a6d04268be5d0fdd9bdbe1d932':

Change-Id: Iac2477bc340bc7b6788b387c3f0a406c9044f818
 2016-05-16 15:51:52 +00:00
Tony Mak b77733de19 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 50357f8877" into nyc-mr1-dev-plus-aosp 
am: f921d2f265

* commit 'f921d2f2656ddf8a983f7bd8280e0059be4a1e3e':
  Cleanup enterprise feature in ContactUtil

Change-Id: I86764be9d4df7e79d7498efdf83fb3adf9d45b4d
 2016-05-16 15:51:52 +00:00
Tony Mak 1e0af90eb8 Merge "Separate work and personal contacts search result am: 9045160771 am: 47037f9fef" into nyc-mr1-dev-plus-aosp 
am: a4a666c991

* commit 'a4a666c991b80d6a45cf627e264396a35523dd3e':

Change-Id: I86750e0c65eb30120d48e7bc50c0b457b836c701
 2016-05-16 15:51:52 +00:00
Tony Mak 41fb008773 Merge "Separate work and personal contacts search result am: 9045160771 am: 0ecb6b9a9b" into nyc-mr1-dev-plus-aosp 
am: ce8c016b14

* commit 'ce8c016b1483aae1a31ae37b0dfb246e3136c9cc':
  Separate work and personal contacts search result

Change-Id: I1829e4150b122db6e6092d133b179ca4377923f7
 2016-05-16 15:51:51 +00:00
Tony Mak a386736ad8 Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: f302d0cd2f" into nyc-mr1-dev-plus-aosp 
am: 2b7f72f705

* commit '2b7f72f7055eca895959e7efdd39cb450b7cc6f4':

Change-Id: If896cfe8caa57ce0d0ac5573b36d35ff59cfa8c2
 2016-05-16 15:51:51 +00:00
Tony Mak 527f6f09d8 Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: 3a1468db12" into nyc-mr1-dev-plus-aosp 
am: 62eb09d89e

* commit '62eb09d89e1a5da486818123deb4166d14bf4902':
  Search enterprise directory as well in SMS app

Change-Id: I406447201b20a0b1c1a0aaf29ba6b26fb8e234cc
 2016-05-16 15:51:51 +00:00
Victor Chang ec815c6612 Merge "Add isAtLeastN in OsUtil am: 0a85b81c9f am: 0e2ee3d3e6" into nyc-mr1-dev-plus-aosp 
am: 9b8c9555e6

* commit '9b8c9555e60bd28a9e3444d4e22b4f3f81f21332':

Change-Id: I4c1ec3a882678e7398374d488747216999497547
 2016-05-16 15:51:50 +00:00
Victor Chang 0fd74ad1a0 Add isAtLeastN in OsUtil am: 0a85b81c9f am: 53103d0433 
am: 07ceb80aa7

* commit '07ceb80aa713a5d20acd49fed758daefcbaa8f2a':
  Add isAtLeastN in OsUtil

Change-Id: Ia339cbd179e30bae3dcbc315b6771b84f31b8660
 2016-05-16 15:51:50 +00:00
Android Build Merger (Role) d67bcb8597 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: 722c058dcc" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:06 +00:00
Android Build Merger (Role) 2672c4df38 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: b5fcc65e0d" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:05 +00:00
Android Build Merger (Role) d5c6997677 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 9cd2bdf010" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:02 +00:00
Android Build Merger (Role) f921d2f265 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 50357f8877" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:01 +00:00
Android Build Merger (Role) a4a666c991 Merge "Separate work and personal contacts search result am: 9045160771 am: 47037f9fef" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:50 +00:00
Android Build Merger (Role) ce8c016b14 Merge "Separate work and personal contacts search result am: 9045160771 am: 0ecb6b9a9b" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:46 +00:00
Android Build Merger (Role) 2b7f72f705 Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: f302d0cd2f" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:43 +00:00