Commit Graph

1476 Commits

Author SHA1 Message Date
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
40e42a23b8 Fix misc-macro-parentheses warnings. am: 418442d5b6 am: 8264875e93 am: 49a06d1efd
am: 3c8c6408c5

* commit '3c8c6408c50e47443483bcd928453a697f5ab97c':
  Fix misc-macro-parentheses warnings.

Change-Id: Ic5b1a8a9aa43dca4ab481340cbb80354c66529de
2016-05-12 18:30:05 +00: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
Tavis Bohne
30fb338539 Messaging doesn't allow sharing of its own files
-Previously, Messaging allowed sharing of any file it had permission
 to reach. This meant that bad apps could share a link to
 file:///data/data/com.android.messaging/databases/bugle_db
 and Messaging would happily send all this sensitive information to
 the target. Worse, a bad app could share a softlink to this file,
 where the symlink was picture.jpg with the image/jpg type.
-Now, when sanitizing attachments, we make sure any filepaths don't
 lead to any Bugle-specific directories.
-getApplicationInfo().dataDir is a symlink to
 /data/data/com.android.messaging, and appears to be the
 only directory where we store personal data.
-Most apps share as contentUris, including Messaging, so Messaging
 can still share to itself.

Change-Id: Ic464bc1f099029a030793c478aaf88b957d8bad1
Fixes:28076752
2016-04-29 14:39:59 -07:00
Shinichiro Hamaji
acac0335af Let Messaging dex depend on proguard flag file am: aa7dc68 am: 6cedb61
am: 1c21572

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

Change-Id: I61dd43a40bf122a40652f02ff4f753066188f190
2016-04-15 04:42:36 +00: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
03efc62fe9 Match the minimum version in the manifest. am: fc922a1 am: 0a0a7cf
am: e2d30a7

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

Change-Id: I14101e7a6162f189ed805e28890dff94e51f8c13
2016-03-30 19:08:22 +00: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
Delphine Martin
83eba641b2 Put back @interface in proguard flags
This was a workaround when @interface was not supported.
Bug: 27217036

Change-Id: Iaa96fd9ffc2a39994a3177caa8d9da5dcfc6c91e
2016-03-11 16:29:28 +01:00
Yohann Roussel
e3c075741c Revert "Pin messaging to use Jack with 1.7 language"
am: f77da20064

* commit 'f77da20064d36e65be9a33194230d05d69905368':
  Revert "Pin messaging to use Jack with 1.7 language"
2016-02-26 16:50:02 +00:00
Yohann Roussel
a427410c27 Revert "Pin messaging to use Jack with 1.7 language"
am: 49528d492f

* commit '49528d492f5074a8f8994f4687208f7decc4267c':
  Revert "Pin messaging to use Jack with 1.7 language"
2016-02-26 16:48:57 +00:00
Yohann Roussel
49528d492f Revert "Pin messaging to use Jack with 1.7 language"
This reverts commit 445d7baabc.

Bug: 27333568
Bug: 27305482
Bug: 26753820
Change-Id: I44c126c3a54de332c0032e1d7d158f95099bfc03
2016-02-26 15:26:55 +00:00
Yohann Roussel
f77da20064 Revert "Pin messaging to use Jack with 1.7 language"
This reverts commit ef3cc713d4.

Bug: 27333568
Bug: 27305482
Bug: 26753820
Change-Id: I696102ce7aba6ba01f95abd2c9705fb448499856
2016-02-26 15:26:22 +00:00
Neil Fuller
ee9f485743 Pin messaging to use Jack with 1.7 language
am: ef3cc713d4

* commit 'ef3cc713d4dc47a2d6a7539afdddab84a67a9ced':
  Pin messaging to use Jack with 1.7 language
2016-02-23 15:18:17 +00:00
Neil Fuller
ef3cc713d4 Pin messaging to use Jack with 1.7 language
There is a bug in the current version of Jack
that causes problems when the default is changed to
1.8. Pinning to 1.7 appears to help.

Bug: 27305482
Bug: 26753820
(cherry picked from commit 445d7baabc)

Change-Id: I178ef57bc29cb49064db08d06d501d6aed09c26f
2016-02-23 15:01:55 +00:00
Neil Fuller
74a1b3b022 Pin messaging to use Jack with 1.7 language
am: 445d7baabc

* commit '445d7baabc65ffec355e47d0452bafa0f6804923':
  Pin messaging to use Jack with 1.7 language
2016-02-23 15:01:50 +00:00
Neil Fuller
445d7baabc Pin messaging to use Jack with 1.7 language
There is a bug in the current version of Jack
that causes problems when the default is changed to
1.8. Pinning to 1.7 appears to help.

Bug: 27305482
Bug: 26753820
Change-Id: Ia29bf5cb14c754be4c4b453aa89a9d9c369d9e52
2016-02-23 12:00:42 +00:00
Yohann Roussel
62611a87b2 Re-enable Jack for Messaging and its tests
am: 280a2fbe41

* commit '280a2fbe41f24eed11fcf5e13b803de17525b261':
  Re-enable Jack for Messaging and its tests
2016-02-22 13:10:18 +00:00
Yohann Roussel
280a2fbe41 Re-enable Jack for Messaging and its tests
Jack was disabled because of bugs in Jack and missing support for testing
obfuscated applications. Both are now fixed so Jack can be enabled.

Bug: 27215871

(cherry picked from commit bf6bd40faa)

Change-Id: I73d3c5a3599640932b2305ffe22bb5ef27814ba3
2016-02-22 11:54:35 +01:00
Yohann Roussel
f002b6109d Re-enable Jack for Messaging and its tests
am: bf6bd40faa

* commit 'bf6bd40faa264ec2727a4b23e6e4b72815ec5518':
  Re-enable Jack for Messaging and its tests
2016-02-19 08:57:42 +00:00
Yohann Roussel
bf6bd40faa Re-enable Jack for Messaging and its tests
Jack was disabled because of bugs in Jack and missing support for testing
obfuscated applications. Both are now fixed so Jack can be enabled.

Bug: 27215871

Change-Id: I7c437906fe78e1a97204f5e26059966198b15ac1
2016-02-17 16:36:07 +01:00
Ye Wen
ec2fe3006b Remove "_" variable for Java 8
b/27045502

Change-Id: I7ce2bb262fdc2b64f2c6b3cb629a2ec93450b265
2016-02-09 23:33:14 +00:00
Ye Wen
372e48607e Change "Touch" to "Tap"
b/26749422

Change-Id: I2ca48f7534bf18344a4e6d85470543d23b3dfa5c
2016-01-29 14:39:34 -08:00
Dan Willemsen
1b16e2dc16 Don\'t add BUILD_NUMBER to version for platform builds am: cc3d547961
am: 0c38f114c1

* commit '0c38f114c11a3828a2a3c114720b4a62be391cf4':
  Don't add BUILD_NUMBER to version for platform builds
2015-10-29 21:42:04 +00:00
Dan Willemsen
0c38f114c1 Don\'t add BUILD_NUMBER to version for platform builds
am: cc3d547961

* commit 'cc3d547961bf9115821c50ab616286a261e5d4fc':
  Don't add BUILD_NUMBER to version for platform builds
2015-10-29 21:33:35 +00:00
Dan Willemsen
cc3d547961 Don't add BUILD_NUMBER to version for platform builds
We're removing differences between two builds that have the same source.
These builds will have different BUILD_NUMBERs though, so it shouldn't
be embedded in the binary.

For eng builds, using the current date forces the APK to be rebuilt
every time the makefiles are read. Remove this for platform builds, but
keep it if building unbundled.

Bug: 24201956
Change-Id: I8c0ad93e817c74c69b8d8156d4727952b08024d4
2015-10-28 23:49:32 +00:00
Ye Wen
3e2d132d22 am 12fc4d9e: am 1bc27610: Theme colored ic_preview_pause and ic_preview_play icons
* commit '12fc4d9e781b613007d597b396ca221ca7d9944a':
  Theme colored ic_preview_pause and ic_preview_play icons
2015-09-03 04:34:46 +00:00