62563 Commits

Author SHA1 Message Date
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
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
Scott Main
604e4ed481 doc change: Android U lessons for audio and battery
Change-Id: I98d83f8458e3ad62be28d09b85fe099916d1b73d
2011-12-14 10:06:34 -08:00
The Android Open Source Project
16bdd1e65e Reconcile with ics-mr1-release
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
2011-12-13 19:10:19 -08:00
Dirk Dougherty
1451f598ae am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
* commit '2e335cb02891d3653b938340a11698844e2c3d6d':
  Doc change: API diff report for 15.
2011-12-13 18:35:10 -08:00
Dirk Dougherty
2e335cb028 Merge "Doc change: API diff report for 15." into ics-mr1 2011-12-13 18:33:04 -08:00
The Android Automerger
c58e649e43 merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:03:26 -08:00
Dianne Hackborn
a80bab372d am caa8e69a: Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1
* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
  Fix issue #5756204: Crespo IME briefly appears shortened when...
2011-12-13 15:41:54 -08:00
Dianne Hackborn
caa8e69a65 Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 2011-12-13 15:40:18 -08:00
Gilles Debunne
2450b36a36 am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
  Do not spell check the foreground ExtractEditText.
2011-12-13 15:38:43 -08:00
Gilles Debunne
19636dc421 Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 2011-12-13 15:36:48 -08:00
Dianne Hackborn
33b8ee509f Fix issue #5756204: Crespo IME briefly appears shortened when...
...rotating to landscape

When doing spell checking in the same process as the spell checker, we
need to make sure it is still done asynchronously.

Putting this in I noticed quite a few threading issues in this code, so
I also addressed those (which became very obviously a problem with the
async stuff here now).

Also tweaked the service side to run spell checking at background priority.

Change-Id: I01bafe3bec6bceeca911d6bf2f61a486a2fd4c48
2011-12-13 15:15:33 -08:00
Gilles Debunne
770f0fa92e Do not spell check the foreground ExtractEditText.
Bug 5755099

In extracted text mode, we spell check the background and the foreground
edit text. All changes in the background are already propagated to the
foreground, and updates on the foreground may trigger a spell check
of the entire text since we use setText.

Change-Id: Ie44c3d9113258082ac6df5890851d0e21c702ea2
2011-12-13 14:47:26 -08:00
Dianne Hackborn
0be53567c1 am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
  Fix issue #5755172: Soft menu key disappears when menu is open
2011-12-13 13:42:07 -08:00
Gilles Debunne
0d3a5e4cbd am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '67d54ac017494229eed27a184159461d63201a9f':
  NPE in GMail / TextLine
2011-12-13 13:40:00 -08:00
Dianne Hackborn
19a06fe93c Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 2011-12-13 13:38:56 -08:00
Gilles Debunne
67d54ac017 Merge "NPE in GMail / TextLine" into ics-mr1 2011-12-13 13:37:29 -08:00
Scott Main
9a8e7afc53 am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit 'c9295b2069af6530fba37a16c88757acaaff63e8':
  Created Android University lesson for Multiple APKs.
2011-12-13 13:13:15 -08:00
Scott Main
04c6e62ce4 am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
* commit '37191e1dc783a5558eb8ee4f096bd8350c34415d':
  AndroidU lesson on designing for multiple screens.
2011-12-13 13:13:07 -08:00
Scott Main
c9295b2069 am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
  Created Android University lesson for Multiple APKs.
2011-12-13 13:10:45 -08:00
Scott Main
37191e1dc7 am 801fda54: AndroidU lesson on designing for multiple screens.
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
  AndroidU lesson on designing for multiple screens.
2011-12-13 13:10:42 -08:00
Gilles Debunne
fc997b4f78 NPE in GMail / TextLine
Bug 5753061

https://android-git.corp.google.com/g/#/c/154756/1 revealed an
other bug in SpanSet. The fitered (non empty) spans were added
in their original position instead of being indexed by count.

The nullation on recycle hence left null holes in the array.

Change-Id: If5c1435cee9a2cb88a608aa8e5f4f2f23382154c
2011-12-13 12:37:02 -08:00
Scott Main
fc279e51c0 Merge "Created Android University lesson for Multiple APKs." into ics-mr0 2011-12-13 12:25:38 -08:00
Andreas Huber
22e50edddc am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
2011-12-13 12:01:46 -08:00
Andreas Huber
3ab6300840 Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 2011-12-13 11:59:50 -08:00
Dianne Hackborn
73ab6a49db Fix issue #5755172: Soft menu key disappears when menu is open
We need to work more like before in determining whether the menu
key is needed -- in some cases look back in the window list to
determine this if we don't know the value from the current window.

This requires adding a new private flag indicating whether the
compat menu state is known for a window, which is set by
PhoneWindow as part of its existing process of computing the flag
for its own windows.

Now we can have a new API on WindowState to determine the value
of this flag for a window, which if needed walks back in the window list
to find a window the value is known for (or stops at what the policy
has determined is the top full-screen window, so we stop like we used
to at things like the lock screen or the bottom of an application).

Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
2011-12-13 11:32:11 -08:00
Andreas Huber
9a023f1f8e DO NOT MERGE: Support for parsing of "folded" RTSP header values
and some tweaks to the AMR assembler contributed by Samsung (untested).

Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1
related-to-bug: 5669027
2011-12-13 10:09:48 -08:00
The Android Open Source Project
da29653305 Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
2011-12-13 05:11:43 -08:00
The Android Automerger
6c9b675886 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:59 -08:00
Jeff Sharkey
f0213bf183 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
2011-12-12 20:21:34 -08:00