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

6833 Commits

Author SHA1 Message Date
David Friedman
af001f9410 am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:45:11 +00:00
Scott Rowe
2a922cb45a am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:03:19 +00:00
Andrew Solovay
a2beba70b9 am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:41:21 +00:00
Robert Ly
fb8e254a1a am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit '1c723ea84ee4299fa07687cb2881e3695bd14d3c':
  docs: update links and add new wear design materials
 2014-07-22 17:12:14 +00:00
Robert Ly
c9cf452179 am 0b5f9c2f: docs: remove android translation plugin doc 
* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
  docs: remove android translation plugin doc
 2014-07-22 17:12:10 +00:00
Robert Ly
0b5f9c2f68 docs: remove android translation plugin doc 
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
 2014-07-22 17:07:12 +00:00
Robert Ly
1c723ea84e Merge "docs: update links and add new wear design materials" into klp-modular-docs 2014-07-22 16:21:19 +00:00
Robert Ly
faaf23b9ac docs: update links and add new wear design materials 
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
 2014-07-22 10:06:31 -07:00
David Friedman
170b09535d Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 2014-07-22 16:13:36 +00:00
David Friedman
86efa014fc Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body. 
Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
 2014-07-22 00:22:00 -07:00
Ricardo Cervera
940ae93043 Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e docs: Added note suggesting use of Android Studio over ADT 
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
 2014-07-21 09:08:10 -07:00
Robert Ly
62c81ab580 docs: change copy for edu video 
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
 2014-07-21 09:06:50 -07:00
Robert Ly
f3be7864a6 Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 2014-07-21 15:42:19 +00:00
Robert Ly
61ecfc3428 docs: fix speech code for bug 16461337 
Change-Id: Id2ab7852a7dbe9b91697e1ffd0ca1ba62144f875
 2014-07-22 14:25:10 +00:00
Andrew Solovay
170556f82b Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 2014-07-18 22:16:50 +00:00
Andrew Solovay
1eaab8ff83 docs: Removed reference to a sample notepad app. 
The first section incorrectly said that there was a full Notepad
sample app in the "samples" directory; removed that reference.

Also changed the description in "Other Resources and Further Learning"
to point to the sample in "samples/legacy/NotePad".

Doc is staged to: http://asolovay.mtv:9249/training/notepad/

bug: 15612249
Change-Id: I6c17565fd7708fb50915e8cdd73043964cc2878a
 2014-07-21 12:38:05 -07:00
Robert Ly
4f67e66e3e am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit 'f3be7864a6cf1b98107de1eadf25587b53a90fca':
  docs: fix speech code for bug 16461337
 2014-07-22 14:30:13 +00:00
Dirk Dougherty
d1929c505a am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:54:01 +00:00
Dirk Dougherty
f365928406 Doc change: add reminder for developers on using ad id. 
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
 2014-07-21 22:15:04 +00:00
Andrew Solovay
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00
Ricardo Cervera
d73eb7f9c9 am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:07:00 +00:00
Robert Ly
efca30d0fa am 62c81ab5: docs: change copy for edu video 
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video
 2014-07-21 16:11:39 +00:00
David Friedman
0d5af3f67b am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '5d59d371f27008214f29febb0595b602edddcc67':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 07:59:05 +00:00
Quddus Chong
f0804df142 am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:04:21 +00:00
Quddus Chong
349e5760e7 docs: Fixed bugs in Game Controller training doc. 
bug: 16375247, 14671463

Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a
 2014-07-18 22:17:22 +00:00
Ricardo Cervera
7a42536083 am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:31:01 +00:00
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:27:03 +00:00
Scott Rowe
40b5d8a0e5 Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 2014-07-17 19:20:15 +00:00
Andrew Solovay
eb69126c61 Merge "DO NOT MERGE" into klp-modular-docs 2014-07-18 22:16:50 +00:00
Andrew Solovay
8e4ff7fee7 DO NOT MERGE 
cherrypick from klp-modular-dev docs: Noted how singleTop affects "up" navigation. Change-Id: 4d06d970526b58ddaf8db89858615217fa88772b

Docs are staged to:

http://asolovay.mtv:9411/training/implementing-navigation/ancestral.html#NavigateUp
http://asolovay.mtv:9411/guide/topics/manifest/activity-element.html#lmode

bug: 14527411
Change-Id: Ia414f2206339fc33739c8244f14140dd2e5d1607
(cherry picked from commit 4d06d970526b58ddaf8db89858615217fa88772b)
 2014-07-22 18:16:39 +00:00
Robert Ly
f1b18ded01 Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 2014-07-17 18:11:21 +00:00
David Friedman
5d59d371f2 Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 2014-07-17 17:59:02 +00:00
David Friedman
d3161450fb Minor typos, consistency things, one grammatical error. 
Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c
 2014-07-18 02:28:54 -07:00
Scott Rowe
ff424377df cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12 
Change-Id: I2ee3cc1269fcd9b31f1f71fc5fc3cd8d62ebf31f
 2014-07-17 10:13:53 -07:00
Joe Fernandez
e1e81a9ee0 am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps
 2014-07-17 16:44:19 +00:00
Ricardo Cervera
25303a980c Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 2014-07-17 02:29:54 +00:00
Joe Fernandez
e287cf33d4 docs: Update ADT-1 page with supported apps 
Change-Id: I7281767e3a51ce518f4e14f0751ba71859e16d24
 2014-07-16 16:22:51 -07:00
kmccormick
289d3c253e am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs 
* commit 'fc8a3b5f06fe725ed561fb3535efd02b16c526ea':
  Doc Update: new Smack sample.
 2014-07-16 21:17:15 +00:00
David Friedman
fe545cdb4e A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
 2014-07-16 12:33:55 -07:00
Robert Ly
bafdb90070 am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit '82088d62f81a1d842bdb2d285ed578c562b20edd':
  docs: add EU legal notice
 2014-07-16 19:23:46 +00:00
Quddus Chong
1a2a9730e6 am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:13:19 +00:00
Chris Smith
211c58448e am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:09:17 +00:00
kmccormick
fc8a3b5f06 Merge "Doc Update: new Smack sample." into klp-modular-docs 2014-07-16 16:25:13 +00:00
David Friedman
046702ba57 A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
(cherry picked from commit fe545cdb4e9d49d8cf58626ef77709abecf8f26b)
 2014-07-16 19:57:44 +00:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
f0d8c6fcae Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
Ricardo Cervera
2f84fbd9f9 docs: Fix typo in Wear docs. Bug: 16327298 
Change-Id: I682b9bba9d01712b98d5de97d31ef2d88b5b6ea0
 2014-07-16 09:02:36 -07:00