62709 Commits

Author SHA1 Message Date
Mike Cleron
840201d6e2 Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Scott Main
801fda548c AndroidU lesson on designing for multiple screens.
This change adds the text for the AndroidU lesson "Designing for Multiple
Screens", which shows how to write applications that adapt properly
to screen size, density and orientation for maximum compatibility.
Update makefile and resources-data.js for rendering source in HTML
Add ZIP file for sample

Change-Id: I671bb3063d5bf02681bc547ffe5262a9df22037a
2011-12-12 17:13:31 -08:00
Dianne Hackborn
0ae6e1719b am 359bb3b4: Final API 15.
* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
  Final API 15.
2011-12-12 17:04:04 -08:00
Dianne Hackborn
359bb3b432 Final API 15.
Change-Id: Ic356a7b4d56237e928e653c68e87b070e923d145
2011-12-12 16:26:38 -08:00
Amith Yamasani
3066afdc6f Update VIBRATE_ON to a supported value when upgrading from GB.
Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.
Change-Id: I6638c8a8729d850e71db10d27a0b50d24dc11f19
2011-12-12 16:24:13 -08:00
Dianne Hackborn
2ad8a89b4b am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
  SDK only: now that support lib is in SDK, we can link to it.
2011-12-12 16:12:40 -08:00
Dianne Hackborn
a1279586dd Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 2011-12-12 16:09:54 -08:00
Gilles Debunne
8e22ec9bc6 am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1
* commit 'a1277de3c393fb0861d26ec5551ae4247e32dee4':
  Prevent a memory leak in TextLine.
2011-12-12 15:56:33 -08:00
Gilles Debunne
7ffadba5df am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1
* commit '1fb90497b73b1560c55f1cb73cd394c3b8714212':
  Text blinking cursor hard to see.
2011-12-12 15:54:38 -08:00
Gilles Debunne
a1277de3c3 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
1fb90497b7 Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Adam Powell
bffe0be3af am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
* commit '9c92fcd91c67a98f3a767255e7d3748bca3ef751':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
2011-12-12 15:42:22 -08:00
Adam Powell
9c92fcd91c Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 2011-12-12 15:40:00 -08:00
Dianne Hackborn
7871badd5d SDK only: now that support lib is in SDK, we can link to it.
Update some of the platform documentation to directly link to
relevent support lib docs.  Yay!

Also improve BroadcastReceiver documentation to more clearly
discussion security around receivers, and how the support
lib's LocalBroadcastManager can help.

Change-Id: I563c7516d5fbf91ab884c86bc411aff726249e42
2011-12-12 15:39:50 -08:00
Adam Powell
f93bb6d8fd Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
Preserve the ability to call getChildVisibleRect without the view
being attached to a window.

Change-Id: I702b19fa1625c346eb22fda4a4ffb6e8f790b689
2011-12-12 15:23:12 -08:00
Jamie Gennis
74e0fcaed1 am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
* commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc':
  SurfaceTexture: fix a verbose-log compile error
2011-12-12 14:12:33 -08:00
Jamie Gennis
a1dee3f500 Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 2011-12-12 14:10:04 -08:00
Gilles Debunne
c3fb7a11ad Prevent a memory leak in TextLine.
Bug 5740435

The new SpanSet cached objects should be recycled when the TextLine is
recycled to prevent a reference to their span, which may lead to the
entire activity.

Change-Id: I4469e418a228bd71eb8be1d43ed86de49baba165
2011-12-12 14:03:40 -08:00
Gilles Debunne
961ebb9ab0 Text blinking cursor hard to see.
Bug 5738416

This problem was introduced in
https://android-git.corp.google.com/g/#/c/152599

The invalidated cursor region is no longer expanded to include the
cursor drawable (different from the handles' drawables).

Added that code back. Added a flag, since invalidateRegion is also
used to invalidate text span regions in spell check (assumes the decorated
span bounds are not bigger that text boundaries), which is fine in case
of underline.

When the cursor is moved on a single line, invalidate the whole line
(same as what was done before). This is sub-optimal, will file a bug
to fix this. The core problem is that we should invalidate the previous
and the new cursor's positions. We only have one of these.

Change-Id: I9ada9340fb52aad3d80c39efd021fd3f9ec0cc4d
2011-12-12 13:56:04 -08:00
Raphael
ab8d6785dc am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
2011-12-12 13:16:35 -08:00
Raphael
2ace3b01ab Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 2011-12-12 13:14:12 -08:00
Matthew Xie
18ad6514bb am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
2011-12-12 12:09:13 -08:00
Matthew Xie
ed0830c502 Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 2011-12-12 12:07:39 -08:00
Matthew Xie
2d789e58a8 Move broadcastState STATE_TURNING_ON before persistSwitchSetting
CTS test revealed that persistSwitchSetting could take more than 1 second.
STATE_TURNING_ON intent missed the test timing. We move the broadcast
before persistSwitchSetting
bug 5740715

Change-Id: I54a0a0afc8d1c4fc28f84e6122809af2f1456ca7
2011-12-12 11:36:18 -08:00
Eric Fischer
f3ea02319f am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '386f208489d85d81755b64e92a84290953accfc0':
  Import revised translations.  DO NOT MERGE
2011-12-12 11:06:38 -08:00
Eric Fischer
386f208489 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-12 11:04:39 -08:00
Eric Fischer
c1e2aca598 Import revised translations. DO NOT MERGE
Change-Id: Ia118056259f828ff913d8a9bf2bc3a8fa2c54f9c
2011-12-12 10:59:11 -08:00
The Android Open Source Project
40375099d1 Reconcile with ics-mr1-release
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
2011-12-12 07:59:17 -08:00
The Android Open Source Project
f14dc29104 Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
2011-12-12 07:47:43 -08:00
Raphael
7c3bef85da Merge "AAPT fix printf %zd crash on Windows". Do not merge.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Bug: 5742142

(cherry picked from commit f51125d8429ffa71c57ba6fbdca9effc72642a9b)

Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1
2011-12-11 13:59:02 -08:00
Jeff Tinker
a5cbf023e3 Fix drm enumeration order, resolves failure to play forward lock ringtones
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
2011-12-09 20:04:17 -08:00
The Android Automerger
c721ba76a4 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 16:17:04 -08:00
Justin Ho
df83cfc95c am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
  Quick settings icons updated to match ics style on tablet
2011-12-09 15:43:48 -08:00
Justin Ho
1cec30a182 Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 2011-12-09 15:42:10 -08:00
Jamie Gennis
798b9cdf8c SurfaceTexture: fix a verbose-log compile error
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
2011-12-09 15:07:44 -08:00
Jeff Tinker
dc44e06ef3 am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
  Fix drm flag setting missed in false drm recognition fix.
2011-12-09 11:13:39 -08:00
Jeff Tinker
ef664f62a1 Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 2011-12-09 11:11:56 -08:00
Joe Fernandez
a4f49ac528 am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
2011-12-09 10:47:59 -08:00
Joe Fernandez
4b3227de17 am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '89c3bc38421a3f01b39f0246e53884bdf8b14415':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
2011-12-09 10:45:44 -08:00
Joe Fernandez
89c3bc3842 Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 2011-12-09 10:43:32 -08:00
Gilles Debunne
f107abec56 am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
* commit 'caf4ead320499cc9a7a2e3eb17beaaf92b391212':
  Blinking cursor in Talk
2011-12-09 09:36:23 -08:00
Gilles Debunne
caf4ead320 Merge "Blinking cursor in Talk" into ics-mr1 2011-12-09 09:34:04 -08:00
Jeff Tinker
9f704f6c46 Fix drm flag setting missed in false drm recognition fix.
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
2011-12-09 09:09:08 -08:00
The Android Open Source Project
175d5d76b0 Reconcile with ics-mr1-release
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
2011-12-09 07:11:10 -08:00
The Android Automerger
1cc6131f6e merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 06:58:10 -08:00
James Dong
406dd5d1e4 am aadbd80b: Fixed the false drm recognition.
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
  Fixed the false drm recognition.
2011-12-09 00:17:56 -08:00
James Dong
aadbd80b30 Fixed the false drm recognition.
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1

related-to-bug: 5732033
2011-12-08 21:01:31 -08:00
Gilles Debunne
17994a1d04 Blinking cursor in Talk
I verified that this fixes the unblinking cursor problem in Talk.

Change-Id: I5e3e5c8ad5cf3d8479462495107bf93e5e4fb956
2011-12-08 18:40:27 -08:00
Gilles Debunne
1742f20c66 am be5f49fb: Performance improvements for long text edition.
* commit 'be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
  Performance improvements for long text edition.
2011-12-08 18:35:22 -08:00
Gilles Debunne
be5f49fb6e Performance improvements for long text edition.
Limit each parse to batches of a few words, to keep the UI thread
responsive.

Possible optimizations for the future:
- SpellCheck in a thread, but that requires some locking mecanism
- Only spell check what is visible on screen. Will require additional
  spans to tag the pieces of text.

This is a cherry pick of 145656 into ICS-MR1

Patch Set 2: Make the Runnable shared and stop it when detached.

Change-Id: Ibf8e98274bda84b7176aac181ff267fc1f1fa4cb
2011-12-08 18:26:49 -08:00