Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,759 Commits 3 Branches 0 Tags
cd7b506c19dff4a68b46631fcede73f55547f985
Commit Graph

9389 Commits

Author SHA1 Message Date
Ricardo Cervera
6fc90d5948 am 0f400778: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c automerge: 4386d85 
automerge: 9331dcb

* commit '9331dcb962e4ad90c98362c811b0f37d7a1c6c82':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:45:44 +00:00
Ricardo Cervera
9331dcb962 am 0f400778: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c automerge: 4386d85 
* commit '0f400778714f0357672651868146be73431d0b98':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:39:26 +00: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
Luan Nguyen
0829cf2b9a am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767 
automerge: 2bffc5e

* commit '2bffc5e7bf2a86024d715716a6fd44def4b5f81c':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 18:09:02 +00:00
Luan Nguyen
2bffc5e7bf am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767 
* commit '2700393c029baf9443622440f5ebad5073429075':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:57:01 +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
b94f2ce07e am ea4c21ea: am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d 
* commit 'ea4c21ea283bdb98b80140c697b27bb9eb2bb643':
  docs: WebView security notes for apps on pre-K devices
 2015-01-22 00:03:31 +00:00
Luan Nguyen
a36fb351f8 am 2c27edc0: am 349e3b5a: 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-doc 
* commit '2c27edc0e043cb8fefa5eb1f5424f46d88712304':
  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-22 00:03:28 +00:00
Andrew Solovay
ea4c21ea28 am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d 
* commit 'a1838a9d78eeadc0e578e250b9ff71b1f720148e':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:46:27 +00:00
Luan Nguyen
2c27edc0e0 am 349e3b5a: 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: 
* commit '349e3b5ad1e3d2f55fadce05a3726f27c8a2b5d5':
  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:46:20 +00: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
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
bd74a7022c am cee634df: am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'cee634df2c8fe3a10a3aef754b3e168c646d47f3':
  docs: removing code captions
 2015-01-17 05:38:02 +00:00
Scott Rowe
9d6f65e0a8 am ec015c50: am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ec015c504fe2cb4c3171e0f405d1b3df0567b5f4':
  docs: Add screenshot
 2015-01-17 05:37:55 +00:00
Scott Rowe
cee634df2c am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit '11ce4b759497546f4182b00cc6b92cfe42acf32e':
  docs: removing code captions
 2015-01-17 05:31:43 +00:00
Scott Rowe
ec015c504f am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'e019bbb1619700c952181fe9717060aaef7bce12':
  docs: Add screenshot
 2015-01-17 05:31:36 +00: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
8d53179c9c am 1cca3f6e: am 912a9394: am 91678a69: 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 '1cca3f6e3939f59d1e17f35ca50339fa46d24c27':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 01:09:05 +00:00
David Friedman
1cca3f6e39 am 912a9394: am 91678a69: 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 '912a9394398db1b47f0294ffdebc4d78600573fd':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:59:45 +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
7a11b88bcd am 6e2661f0: am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '6e2661f086327c7ebbbda03f3387b673f0bf87df':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:56:45 +00:00
Quddus Chong
6e2661f086 am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '20eb8093b634704ac29fda85e9c1c916a31bde29':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:50:17 +00:00
Joe Fernandez
090c5e01be am 6a8c2b03: am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '6a8c2b038c1d16856c642f80bf315828d1b96ad1':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:47:10 +00:00
Ricardo Cervera
ffff333c19 am eeb4cf8f: am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit 'eeb4cf8f43797f99543db1e404066d5291da6237':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:47:05 +00:00
Joe Fernandez
6a8c2b038c am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'ff96449f1d3092182d61d5e553042742d5bf71c8':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:41:01 +00:00
Ricardo Cervera
eeb4cf8f43 am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '3fee7dc78af70ac9ca383f40e511ffaa378894b1':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:40:55 +00: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
46d2b80fe2 am 8871470c: am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '8871470cedf4f6863fbba8c7d253607a9bac0246':
  docs: studio disk space requirements typo
 2015-01-16 20:18:33 +00:00
Joe Fernandez
c2c9107fb9 am b5e3d2b0: am 5d320493: am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit 'b5e3d2b04368e7ad113d3f183464a66a96dcf9df':
  docs: link to sdk manager
 2015-01-16 20:13:59 +00:00
Joe Fernandez
8871470ced am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '5444e342c23e65d5efa3e9ef2b25cf0c7bfad468':
  docs: studio disk space requirements typo
 2015-01-16 20:12:31 +00:00
Ricardo Cervera
23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 20:06:53 +00:00
Rich Slogar
c952235d9f am 39389af4: am f5af4a1e: am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit '39389af4f1c08ffd1ad4511f2241ebeaca870191':
  docs: studio support library revisions update
 2015-01-16 20:06:33 +00:00
Dirk Dougherty
93aac801e5 am 05eb2055: am 8559b145: am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '05eb2055038b91f43d61217ff261f3b7d9913513':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 20:06:28 +00:00