filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117 Commits 1 Branch 0 Tags
db1c885d3f9d9cba36bacb1a3edcafd162ab9ca8
Commit Graph
117 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android Build Merger (Role) 62eb09d89e Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: 3a1468db12" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:41 +00:00
Android Build Merger (Role) 9b8c9555e6 Merge "Add isAtLeastN in OsUtil am: 0a85b81c9f am: 0e2ee3d3e6" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:40 +00:00
Tony Mak 4f8f430421 Add badge icon for work contact in search result am: c4073ff4ce 
am: b5fcc65e0d

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

Change-Id: Ib1ab14584de17ccccafb965656bccb27fc711310
 2016-05-16 15:47:13 +00:00
Tony Mak a7a3397f79 Add badge icon for work contact in search result am: c4073ff4ce 
am: 722c058dcc

* commit '722c058dcc5109d02af494063db16b17a628b612':
  Add badge icon for work contact in search result

Change-Id: Ic0f03c0da15ed8c4107790ba50cdca073ddee5dc
 2016-05-16 15:47:12 +00:00
Tony Mak 2a97575950 Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 
am: 50357f8877

* commit '50357f88777b53df966da225f38eec1af65dfde9':
  Cleanup enterprise feature in ContactUtil

Change-Id: I4feefa7d568db67a852b2d9a0c51d7fa7bb0c9a4
 2016-05-16 15:47:12 +00:00
Tony Mak 3287960748 Separate work and personal contacts search result am: 9045160771 
am: 0ecb6b9a9b

* commit '0ecb6b9a9be10c711de753432c1a9f4f8e65eacc':
  Separate work and personal contacts search result

Change-Id: Ia900e937e25d10370a8d4eb2d6f08b793594aac3
 2016-05-16 15:47:12 +00:00
Tony Mak d03b45a161 Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 
am: 9cd2bdf010

* commit '9cd2bdf010086e5b2bd1f4a4f5edaac77da1e101':
  Cleanup enterprise feature in ContactUtil

Change-Id: I8db4a01a1a9981682344ebebb8c87f4b4fb70aff
 2016-05-16 15:47:11 +00:00
Tony Mak 6c9f3ea029 Separate work and personal contacts search result am: 9045160771 
am: 47037f9fef

* commit '47037f9fef1abf08c513983e9f73e39d82bcd32d':
  Separate work and personal contacts search result

Change-Id: Ib1f05e7e9876991e765fbe0c69c89bccecdc5e7a
 2016-05-16 15:47:11 +00:00
Tony Mak ebf0a2c115 Search enterprise directory as well in SMS app am: b7fc988f23 
am: f302d0cd2f

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

Change-Id: I7b5dff608263837be8fa8d342bab2d00a4a9ab1f
 2016-05-16 15:47:11 +00:00
Victor Chang d720dde345 Add isAtLeastN in OsUtil am: 0a85b81c9f 
am: 0e2ee3d3e6

* commit '0e2ee3d3e6d4f03249eafae3ac92f11d729cea34':
  Add isAtLeastN in OsUtil

Change-Id: I352f7b2366410def5759e29e09e9e9aaf80d384a
 2016-05-16 15:47:11 +00:00
Tony Mak 79865afd38 Search enterprise directory as well in SMS app am: b7fc988f23 
am: 3a1468db12

* commit '3a1468db129425744078f6267d7f10ad1c13641f':
  Search enterprise directory as well in SMS app

Change-Id: Icde0b42786cf8b7e7149af4d81f9237ae6c6ddee
 2016-05-16 15:47:10 +00:00
Victor Chang 07ceb80aa7 Add isAtLeastN in OsUtil am: 0a85b81c9f 
am: 53103d0433

* commit '53103d043362668e4773ed45cae5777fef24bfbb':
  Add isAtLeastN in OsUtil

Change-Id: I3a2530cdbfa0b34610e6c58a011d89e15e993df9
 2016-05-16 15:47:08 +00:00
Tony Mak 722c058dcc Add badge icon for work contact in search result 
am: c4073ff4ce

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

Change-Id: I8a9556c786697c69af468c62a7d5a658ba87100d
 2016-05-16 15:43:55 +00:00
Tony Mak b5fcc65e0d Add badge icon for work contact in search result 
am: c4073ff4ce

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

Change-Id: Ie4a51a7aa9951de718f8ea7fe5c10f345ae5163c
 2016-05-16 15:43:54 +00:00
Tony Mak 50357f8877 Cleanup enterprise feature in ContactUtil 
am: e2ccf8bff5

* commit 'e2ccf8bff59da2b54fb037557ad93fc4c317c506':
  Cleanup enterprise feature in ContactUtil

Change-Id: Idedfcf20197c714451a6f67df8b5fcdf86af80d1
 2016-05-16 15:43:54 +00:00
Tony Mak 9cd2bdf010 Cleanup enterprise feature in ContactUtil 
am: e2ccf8bff5

* commit 'e2ccf8bff59da2b54fb037557ad93fc4c317c506':
  Cleanup enterprise feature in ContactUtil

Change-Id: I49fb7f06d7d1bb6f78fb4f17eb8ae3d572d76778
 2016-05-16 15:43:54 +00:00
Tony Mak 47037f9fef Separate work and personal contacts search result 
am: 9045160771

* commit '904516077182cce4ce71a51b27a3ab418ed0f225':
  Separate work and personal contacts search result

Change-Id: I302cac2ded10c1945fb708996809a15cc8cebd28
 2016-05-16 15:43:54 +00:00
Tony Mak 0ecb6b9a9b Separate work and personal contacts search result 
am: 9045160771

* commit '904516077182cce4ce71a51b27a3ab418ed0f225':
  Separate work and personal contacts search result

Change-Id: If1f5c282aca32add01002303d5f5912ae5b3aa85
 2016-05-16 15:43:53 +00:00
Tony Mak f302d0cd2f Search enterprise directory as well in SMS app 
am: b7fc988f23

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

Change-Id: I8f0facc0665d9c68e1afdd49c89cc7ccd2c56515
 2016-05-16 15:43:53 +00:00
Tony Mak 3a1468db12 Search enterprise directory as well in SMS app 
am: b7fc988f23

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

Change-Id: Ie22b0b974985251ce6fd34c57b8316e9529a1057
 2016-05-16 15:43:53 +00:00
Victor Chang 53103d0433 Add isAtLeastN in OsUtil 
am: 0a85b81c9f

* commit '0a85b81c9f15f72e7284a8ff40f1ba73d7469b58':
  Add isAtLeastN in OsUtil

Change-Id: I1228ea3876d08e69e438c87809a08bbd9ea60cc9
 2016-05-16 15:43:53 +00:00
Victor Chang 0e2ee3d3e6 Add isAtLeastN in OsUtil 
am: 0a85b81c9f

* commit '0a85b81c9f15f72e7284a8ff40f1ba73d7469b58':
  Add isAtLeastN in OsUtil

Change-Id: Ia5ba6ffdd48b1074dc6d437954203bdbbf93d25e
 2016-05-16 15:43:52 +00:00
Tony Mak c4073ff4ce Add badge icon for work contact in search result 
BUG=26021888
BUG=28016344
(cherry picked from commit 6e00763823cd1b27ff88d25d0eb11f8addc3b2e6)

Change-Id: If0e2f7b1c58cd064ebfdae8a9b735b391c5009fc
 2016-05-16 16:35:06 +01:00
Tony Mak e2ccf8bff5 Cleanup enterprise feature in ContactUtil 
1. Remove isWorkProfileSupported checking, api level checking is enough.
2. Replace the hardcoded uri with the corresponding api.

BUG=26797244
BUG=28016344
(cherry picked from commit 0d7a1cce157e4ffb26d5fefb9908bbeffcb1d03c)

Change-Id: I76edad19dc6a19aa77b523cb960f716fca08944d
 2016-05-16 16:34:58 +01:00
Tony Mak 9045160771 Separate work and personal contacts search result 
This change allows sms app to show search result of different directories
in different partitions.
Currently, only personal default and enterprise default directory are
searched.

BUG=26021888
BUG=28016344
(cherry picked from commit 59666b32c192bd28807ccd2f9153c796668bdf13)

Change-Id: I733ceaae806d13661861126ce61c34108ac7e662
 2016-05-16 16:34:43 +01:00