188280 Commits

Author SHA1 Message Date
Prerepa Viswanadham
96c8129985 Merge "Merge commit '998fb19' into merge_work" 2015-04-12 21:42:23 +00:00
Clara Bayarri
28e7ba6644 Merge "Show and trigger activities that implement Text Processing actions" 2015-04-12 19:46:42 +00:00
Jay Shrauner
7576a39b55 Hide Voicemails.{insert, deleteAll, setStatus}
Bug:20162722
Change-Id: Idbd9a643c4870b48ee1230e344717f50507936d8
2015-04-11 20:09:54 -07:00
Andrew Lee
8581b67e6c Merge "Suffix VT_LOCAL and VT_REMOTE with BIDIRECTIONAL." 2015-04-11 21:17:26 +00:00
Andrew Lee
9a8f9ce7ad Suffix VT_LOCAL and VT_REMOTE with BIDIRECTIONAL.
Bug: 20160395
Change-Id: Ieb35f7b8a91022bae899b3fc093065c36d2d68c8
2015-04-11 14:15:29 -07:00
Jay Shrauner
cf60d9f581 Merge "Add constructor without zoom" 2015-04-11 21:05:36 +00:00
Jay Shrauner
85d3eec2d4 Add constructor without zoom
Add constructor without zoom params. Reorder params in constructor
with zoom to move zoom params to the end of the param list (API
guidelines). Reorder code to match param ordering. Tag all zoom related
methods with @hide.

Bug:20160534
Change-Id: Ic2149af82a5450666c49b8757daf6950bcb68977
2015-04-11 12:54:35 -07:00
Jim Miller
ce7eb6daf0 Clean up FingerprintManager API and make it public.
Change-Id: I6a99dccd485c053cb47dbd0ec08b41a2dc5b17c8
2015-04-11 12:34:56 -07:00
Jeff Sharkey
6036cd5126 Merge "Support moving apps to expanded storage." 2015-04-11 15:55:27 +00:00
Geoff Mendal
7c622e9906 am dd804d90: (-s ours) am 55295c76: (-s ours) am 08c21adc: (-s ours) Import translations. DO NOT MERGE
* commit 'dd804d908df04deba60e7f2021df1d7abbdd7d85':
  Import translations. DO NOT MERGE
2015-04-11 10:19:38 +00:00
Geoff Mendal
dd804d908d am 55295c76: (-s ours) am 08c21adc: (-s ours) Import translations. DO NOT MERGE
* commit '55295c76fd43930da196f4275c9f6e27b756692c':
  Import translations. DO NOT MERGE
2015-04-11 10:08:46 +00:00
Geoff Mendal
cab74631fa am 3de3bb22: (-s ours) Import translations. DO NOT MERGE
* commit '3de3bb22a6bdbe47aedbebca7a61bf25dfc1bc9c':
  Import translations. DO NOT MERGE
2015-04-11 10:04:05 +00:00
Geoff Mendal
55295c76fd am 08c21adc: (-s ours) Import translations. DO NOT MERGE
* commit '08c21adc91058e97ee6761cfd3a250b64f567d39':
  Import translations. DO NOT MERGE
2015-04-11 09:59:00 +00:00
Geoff Mendal
8b146fbe77 Merge "Import translations. DO NOT MERGE" 2015-04-11 09:52:18 +00:00
Geoff Mendal
3183c6c523 Merge "Import translations. DO NOT MERGE" 2015-04-11 09:49:28 +00:00
Geoff Mendal
330b52aafc Merge "Import translations. DO NOT MERGE" 2015-04-11 09:47:40 +00:00
Geoff Mendal
56c58d6879 Import translations. DO NOT MERGE
Change-Id: Iaebefb272463a798e6057611906a5a935ebf1258
Auto-generated-cl: translation import
2015-04-11 01:32:58 -07:00
Geoff Mendal
b85f308da0 Import translations. DO NOT MERGE
Change-Id: I5b2374a7fbcf6354c1a5a20a30ecf1d3c5f70ae1
Auto-generated-cl: translation import
2015-04-10 23:25:52 -07:00
Geoff Mendal
3de3bb22a6 Import translations. DO NOT MERGE
Change-Id: Ia69d7347d0e753efa924d1b61b416b08affa3329
Auto-generated-cl: translation import
2015-04-10 23:14:36 -07:00
Andy Hung
00b9bcda8a Merge "Add channel index mask to AudioTrack and AudioFormat" 2015-04-11 06:13:14 +00:00
Geoff Mendal
4f6c8f91ac Import translations. DO NOT MERGE
Change-Id: I6c5f88b8d34fba331ba0c8964abfcc2546f39206
Auto-generated-cl: translation import
2015-04-10 23:12:02 -07:00
Geoff Mendal
08c21adc91 Import translations. DO NOT MERGE
Change-Id: I239fc7724d745a1abbac73e673ecfe408ce17c9b
Auto-generated-cl: translation import
2015-04-10 23:07:04 -07:00
Geoff Mendal
fff84a87e1 Import translations. DO NOT MERGE
Change-Id: I4be4f944cd8c87529e04aa4c8e19198020c1b262
Auto-generated-cl: translation import
2015-04-10 23:01:52 -07:00
Andy Hung
4ef1305aa8 Merge "Add floating point AudioRecord read" 2015-04-11 05:44:23 +00:00
Alex Klyubin
0e67d0a1b0 am 651dbfde: am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit '651dbfde73171ad6451dc8f9288fa4df50f99e4c':
  Add EcIesParameterSpec to enable ECIES crypto.
2015-04-11 02:56:44 +00:00
Alex Klyubin
651dbfde73 am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit 'ad48c4c9c194d66dcc96e74e906825ca7b550e24':
  Add EcIesParameterSpec to enable ECIES crypto.
2015-04-11 02:45:17 +00:00
David Friedman
ea51127bcb am d34b20e9: am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit 'd34b20e957f66e113e7d39e253d69450545b5961':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:43:27 +00:00
Qiwen Zhao
f2834c12a3 Merge "remove data-binding from base/tools. it should not be here since it depends on support lib." 2015-04-11 02:42:43 +00:00
Alex Klyubin
ad48c4c9c1 am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit 'c1c6528d2b686d5a17e577e7864a319dcba7c224':
  Add EcIesParameterSpec to enable ECIES crypto.
2015-04-11 02:35:45 +00:00
David Friedman
d34b20e957 am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit 'a22125ff98085c0fe662966cadfe4c889707db54':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:27:01 +00:00
Svetoslav
6435d00e11 Merge "First pass on the new permission grouping." 2015-04-11 02:24:15 +00:00
Alex Klyubin
c1c6528d2b Merge "Add EcIesParameterSpec to enable ECIES crypto." 2015-04-11 02:17:01 +00:00
David Friedman
a22125ff98 am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '23b5e508adfb454552fda16d76d65b070a53f759':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:15:48 +00:00
Adam Lesinski
d8d07f1757 Merge "AAPT2: Create Makefile" 2015-04-11 02:10:32 +00:00
Adam Lesinski
c7e2432dec AAPT2: Create Makefile
Makefile that uses zip for assembling the final APK. This is temporary and
helps speed up the rest of development.

Has to add a new 'manifest' phase that simply compiles the AndroidManifest.xml.
Manifests are handled differently and must be validated.

Change-Id: I0d8255b3ad0d0b0a322683077e3331ca93e37fa0
2015-04-10 19:07:51 -07:00
Fabrice Di Meglio
30ca50a3dd Merge "Add Default Browser App support and relax Hosts validation for AppLinks" 2015-04-11 02:07:39 +00:00
David Friedman
23b5e508ad am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '340a617ef42951446bbc730833cea207370307d0':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:05:57 +00:00
David Friedman
340a617ef4 am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '746fed63567c548c7b55c14e1532d059753bfa52':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 01:55:32 +00:00
David Friedman
746fed6356 am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 01:46:19 +00:00
David Friedman
3a77a8aeea Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 2015-04-11 01:36:57 +00:00
Svetoslav
61a4dd5c66 First pass on the new permission grouping.
1. Defining the new permission groups and moving relevant permissions
   to these groups.

2. Removed some permissions that were guading ... nothing and old
   permission groups.

3. Removing unnecessary comments for siganture and system permissions
   as they are no surfaced to the user.

Change-Id: Ibd7e6bb22b3559a4febb37c39326350eeb4285bd
2015-04-10 18:34:32 -07:00
Svetoslav
975ab5c0f0 Merge "Add a mechanism to make pending intents immutable." 2015-04-11 01:30:46 +00:00
Svetoslav
b0a78390ed Add a mechanism to make pending intents immutable.
bug:19618745

Change-Id: Ice742e0162cb9b7c0afbc32e0eea03d501666e2b
2015-04-10 18:19:03 -07:00
Fabrice Di Meglio
6227172310 Add Default Browser App support and relax Hosts validation for AppLinks
- add private PackageManager APIs for setting/getting the default
Browser App package name
- serialize / deserialize the default Browser App package name per User

Also relax the Hosts name validation for the AppLinls feature. Now we
just care if the IntentFilter is having an HTTP or HTTPS scheme.

Change-Id: I4436f66ac6beff57e14f7f3a2a00b0b582c03be9
2015-04-10 17:54:02 -07:00
Andy Hung
a9470c19a9 Add channel index mask to AudioTrack and AudioFormat
Change-Id: Ia5faa56360edcbbdeae8838ec0f82386f4e5e640
2015-04-10 17:41:00 -07:00
Fabrice Di Meglio
69010094aa Merge "Add IntentFilter auto verification - part 6" 2015-04-11 00:23:04 +00:00
Eino-Ville Talvala
dddc56660a Merge "Revert "Revert "Camera2: Add camera pose and distortion fields""" 2015-04-10 23:54:39 +00:00
Wei Jia
dfb0e6236b MediaSync: fix a typo.
Bug: 19666434
Change-Id: I31e959f49d2539e11a9f23f9f9d7eb785ec08512
2015-04-10 16:48:14 -07:00
George Mount
06ecdc1a0c Fix transition not properly removing targets on completion.
Bug 19770911

The enter transition was adding the non-existent View to its
list of entering Views, but was removed from the transition
improperly so that the comparison of Views formed a mismatch.

Change-Id: Iccaf5fb48e8fb5931efd75a0cd3a0b3dbcea28b6
2015-04-10 16:36:38 -07:00
Fyodor Kupolov
2e29aa5ea7 Merge "Added getUserCreationTime to query user/profile creation time" 2015-04-10 23:33:29 +00:00