Commit Graph

154382 Commits

Author SHA1 Message Date
Joe Fernandez
56a8cb7fd1 am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '5c0ed74b3886c5765c576e9e427b93c76b37635a':
  docs: Update timing of Android Wear app review
2014-10-28 19:22:45 +00:00
David Friedman
b648cabadf am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit 'b2d582d995622cc8379603cfadae7ee6d4163b3e':
  Updates Notifications screenshot for Android 5.0.
2014-10-28 19:22:40 +00:00
Eric Gilmore
77760e753e am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
  Docs: Adding Android Studio instructions for adding IAB service.
2014-10-28 19:22:37 +00:00
Quddus Chong
eb07af2ced am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
2014-10-28 19:22:15 +00:00
Ricardo Cervera
be07f2a853 am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents
* commit 'f4e32145a214b28522d67e748c0eff74aa915bf6':
  docs: Add SearchXonY to Common Intents
2014-10-28 19:22:11 +00:00
Joe Fernandez
5c0ed74b38 am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
  docs: Update timing of Android Wear app review
2014-10-28 18:15:33 +00:00
David Friedman
b2d582d995 am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '3c00bc01f9c6e82a0859201f74237998b24872da':
  Updates Notifications screenshot for Android 5.0.
2014-10-28 18:15:28 +00:00
Eric Gilmore
9a6aa0ffa4 am d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit 'd126294a8f954fb758d3f67bc5271014748ba9e7':
  Docs: Adding Android Studio instructions for adding IAB service.
2014-10-28 18:15:24 +00:00
Quddus Chong
6face8a04c am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
2014-10-28 18:15:20 +00:00
Ricardo Cervera
f4e32145a2 am 61fcad92: docs: Add SearchXonY to Common Intents
* commit '61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
  docs: Add SearchXonY to Common Intents
2014-10-28 18:15:17 +00:00
Joe Fernandez
40bf63e0f0 Merge "docs: Update timing of Android Wear app review" into lmp-docs 2014-10-28 03:25:40 +00:00
Joe Fernandez
a3c9be01e8 docs: Update timing of Android Wear app review
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
2014-10-27 20:22:52 -07:00
David Friedman
3c00bc01f9 Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 2014-10-28 02:51:32 +00:00
David Friedman
576a4b7371 Updates Notifications screenshot for Android 5.0.
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
2014-10-27 19:29:45 -07:00
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
2014-10-27 19:19:22 -07:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
2014-10-28 00:52:56 +00:00
Jason Monk
4444c5b278 Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
2014-10-27 19:25:50 -04:00
Eric Gilmore
d126294a8f Docs: Adding Android Studio instructions for adding IAB service.
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.

Bug: 17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
2014-10-27 23:24:39 +00:00
Ying Wang
475d7393bf Update current.txt with generics to field types.
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
2014-10-27 22:35:59 +00:00
Quddus Chong
2b4b3d289b cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
2014-10-27 14:47:50 -07:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types.
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
2014-10-27 11:25:19 -07:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
2014-10-27 18:09:11 +00:00
Geoff Mendal
5a1a14a817 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-27 15:55:19 +00:00
Geoff Mendal
ad66c3b0b1 Import translations. DO NOT MERGE
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
2014-10-27 08:53:05 -07:00
Geoff Mendal
b3a33967d2 Import translations. DO NOT MERGE
Change-Id: I6bbba14271ba04f3e4b4836f3e81a22d1c53938f
Auto-generated-cl: translation import
2014-10-27 06:33:49 -07:00
Joe Fernandez
956ee53b07 am 4fee8c89: docs: Home page - fix card images that are showing up on the home page
* commit '4fee8c89eb49d4935b4a2725f82d3a08f6a938d3':
  docs: Home page - fix card images that are showing up on the home page
2014-10-25 09:15:06 +00:00
Joe Fernandez
4fee8c89eb docs: Home page - fix card images that are showing up on the home page
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
2014-10-25 01:46:20 -07:00
Luan Nguyen
fba8fddfdc am 781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
* commit '781fe92cfdb96cb8f67d06b4d2500d11a3310550':
  docs: Fix metadata description. Add new gesture test. Split layout test.
2014-10-24 23:30:37 +00:00
Luan Nguyen
781fe92cfd Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 2014-10-24 23:17:24 +00:00
Luan Nguyen
03b74e1947 am bfcc2e1a: am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit 'bfcc2e1a88e45027d2ba17302cb2fb35fbce3506':
  docs: fixed typo/grammar issues.
2014-10-24 23:04:53 +00:00
Joe Fernandez
65dca4ec32 am abb8ea3d: am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit 'abb8ea3d4be376b0816b791c1afd3cc78300e9d4':
  docs:Added 64-bit image note from Preview page
2014-10-24 23:04:49 +00:00
Natalie Masse
0fbbed83a6 am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed
* commit '60144a7a06d818e7ef22d08722be67c602aeb088':
  Link and typo fixed
2014-10-24 23:04:46 +00:00
Luan Nguyen
bfcc2e1a88 am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
2014-10-24 22:37:25 +00:00
Joe Fernandez
abb8ea3d4b am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
2014-10-24 22:37:16 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
2014-10-24 22:36:54 +00:00
Luan Nguyen
9e8a84a115 docs: Fix metadata description. Add new gesture test. Split layout test.
Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
2014-10-24 15:17:39 -07:00
Paul Lawrence
0e6178b81e am c220d8e5: Stop crypto UI from crashing during encryption
* commit 'c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
  Stop crypto UI from crashing during encryption
2014-10-24 20:08:33 +00:00
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
2014-10-24 10:37:40 -07:00
Luan Nguyen
aec7c974eb am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
  docs: fixed typo/grammar issues.
2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd Merge "docs: fixed typo/grammar issues." into klp-modular-docs 2014-10-24 15:55:48 +00:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
2014-10-24 09:27:02 +00:00
Natalie Masse
bcf9ced47a am 1e5bb861: Link and typo fixed
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
  Link and typo fixed
2014-10-24 08:13:36 +00:00
Joe Fernandez
57f1fd1993 am cab73381: Merge "docs: Fix typo in search class" into lmp-dev
* commit 'cab733811554ffcf257ee194a5245521713faf5d':
  docs: Fix typo in search class
2014-10-24 06:08:43 +00:00
Joe Fernandez
458128603f am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev
* commit '553dd209992ffe9bba1160333762c5f3fa6651b0':
  docs: Fixed 404 link in SDK Tools page.
2014-10-24 06:08:40 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Joe Fernandez
c53546e9c2 am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev
* commit '3b6d518e79c1045286d2bc368148b44dd1a39bf3':
  docs: Fix hprof-conv location in docs.
2014-10-24 06:02:35 +00:00
Joe Fernandez
b118395346 am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev
* commit '4ae8b8f3652ed2382ee5593151ea72b315fb5384':
  docs: Fixing misc minor bugs.
2014-10-24 06:02:31 +00:00
Joe Fernandez
cab7338115 Merge "docs: Fix typo in search class" into lmp-dev 2014-10-24 06:01:57 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00