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

7778 Commits

Author SHA1 Message Date
Scott Rowe
b192a1762a am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:12:08 +00:00
Robert Ly
c8551e678b am 4f67e66e: am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit '4f67e66e3e6efd5805c54ef6ca0979c9b1f64d96':
  docs: fix speech code for bug 16461337
 2014-07-22 14:34:06 +00: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
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
Dirk Dougherty
b810999637 am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'd1929c505a66afc13d661beac9868f2886cbd1e8':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:58: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
30aa5924f0 am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
  docs: Noted how singleTop affects "up" navigation.
 2014-07-21 17:47:13 +00:00
Ricardo Cervera
fef0011144 am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:11:42 +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
205196f128 am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
  docs: change copy for edu video
 2014-07-21 16:17:39 +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
Robert Ly
62c81ab580 docs: change copy for edu video 
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
 2014-07-21 09:06:50 -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
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
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00
David Friedman
119716f404 am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:43:19 +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
Andrew Solovay
c3032874dc am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '3a14c2890e9821a36399b042261d75ee4dfdf71f':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:53:11 +00:00
Robert Ly
cf068e7799 am 47495df6: am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit '47495df6a6797704919af3ea4a695cf7b2c53f00':
  docs: update links and add new wear design materials
 2014-07-22 17:27:08 +00:00
Robert Ly
451a640c10 am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc 
* commit '817a31afa3195b707526bb6d14339720d943549e':
  docs: remove android translation plugin doc
 2014-07-22 17:27:00 +00:00
Quddus Chong
9fc983f56a am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit 'f0804df14263bd4f4f3a8bd1f21edd1f741dd8da':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:08:59 +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
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
592740d4e9 am c8551e67: am 4f67e66e: am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit 'c8551e678b8d0ee162a8161e287ae300a9ac67b9':
  docs: fix speech code for bug 16461337
 2014-07-22 14:41:43 +00:00
Ricardo Cervera
9c36b83519 am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:34:58 +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
ee65b63d25 am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:30:32 +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
Dirk Dougherty
4ebdd2f075 am b8109996: am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'b81099963772f886e68129c33f32fefb85ac673e':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 01:04:30 +00:00
Andrew Solovay
6f4d821003 am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 
* commit '30aa5924f0a372a10c7245a16ee460359826ab9c':
  docs: Noted how singleTop affects "up" navigation.
 2014-07-21 17:53:30 +00:00
Ricardo Cervera
e6ab031e3c am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit 'fef0011144e2223df382abae412f145c5ea41548':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:15:09 +00:00
Robert Ly
fb06b4800c am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit '205196f128b13eecea2789506341c7ecd2044b71':
  docs: change copy for edu video
 2014-07-21 16:22:12 +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
Joe Fernandez
64ae930359 am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e1e81a9ee0f3632898eff1056fd2283b79789e23':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:04:47 +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
David Friedman
00510833be am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '119716f40466018e789d86b3005b6c839de85b8c':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:49:57 +00:00
Quddus Chong
6120c4c949 am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '9fc983f56af76d1abcbf95e6b3b35e506aa2fddd':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-19 00:42:07 +00:00
Ricardo Cervera
cbaecd0f35 am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '9c36b83519804000a3d83e141c3ce7455828b4db':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:18:09 +00:00
Robert Ly
860a6ce6d1 am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ee65b63d257f2318c10b7d5bd6797a54ca65a4cd':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:18:00 +00: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