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

2872 Commits

Author SHA1 Message Date
Adrian Ludwig
a15562f8fd Updated "Designing for Security" documentation 
Change-Id: I1fe5b353d750695f75370ef31ae1b39e50159164
Signed-off-by: Adrian Ludwig <aludwig@google.com>
 2011-12-16 10:53:53 -08:00
Scott Main
73f875380d am fa0f39c5: am 611d03e6: docs: typos 
* commit 'fa0f39c5454ae9efc00d20326568c0eecb5cc8b4':
  docs: typos
 2011-12-16 10:47:21 -08:00
Scott Main
611d03e693 docs: typos 
Change-Id: Iee489eb39029b5d550e37f49b1bd5d4cf30e445c
 2011-12-16 10:41:54 -08:00
Dirk Dougherty
77aba791ac am 4365a486: am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '4365a486126ecb20061f01d1e5c8e5f357045f18':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:27:42 -08:00
Dirk Dougherty
8b6ed2d17d Doc change: edits to ICS MR1 API Overview. 
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
 2011-12-16 00:11:43 -08:00
Joe Fernandez
aa04058ce0 am 9b06f091: am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '9b06f091c4d74415b18eb32f84ae931624b93f18':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:15:32 -08:00
Joe Fernandez
5b18c714bb Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17 docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
 2011-12-15 23:09:43 -08:00
Fred Chung
26c4a3e979 am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit 'd30167f0cda249c9a0d1d118d837d58f3c2b2c89':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:37:40 -08:00
Fred Chung
14633f1b1e am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
 2011-12-15 22:25:19 -08:00
Scott Main
734a9954ec am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit 'ed8851a6f2e4d9477aaa20c333d7220901d8faeb':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:17:15 -08:00
Scott Main
8e980c1e4e Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
6475bd2112 am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '4faca92faa13bcf5d6c2e76b226466066e5562a2':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:12:08 -08:00
Scott Main
36c677855c docs: update homepage for 4.0.3 announcment 
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
 2011-12-15 22:04:46 -08:00
Scott Main
b2f1cda755 am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit 'b193d24145d84a1748cfdcffae56ebfe549ef940':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:24:47 -08:00
Scott Main
4cb7d09535 am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:19:55 -08:00
Scott Main
98af5edc70 docs: fix encoding issue or whatever with docs (not showing titles) 
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
 2011-12-15 20:13:20 -08:00
Scott Main
680ccb511b am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit '34e46115a5cee1b0e186b450ef2598df999c5cbe':
  docs: add remembering users class to nav
 2011-12-15 20:01:28 -08:00
Scott Main
2538d4a55c am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '98e4adf942fe3ade14225875fdb018efe941e99f':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:57:21 -08:00
Scott Main
8f266b9e34 am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
  docs: add remembering users class to nav
 2011-12-15 19:56:47 -08:00
Scott Main
d9bc2d21c5 Merge "docs: add remembering users class to nav" into ics-mr0 2011-12-15 19:55:25 -08:00
Scott Main
26e461b34f am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:52:50 -08:00
Scott Main
2956f2fd2c docs: add remembering users class to nav 
Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
 2011-12-15 19:52:33 -08:00
Scott Main
d44f07e968 am ec09b269: am ce5643c7: am abfcbd16: docs: typo in training orientation 
* commit 'ec09b2691ef24e25d28d9946c722d154b6067224':
  docs: typo in training orientation
 2011-12-15 19:52:14 -08:00
Scott Main
5dac197619 Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 2011-12-15 19:51:48 -08:00
Scott Main
ce5643c7c4 am abfcbd16: docs: typo in training orientation 
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
  docs: typo in training orientation
 2011-12-15 19:47:47 -08:00
Dirk Dougherty
3b33cdcbf8 Doc merge from master:Training class on Identifying and Authenticating Users. 
Conflicts:

	docs/html/training/id-auth/authenticate.jd
	docs/html/training/id-auth/custom_auth.jd
	docs/html/training/id-auth/identify.jd
	docs/html/training/id-auth/index.jd

Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
 2011-12-15 19:45:27 -08:00
Scott Main
abfcbd162f docs: typo in training orientation 
Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
 2011-12-15 19:33:04 -08:00
Roman Nurik
75064f5d12 am 0bc0e5e3: am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 
* commit '0bc0e5e35ae0939f85da5b79df69a6b6040bf496':
  docs: Minor bugfix to Android U navigation design class
 2011-12-15 19:29:27 -08:00
Roman Nurik
1584a816ed am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 
* commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
  docs: Minor bugfix to Android U navigation design class
 2011-12-15 19:25:25 -08:00
Roman Nurik
408f94b147 Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 2011-12-15 19:23:00 -08:00
Roman Nurik
265644e22a docs: Minor bugfix to Android U navigation design class 
Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f
 2011-12-15 19:20:02 -08:00
Scott Main
a9099eeb24 am 6bbd38e9: am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 
* commit '6bbd38e98615d6a2d4d4e1401a9316bfe7736486':
  Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
 2011-12-15 17:44:00 -08:00
Scott Main
826350cdc7 am efc87005: am 5f0df1b8: am 580f0146: docs: add camera and design, remove users update title names for many lessons 
* commit 'efc870052b0988446967a6100cf03a51c3b88ce1':
  docs: add camera and design, remove users update title names for many lessons
 2011-12-15 17:41:50 -08:00
Scott Main
aeb06e3408 am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 
* commit '6fbddffc83312b825e888fcdb8b6e52dade05b3e':
  Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
 2011-12-15 17:39:35 -08:00
Scott Main
5f0df1b8db am 580f0146: docs: add camera and design, remove users update title names for many lessons 
* commit '580f0146535e7daed83aef721f505270f7b040e1':
  docs: add camera and design, remove users update title names for many lessons
 2011-12-15 17:37:36 -08:00
Scott Main
6fbddffc83 Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 2011-12-15 17:36:58 -08:00
Scott Main
580f014653 docs: add camera and design, remove users 
update title names for many lessons

Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8
 2011-12-15 17:32:05 -08:00
Sparky Rhode
4ebe916f3f am 165b3cc7: am ea627994: am fc3f8e69: Merge "Remove references to sample application" into ics-mr0 
* commit '165b3cc73fdc6fdee1c1ba1272ffd4cdb70b9cab':
  Remove references to sample application
 2011-12-15 17:27:36 -08:00
Sparky Rhode
ea627994c3 am fc3f8e69: Merge "Remove references to sample application" into ics-mr0 
* commit 'fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
  Remove references to sample application
 2011-12-15 17:23:11 -08:00
Sparky Rhode
fc3f8e6954 Merge "Remove references to sample application" into ics-mr0 2011-12-15 17:21:51 -08:00
Joe Fernandez
e4f2031758 docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 
Change-Id: Ia8e14c1ab4dad7c51677e759d10891bd75cbe7b1
 2011-12-15 17:07:33 -08:00
Sparky Rhode
abe2decb9e Remove references to sample application 
Change-Id: If8d6d0a3cc59bd3d3462aa066c861fbcae51baf1
 2011-12-15 16:53:35 -08:00
Roman Nurik
a77f1552b7 am eb49c9c3: am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0 
* commit 'eb49c9c33c7ddeb5150bfea0f432226ff7730bfe':
  Android U Class: Designing Effective and Intuitive App Navigation
 2011-12-15 16:52:47 -08:00
Roman Nurik
eb623347f9 am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0 
* commit 'd37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
  Android U Class: Designing Effective and Intuitive App Navigation
 2011-12-15 16:48:25 -08:00
Roman Nurik
d37e2b35b4 Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0 2011-12-15 16:45:55 -08:00
Roman Nurik
a303065925 Android U Class: Designing Effective and Intuitive App Navigation 
Change-Id: Ic05d73c27a4ae4b18fd682e1f193acd73b8d9dc5
 2011-12-15 16:41:27 -08:00
Scott Main
cfabb16ed4 am 52507ccd: am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 
* commit '52507ccd17787a82cebe3b86e93c6e197b74d9c1':
  docs: Add training homepage, side nav, and title changes
 2011-12-15 16:34:21 -08:00
Scott Main
6aee4582fe am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 
* commit '2cbcdc760cfe2af622ccb9ef41514954dab537f0':
  docs: Add training homepage, side nav, and title changes
 2011-12-15 16:29:42 -08:00