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

62641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
eb49c9c33c am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0 
* commit 'eb623347f9a0c46e6ccf5791c03f99d37a0b65f8':
  Android U Class: Designing Effective and Intuitive App Navigation
 2011-12-15 16:50:23 -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
52507ccd17 am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 
* commit '6aee4582feae70254094e343412114c0b0abaf2d':
  docs: Add training homepage, side nav, and title changes
 2011-12-15 16:31:54 -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
Scott Main
2cbcdc760c Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 2011-12-15 16:28:19 -08:00
Scott Main
6e37a304c6 am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class 
* commit 'fc6ac0f28f9f7d06963fb330b218376099a91596':
  docs: Android University - Camera class
 2011-12-15 16:12:23 -08:00
Scott Main
fc6ac0f28f am 564e8aa4: docs: Android University - Camera class 
* commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71':
  docs: Android University - Camera class
 2011-12-15 16:10:10 -08:00
Scott Main
564e8aa41c docs: Android University - Camera class 
Change-Id: Idc0c6ca88b42908289701c8367cd5c403d85f71e
 2011-12-15 16:01:59 -08:00
Scott Main
608461ffd5 am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs 
* commit '19552e95db26d96977daa42cda4de8e58c6feb0a':
  cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
 2011-12-15 15:58:33 -08:00
Scott Main
19552e95db am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs 
* commit 'd25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
  cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
 2011-12-15 15:55:31 -08:00
Scott Main
7736f96d0e docs: Add training homepage, side nav, and title changes 
Change-Id: I2ac6047faa7a70e06ced47665813ace4aa974af8
 2011-12-15 15:49:32 -08:00
Scott Main
d25ad2fdbb cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 
docs: remove some "new" tags from side navs

Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
 2011-12-15 15:43:21 -08:00
Adam Koch
909fe93021 Minor tweaks to Sharing class, updated some typos, wording and a screenshot. 
Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c
 2011-12-15 17:56:31 -05:00
Scott Main
a739235aed am 43834487: docs: remove some "new" tags from side navs 
* commit '43834487a183b69783b0de270f9b761f3afffdc1':
  docs: remove some "new" tags from side navs
 2011-12-15 13:14:41 -08:00
Scott Main
43834487a1 docs: remove some "new" tags from side navs 
Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
 2011-12-15 13:11:12 -08:00
Scott Main
7e065061bb am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:11:39 -08:00
Scott Main
481cd5a893 am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '3d672e1e789e171e913605945efe95a477ab0505':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:08:51 -08:00
Scott Main
3d672e1e78 Android U Class: Monetization / Ads without Compromising User Experience 
Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
 2011-12-15 10:44:11 -08:00
Scott Main
fbc17eccea am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'cf927f229f55849caf3461621023b5bd61908334':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:43:46 -08:00
Scott Main
cf927f229f am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:41:18 -08:00
Scott Main
aed4ced655 Android U Class: Developing Android Applications for the Enterprise. 
This class uses a sample app.

Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
 2011-12-15 10:38:32 -08:00
Scott Main
ecaee21d30 am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:15:21 -08:00
Scott Main
e4e6c06641 am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:13:07 -08:00
Scott Main
f9cca66e8b Docs: Training class on Identifying and Authenticating Users. 
Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
 2011-12-15 10:07:03 -08:00
The Android Automerger
cb1f41d69c merge in ics-mr1-release history after reset to ics-mr1 2011-12-14 22:14:25 -08:00
Dianne Hackborn
13299a33e1 am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '399f1df38594ea8bc927ad23bfbde996a9dc161d':
  Fix some java docs.
 2011-12-14 18:19:42 -08:00
Dianne Hackborn
399f1df385 Merge "Fix some java docs." into ics-mr1 2011-12-14 18:18:29 -08:00
Dirk Dougherty
41d90f39a5 am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '26bd66df4fc8caa7885fe3a4e78e379389a24a94':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-14 17:22:59 -08:00
Dirk Dougherty
26bd66df4f Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 2011-12-14 17:21:13 -08:00
Dianne Hackborn
251fe26375 Fix some java docs. 
Change-Id: I0eeba6f9108db74418063fba522ed3ef1c27ae95
 2011-12-14 17:20:54 -08:00
Dirk Dougherty
9a6b4245c9 Doc change: add MR1 API summary and updated highlights. 
Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
 2011-12-14 17:17:09 -08:00
The Android Open Source Project
b14436d070 Reconcile with ics-mr1-release 
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
 2011-12-14 16:05:32 -08:00
James Dong
4a30052bea Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 
1. Revert "Fix drm flag setting missed in false drm recognition fix."
   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
 2011-12-14 15:44:42 -08:00
Scott Main
5ebf8fbb1e am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit 'd1f2b7ccb7e8672f0af9f940864111c8dbe1ff80':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-14 14:58:02 -08:00
Scott Main
d8dec14201 am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit 'b8ea1f93bb97c2aa0a3fffaa12aaaa8923449b4c':
  doc change: Android U lessons for audio and battery
 2011-12-14 14:56:02 -08:00
Scott Main
d1f2b7ccb7 am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit '56a3e326192c7496b67666b29071dc9f38c59da9':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-14 14:55:44 -08:00
Scott Main
b8ea1f93bb am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1':
  doc change: Android U lessons for audio and battery
 2011-12-14 14:53:40 -08:00
Scott Main
56a3e32619 Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 2011-12-14 14:53:04 -08:00
Scott Main
4dc763c700 Merge "doc change: Android U lessons for audio and battery" into ics-mr0 2011-12-14 14:51:30 -08:00
Scott Main
fd24af6620 am 691fea72: am 70645e36: Docs: Add class for Sharing Content 
* commit '691fea726dbefe2a7142b403bfc47f5c9029f61a':
  Docs: Add class for Sharing Content
 2011-12-14 14:42:57 -08:00
Scott Main
691fea726d am 70645e36: Docs: Add class for Sharing Content 
* commit '70645e363e8601550468b726251f4f52f383b9fc':
  Docs: Add class for Sharing Content
 2011-12-14 14:40:19 -08:00
James Dong
3f6a7d1ee9 am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 
* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix."    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
 2011-12-14 13:50:08 -08:00
Scott Main
70645e363e Docs: Add class for Sharing Content 
Change-Id: I078a02d952e652c16f84e1b3f7613f3dc9364c97
 2011-12-14 13:18:37 -08:00
James Dong
d70c64db9f Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 
1. Revert "Fix drm flag setting missed in false drm recognition fix."
   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
 2011-12-14 11:01:59 -08:00