drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,078 Commits 1 Branch 0 Tags
Commit Graph

8282 Commits

Author SHA1 Message Date
Ricardo Cervera
9a0e242c84 am 44e79cc5: am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit '44e79cc59ab32f37e3e0c91046e01e47c24fc1e6':
  docs: Two-page notification fix.
 2014-10-31 00:16:38 +00:00
kmccormick
fa0af98f1b am d61ce7db: am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit 'd61ce7db43015fde515d85fe6c7a424030f8c8d3':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-31 00:14:23 +00:00
David Friedman
5decda261a am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-30 23:43:31 +00:00
Ricardo Cervera
e3dd89a42a Merge "docs: Two-page notification fix." into lmp-docs 2014-10-30 15:27:32 +00:00
Joe Fernandez
b51bd437c2 am 296e0a79: am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit '296e0a79b988a5eb601ab60419b810d031fdf20b':
  docs: Update timing of Android Wear app review
 2014-10-30 10:18:05 +00:00
David Friedman
2a2200c63c am 387675d9: am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '387675d9050e699de4d976cfe78faec389673cb1':
  Updates Notifications screenshot for Android 5.0.
 2014-10-30 10:17:59 +00:00
Eric Gilmore
ba6abdf841 am 7e99cedb: am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit '7e99cedb50bc0712cc879852e16793cfeeb0d85a':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-30 10:17:52 +00:00
Sebastien Hertz
837b140c82 resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 
Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00
 2014-10-30 11:06:41 +01:00
kmccormick
2b20b9d23a am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:12:52 +00:00
kmccormick
3e92c4a20f am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:09:23 +00:00
kmccormick
13d7ea464e DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

Fix for:
b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 23:06:46 +00:00
kmccormick
1867f2cfdd Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 2014-10-29 23:04:29 +00:00
kmccormick
2022db08ab Doc update: deliv receipt, rate exceeded, bug fixes. 
Fix for:

b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 15:49:36 -07:00
Ricardo Cervera
9a6fdfe853 docs: Two-page notification fix. 
Bug: 18108228

Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
 2014-10-29 14:27:22 -07:00
David Friedman
0fa6edced7 Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
 2014-10-28 16:38:11 -07:00
Ricardo Cervera
91934b63ee am 989f4bfd: am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents automerge: be07f2a 
automerge: cf6a28f

* commit 'cf6a28f813749f9ce1934e9054b53a19d0e30b39':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:42:19 +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
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
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
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Joe Fernandez
73c463c8d8 am c12508e7: am f0d7cdbd: am 956ee53b: am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit 'c12508e716763066b624c9e28b5ac61df553c536':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:47:58 +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
4870dab864 am ae5c3ee2: am 9167652e: am fba8fddf: am 781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 
* commit 'ae5c3ee25b5dc0a53a7df293df80af4d97e52105':
  docs: Fix metadata description. Add new gesture test. Split layout test.
 2014-10-24 23:49:24 +00:00
Luan Nguyen
b43357bd42 am 4cf32ce5: am 584ec1f6: am 03b74e19: am bfcc2e1a: am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit '4cf32ce5a4636f7ff8e9cb6342cd0bba098a56f7':
  docs: fixed typo/grammar issues.
 2014-10-24 23:39:39 +00:00
Joe Fernandez
752088e84c am f5fe0816: am 3ef1c95b: am 65dca4ec: am abb8ea3d: am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit 'f5fe0816122d1c7b678f897f70f7708d0f363faf':
  docs:Added 64-bit image note from Preview page
 2014-10-24 23:39:34 +00:00
Natalie Masse
7e3f7ced52 am a2e6ec07: am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'a2e6ec070cc9c127a5c376e3bf5e19de09c44324':
  Link and typo fixed
 2014-10-24 23:39:29 +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
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
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
789ca68203 am d3d0181c: am f7b6575d: am 57f1fd19: am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'd3d0181cebd978a5ce798af382b9566b1111da5c':
  docs: Fix typo in search class
 2014-10-24 06:50:50 +00:00
Joe Fernandez
3909359df3 am 34e4bcfa: am 469413bd: am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '34e4bcfa7b21f5410d19af03aaecfd0337ba4c97':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:50:45 +00:00
Joe Fernandez
d8c5b0e773 am 95ddc11b: am 20665087: am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '95ddc11bb7b783efa353a7cbe45e3a084f8d8061':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:45:11 +00:00
Joe Fernandez
868921ec59 am 95aac259: am 9847bcec: am b1183953: am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '95aac259de7d4c6c8cfc6e8c6f708ceaaa75b5a1':
  docs: Fixing misc minor bugs.
 2014-10-24 06:45:02 +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
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
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Luan Nguyen
fd5e2e56f1 am bc3b3439: am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
automerge: c89b2ad

* commit 'c89b2ade48144901baf8b1d268a4adc1a02dab53':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-24 01:58:57 +00:00
Luan Nguyen
578210db19 Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 2014-10-23 22:45:03 +00:00
Trevor Johns
2cf2406d98 am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '86272c9c9c7bb0603cf1626b01f55ac4d94047dd':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:24:07 +00:00