filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95 Commits 1 Branch 0 Tags
d67bcb8597acffc993cf8ee30173f2960b54e7cb
Commit Graph

95 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chih-Hung Hsieh
3c8c6408c5 Fix misc-macro-parentheses warnings. am: 418442d5b6 am: 8264875e93 
am: 49a06d1efd

* commit '49a06d1efd0a9a0b076980d172e2e7af2cd09b33':
  Fix misc-macro-parentheses warnings.

Change-Id: I7d6d9f7a31ab7e6d2ba5ba87f46a980fdf091718
 2016-05-12 18:27:37 +00:00
Chih-Hung Hsieh
49a06d1efd Fix misc-macro-parentheses warnings. am: 418442d5b6 
am: 8264875e93

* commit '8264875e93eddd54b9287c2e2847b0cdf1e6f016':
  Fix misc-macro-parentheses warnings.

Change-Id: Id4ec628eb24aeda0d5474773d25fbd09edd8f76c
 2016-05-12 18:25:07 +00:00
Chih-Hung Hsieh
8264875e93 Fix misc-macro-parentheses warnings. 
am: 418442d5b6

* commit '418442d5b67a27c7aecf07a726948ea0b51d9bc1':
  Fix misc-macro-parentheses warnings.

Change-Id: I7d03ca51e756a6f7416809cda92f208a23644309
 2016-05-12 18:22:40 +00:00
Chih-Hung Hsieh
418442d5b6 Fix misc-macro-parentheses warnings. 
Bug: 28705665
Change-Id: Idc06e53ca8e25c44de63e7b2f4c465da7f4df65b
 2016-05-12 10:20:09 -07:00
Victor Chang
0a85b81c9f Add isAtLeastN in OsUtil 
Bug: 28016344
Change-Id: I431b4fed3f2114d1f1b311416a892f608a846e4c
 2016-05-11 18:07:38 +01:00
Shinichiro Hamaji
1c21572b50 Let Messaging dex depend on proguard flag file am: aa7dc68 
am: 6cedb61

* commit '6cedb6134fb7c4cc701912a919b25273cb46e10c':
  Let Messaging dex depend on proguard flag file

Change-Id: Iaeffaba197f17125803ad102416a89979350f69f
 2016-04-15 04:37:08 +00:00
Shinichiro Hamaji
6cedb6134f Let Messaging dex depend on proguard flag file 
am: aa7dc68

* commit 'aa7dc685efb6ce80633b88d30f3b788a2c849452':
  Let Messaging dex depend on proguard flag file

Change-Id: I94d0d52cd46a8d77d00619b79d00fd21eea22982
 2016-04-15 04:34:38 +00:00
Shinichiro Hamaji
aa7dc685ef Let Messaging dex depend on proguard flag file 
The dex file will have the proguard flag file as an input
after this change.

Bug: 27954979
Change-Id: Ib584a38a6e8c6b744d604392de955cc3e928a040
 2016-04-14 15:21:51 +09:00
Dan Albert
e2d30a709f Match the minimum version in the manifest. am: fc922a1 
am: 0a0a7cf

* commit '0a0a7cf815af48d589d480c03ad9277e41291dfb':
  Match the minimum version in the manifest.

Change-Id: Ifb35c42f8d7171d8fb81ad9187de124b69428597
 2016-03-30 19:04:15 +00:00
Dan Albert
0a0a7cf815 Match the minimum version in the manifest. 
am: fc922a1

* commit 'fc922a1f53193535d16cdb6c50d24bb1ad862229':
  Match the minimum version in the manifest.

Change-Id: Ia21710004fd08a0c57c77301045c910fe27c5353
 2016-03-30 18:41:31 +00:00
Dan Albert
fc922a1f53 Match the minimum version in the manifest. 
Change-Id: Iab7d34552df5cf3830ec03c36872879b9ba28d7e
 2016-03-22 14:20:17 -07:00
Tom Taylor
1f71793a90 Messaging app ClassCastException (DecorContext -> Activity) when SMSoIMS is initiated 
am: 7fe2fc9

* commit '7fe2fc9b2fa68bfcbabddaa96c04972bf5d297ba':
  Messaging app ClassCastException (DecorContext -> Activity) when SMSoIMS is initiated
 2016-03-21 21:03:49 +00:00
Tom Taylor
7fe2fc9b2f Messaging app ClassCastException (DecorContext -> Activity) when SMSoIMS is initiated 
Bug 27649619

Change-Id: I1c0de7c14abd255ceb9d61a377db3276c32fede0
 2016-03-21 13:44:13 -07:00
Delphine Martin
419c542354 Merge "Put back @interface in proguard flags" 
am: f774983a5d

* commit 'f774983a5d084805c48947f1b3a9921209ff1bca':
  Put back @interface in proguard flags
 2016-03-15 08:46:57 +00:00
Delphine Martin
f774983a5d Merge "Put back @interface in proguard flags" 2016-03-15 08:36:07 +00:00
Dan Albert
713c1a76d7 Stop targeting Froyo. 
am: 374af0d0d0

* commit '374af0d0d04c5c4baaa2fde328c6795a0a9a76e2':
  Stop targeting Froyo.
 2016-03-11 20:12:14 +00:00
Dan Albert
374af0d0d0 Stop targeting Froyo. 
Froyo isn't supported any more.

Change-Id: I0008ad0273b2aa31ca523fdedd64437bf76c5cbe
 2016-03-11 11:57:05 -08:00