79597 Commits

Author SHA1 Message Date
Dianne Hackborn
9e608c1218 Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev 2012-06-25 17:35:49 -07:00
Dianne Hackborn
17990395bc Merge "Fix issue #6717667: expanded notification actions don't work on the lock screen" into jb-dev 2012-06-25 17:35:36 -07:00
Dianne Hackborn
fca66cd828 Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev 2012-06-25 17:35:21 -07:00
The Android Automerger
87c0947ad6 merge in jb-release history after reset to jb-dev 2012-06-25 17:17:46 -07:00
Svetoslav Ganov
4844fccc79 am 5d88c14c: Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev
* commit '5d88c14cd39d1100e28f7e340874655ab7a42904':
  Ensure screen reader URL gets updated during ICS to JB update.
2012-06-25 17:11:12 -07:00
Svetoslav Ganov
5d88c14cd3 Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev 2012-06-25 17:09:24 -07:00
Joe Fernandez
f86f0e68c6 docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
Change-Id: I37ac2387b1fcc6a321f5c8edc44abe834a01762d
2012-06-25 16:51:42 -07:00
Gilles Debunne
fca8947f49 Reducing the contrast of text underline
Alpha set to 50%.

Bug: 6712694
Change-Id: Ic292b6e24a97426e835fa379b1fd60d3b7912e99
2012-06-25 16:42:51 -07:00
Kenny Root
eca64b3914 Use removePackageLI instead of removing mPackages
When adding an system app via OTA, trying to remove it from mPackages
directly doesn't work. The ContentProviders and other things aren't
removed and point to the hidden system app's applicationInfo instead of
the updated app.

Bug: 6685263
Change-Id: I487cf518e0e3c60fae736e9b974617023a7dee8d
2012-06-25 16:39:45 -07:00
Jake Hamby
0f40a51b20 Fix detection of CDMA CMAS cell broadcasts.
CMAS cell broadcasts do not necessarily set the message
priority indicator subparameter. Interpret the user data as a
CMAS message if the service category is in the CMAS range.

Includes a new test case in CdmaSmsCbTest to verify correct
decoding of an actual CMAS monthly test message.

Bug: 6506785
Change-Id: I2a26a5194a1a02e34c1ef862ff348e1571df51c4
2012-06-25 16:30:06 -07:00
Joe Fernandez
fb739ae749 am fcd7cf2a: Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev
* commit 'fcd7cf2a24eaff85085fde58dc8c69f8ff374575':
  cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f
2012-06-25 16:00:43 -07:00
Joe Fernandez
fcd7cf2a24 Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev 2012-06-25 15:58:47 -07:00
Michael Jurka
c4d7721cb0 am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev
* commit '806a360275b3963d1941130ca2998a8abd76126f':
  Update documentation on max widget bitmap usage
2012-06-25 15:28:48 -07:00
Jeff Brown
0086ec0d30 am d48cf0c0: Merge "Don\'t wait until boot timeout if there is no wallpaper." into jb-dev
* commit 'd48cf0c0ce5f9458802d2be8671c85fa027a74a0':
  Don't wait until boot timeout if there is no wallpaper.
2012-06-25 15:28:46 -07:00
Jeff Brown
db65cc520e am a3a59a2f: Merge "Don\'t enable input dispatch until display enabled." into jb-dev
* commit 'a3a59a2fa7e3b3b044b41d2741118be37c57509a':
  Don't enable input dispatch until display enabled.
2012-06-25 15:28:44 -07:00
Michael Jurka
806a360275 Merge "Update documentation on max widget bitmap usage" into jb-dev 2012-06-25 15:26:48 -07:00
Jeff Brown
d48cf0c0ce Merge "Don't wait until boot timeout if there is no wallpaper." into jb-dev 2012-06-25 15:26:19 -07:00
Jeff Brown
a3a59a2fa7 Merge "Don't enable input dispatch until display enabled." into jb-dev 2012-06-25 15:26:14 -07:00
Ian Ni-Lewis
9ea1be201f cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f
Change-Id: I894d4f7b265dbbc2792207e7955453dcf27472d6
2012-06-25 15:22:23 -07:00
Michael Jurka
f25ab44975 Update documentation on max widget bitmap usage
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
2012-06-25 15:11:21 -07:00
John Spurlock
4415838b4b am b032f9fc: Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev
* commit 'b032f9fc9d32ff4e73f8323573ca2c5e427e7a74':
  TabletStatusBar: Hide notifications during Setup Wizard
2012-06-25 15:00:50 -07:00
John Spurlock
b032f9fc9d Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev 2012-06-25 14:58:22 -07:00
Andreas Huber
6dfd6aec27 am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
* commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c':
  Document some of the more common mimetypes to be used when instantiating
2012-06-25 14:53:07 -07:00
Andreas Huber
c8c5e98b9e Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev 2012-06-25 14:50:53 -07:00
Andreas Huber
68b1a6eed8 Document some of the more common mimetypes to be used when instantiating
MediaCodec components.

Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
2012-06-25 14:38:16 -07:00
Dianne Hackborn
1927ae8a56 Fix issue #6717667: expanded notification actions don't work on the lock screen
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.

Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.

Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
2012-06-25 14:28:48 -07:00
Dianne Hackborn
42e620caf0 Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.
Make sure that all cases where we remove an activity from the history
stack, we call resumeTopActivityLocked() to cause the home activity
to be launched if the stack is now empty.

Also fixed a problem where some timeouts would not be removed when destroying
an activity, and a race condition in boot that would cause the
PhoneWindowManager to initially start out with the home key not working.

Bug: 6381224
Change-Id: If046bb01aed624b0d9ee3bbaaba68ed6b98fd1d0
2012-06-25 14:27:41 -07:00
Dianne Hackborn
1520e9aeea am 612ca9c6: (-s ours) Merge "Fix shutdown sequence to avoid SIGSEGV when running am command"
* commit '612ca9c6a55bd932c45f5b85ae932a1b712dd914':
  Fix shutdown sequence to avoid SIGSEGV when running am command
2012-06-25 14:05:55 -07:00
Scott Main
451f034144 am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
* commit 'e9b4b3e94d396d176338c62f8c9f4c183b340f9b':
  docs: clean up javadoc code snippets, unescaped entities
2012-06-25 12:33:55 -07:00
Scott Main
e9b4b3e94d Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev 2012-06-25 12:31:11 -07:00
Scott Main
82e25bd59d am dccd66f5: Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that\'s still relevant to some services" into jb-dev
* commit 'dccd66f5681c1372494da635b70242a7d535debc':
  docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services
2012-06-25 12:00:06 -07:00
Scott Main
dccd66f568 Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services" into jb-dev 2012-06-25 11:57:09 -07:00
Scott Main
8ce79cc87a docs: return the sdk terms doc to the site. needs to be revised,
but for now offers some info that's still relevant to some services

Change-Id: I689171ab81b7c47334d8dfa738be80e7eca4581a
2012-06-25 11:55:20 -07:00
Eric Fischer
764d1368d6 am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c5fc8f5c1b97665d6b8b0a9d18d737f9fd2460f4':
  Import translations. DO NOT MERGE
2012-06-25 11:34:58 -07:00
Eric Fischer
c5fc8f5c1b Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-25 11:32:30 -07:00
John Spurlock
988e6b7b13 TabletStatusBar: Lights-out shadow view should be taller
The lights-out shadow view is now the same height as the system bar.
This makes for a better looking animation (no cropping) and positions
the dots in the right place.

Bug: 6722791
Change-Id: Ifc2cc1586cd72a81a7bb801442be4fa4e03da2a5
2012-06-25 14:32:05 -04:00
Scott Main
97e0a1c6f3 docs: clean up javadoc code snippets, unescaped entities
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
2012-06-25 11:25:20 -07:00
Eric Fischer
d7e646d6d7 Import translations. DO NOT MERGE
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
2012-06-25 11:24:00 -07:00
Scott Main
2965b93d5e am e40c4636: docs: move AIDL doc under Services in api guides.
* commit 'e40c4636d970c50f7719e7d5067963be93c25750':
  docs: move AIDL doc under Services in api guides.
2012-06-25 10:45:50 -07:00
Scott Main
e40c4636d9 docs: move AIDL doc under Services in api guides.
Change-Id: I525de97958e2093af15cce2b007ec022cb315a71
2012-06-25 10:02:13 -07:00
The Android Open Source Project
95dca885cf Reconcile with jb-release
Change-Id: I3dcf46b82ece74242207e8e3769a87dbe8f85a5f
2012-06-25 07:57:16 -07:00
John Spurlock
3623128d13 TabletStatusBar: Hide notifications during Setup Wizard
Protect tablet users going through the initial setup wizard from trapping
themselves in Settings before the setup wizard is complete. A similar change
was already made for phones, so use the same logic.

Also hide quick-settings button (another way to get trapped in Settings) and
associated panel click handler.  Remove clear button since we're no longer
showing notification items.

Bug: 6704080
Change-Id: If7148cde9d18f493627f8367fd4b39d22e0d5ef1
2012-06-25 09:52:38 -04:00
Adam Powell
3c419da632 am dbbfa702: Fix MediaRouter bugs
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
  Fix MediaRouter bugs
2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0 Fix MediaRouter bugs
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.

Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.

Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
2012-06-24 14:32:04 -07:00
Jeff Brown
780c46fc91 Don't wait until boot timeout if there is no wallpaper.
When launching only core apps, the wallpaper service
is not started.  Without this change the WM waits
up to 30 seconds for the wallpaper window to be created even
though it will never happen.  This introduces a significant
delay before the boot animation is dismissed so the user can
enter a decryption password.

Bug: 6263070
Change-Id: Ia975127a0bf09cf99818f7cc4fd6c0264b740ec6
2012-06-24 13:51:41 -07:00
Jeff Brown
08a746a0c6 Don't enable input dispatch until display enabled.
Bug: 6263070
Change-Id: I05d036fc1d9ec06d164d6743d45bb3f199cfab47
2012-06-24 12:23:58 -07:00
The Android Automerger
1e9aef5d94 merge in jb-release history after reset to jb-dev 2012-06-23 23:22:21 -07:00
Scott Main
1e546247b5 am 40a0376e: docs: remove unused id attribute from Button
* commit '40a0376ea5ac597d8df04fd3e4ad8bde7ac7c9ec':
  docs: remove unused id attribute from Button
2012-06-23 17:02:40 -07:00
Scott Main
40a0376ea5 docs: remove unused id attribute from Button
Change-Id: Ia61c418972699d40757923fd69ea27b26eddaa05
2012-06-23 16:42:33 -07:00
Scott Main
0c51198806 am b0efc7fc: eat comment so it doesn\'t appear in docs
* commit 'b0efc7fce7967b043dae8896e8f9bf4d11274cf4':
  eat comment so it doesn't appear in docs
2012-06-23 12:46:23 -07:00