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

8754 Commits

Author SHA1 Message Date
Dirk Dougherty
e0b5a38122 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. 
automerge: 3f9d57d

* commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
  Doc change: Update Ads terms language.
 2015-01-29 00:54:45 +00:00
Dirk Dougherty
497387928d Doc change: Update Ads terms language. 
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
 2015-01-29 00:16:25 +00:00
Joe Fernandez
f8afd56406 am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
automerge: 5421eee

* commit '5421eee195265d05c821814501aae1bf3f468661':
  docs: plugin for gradle typo
 2015-01-28 04:14:54 +00:00
Joe Fernandez
05defb992e Merge "docs: plugin for gradle typo" into lmp-docs 2015-01-27 22:57:30 +00:00
Ricardo Cervera
be3731f028 am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
  docs: Transitions training class.
 2015-01-27 21:28:14 +00:00
Ricardo Cervera
de113066d8 docs: Transitions training class. 
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
 2015-01-27 11:35:20 -08:00
Sarah Maddox
f31eb13b8e am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 
* commit '83f40802148e922d78222ffc56377534b8ee92be':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:35:06 +00:00
Sarah Maddox
912cacde86 Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 2015-01-26 20:16:37 +00:00
Ricardo Cervera
9c9dc80a08 am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit 'df07000e356dee84de9f4dcdd22a15e26e32f684':
  docs: Wear DataItem listener improvements
 2015-01-26 19:51:53 +00:00
Ricardo Cervera
edb7a4420b Merge "docs: Wear DataItem listener improvements" into lmp-docs 2015-01-26 19:32:13 +00:00
Sarah Maddox
ed91b0dd7e docs: Adds new geocoding sample to Location API training. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.

Bug: 17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
 2015-01-26 11:06:55 -08:00
Rich Slogar
639248789c docs: plugin for gradle typo 
b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
 2015-01-23 09:57:37 -08:00
Ricardo Cervera
4386d856a8 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:27:57 +00:00
Ricardo Cervera
bdfcd56e7f Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 2015-01-22 17:50:48 +00:00
Ricardo Cervera
4bfde48739 docs: Fixes to the watch faces design guidelines 
Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
 2015-01-22 09:46:43 -08:00
Luan Nguyen
563e767a51 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
automerge: 6117147

* commit '61171477918ea55c70c706f062019f5cd2194043':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:44:45 +00:00
Luan Nguyen
1dd76ea276 docs: Fix companion configuration (18864041) 
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
 2015-01-22 08:15:57 -08:00
Andrew Solovay
63e822df58 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda 
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:31:44 +00:00
Andrew Solovay
78f4342fac Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 2015-01-21 19:20:58 +00:00
Ricardo Cervera
c2be8a6da0 docs: Wear DataItem listener improvements 
Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e
 2015-01-21 09:08:53 -08:00
Luan Nguyen
f082f8980e Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 2015-01-21 16:19:20 +00:00
Luan Nguyen
46e804d2a7 docs: Fix conditional in ambient mode check method (18832168). 
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
 2015-01-21 08:00:45 -08:00
Andrew Solovay
f92dbe0115 docs: WebView security notes for apps on pre-K devices 
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.

bug: 19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
 2015-01-20 16:10:07 -08:00
Scott Rowe
c68ab86a8c am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
  docs: removing code captions
 2015-01-17 05:20:28 +00:00
Scott Rowe
278f5e2a63 am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
  docs: Add screenshot
 2015-01-17 05:20:23 +00:00
Scott Rowe
c987ca0501 Merge "docs: removing code captions" into lmp-docs 2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
David Friedman
91678a69b2 am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:43:30 +00:00
David Friedman
fa66fdd57a Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73 Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw 
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
 2015-01-16 15:42:26 -08:00
Quddus Chong
2f63207d87 am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:35:03 +00:00
Joe Fernandez
35aecbe927 am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:29:43 +00:00
Quddus Chong
de0a87007b Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49 Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 2015-01-16 21:58:37 +00:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file 
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
 2015-01-16 12:26:20 -08:00
Joe Fernandez
fadcbc705f am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25':
  docs: studio disk space requirements typo
 2015-01-16 19:55:52 +00:00
Joe Fernandez
478d4e86ff am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '0b596de9a4cc9b8d0694838f4b699c722d448bac':
  docs: link to sdk manager
 2015-01-16 19:51:08 +00:00
Quddus Chong
03c15cf4c9 docs: Fixed typos in Game Controller training code snippets. 
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
 2015-01-16 11:36:18 -08:00
Ricardo Cervera
e229751d11 docs: Add browseable Wearable Support Lib Javadoc 
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
 2015-01-16 11:18:10 -08:00
Joe Fernandez
8304b8b9ce Merge "docs: studio disk space requirements typo" into lmp-docs 2015-01-16 18:49:28 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Rich Slogar
8a7f20f5a4 am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit 'b43a7eefb75b2a6397d738055389567e1faa21d9':
  docs: studio support library revisions update
 2015-01-16 18:03:41 +00:00
Dirk Dougherty
f83ae5cd59 am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '7b7f074f282e551439b0b3c40a4ccb44d2981006':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:03:36 +00:00
Rich Slogar
a84faf0f15 am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update
 2015-01-16 18:03:32 +00:00
Rich Slogar
ab8a5a0ea8 am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update
 2015-01-16 18:03:28 +00:00
Rich Slogar
d15015d206 am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update
 2015-01-16 18:03:23 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00