filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,214 Commits 1 Branch 0 Tags
5b110f95e9736d7a641c3eabc86f34c3f64e682d
Commit Graph
42 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Mak bb8d1f10eb Merge \\\"Merge remote-tracking branch \\\'goog/nyc-mr1-dev\\\' into aosp/master\\\" into stage-aosp-master am: c3b3f3d8f1 am: 323fb1e22f 
am: 4b73fb0532

Change-Id: Ib383ed38cd72c88a477e750ad626142f9ad85b79
 2016-06-30 23:14:53 +00:00
Tony Mak 4b73fb0532 Merge \\"Merge remote-tracking branch \\'goog/nyc-mr1-dev\\' into aosp/master\\" into stage-aosp-master am: c3b3f3d8f1 
am: 323fb1e22f

Change-Id: I23d0312277b2204ec7eccb5204024fbd42979dbf
 2016-06-30 23:10:05 +00:00
Tony Mak 323fb1e22f Merge \"Merge remote-tracking branch \'goog/nyc-mr1-dev\' into aosp/master\" into stage-aosp-master 
am: c3b3f3d8f1

Change-Id: Ia7a15a8fa54b6d995f3a65f04ca4413f930d03d2
 2016-06-30 23:06:22 +00:00
Tony Mak c3b3f3d8f1 Merge "Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master" into stage-aosp-master 2016-06-30 22:56:11 +00:00
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 e4e982add9 Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master 2016-06-29 20:11:17 +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
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
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
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
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
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
Tony Mak b7fc988f23 Search enterprise directory as well in SMS app 
TODO: Update the UI to show enterprise result separately (b/26021888)

Bug: 28016344, 25977180
(cherry picked from commit 5c621e57256f5068a43f1456f9bab1194f0d27b2)

Change-Id: I7130ae5e057ed750a29f64c5497a04b868613579
 2016-05-16 16:34:24 +01:00