81241 Commits

Author SHA1 Message Date
Raph Levien
e3bfa279cc Merge "Initialize shaper offset array. Needed for bug 5443796." 2012-06-26 09:46:27 -07:00
Raph Levien
f62034d896 Initialize shaper offset array. Needed for bug 5443796.
Harfbuzz apparently requires the offset array to be initialized to zero,
otherwise it can report corrupt glyph positions. This change also
contains a small amount of refactoring to avoid code duplication.

Change-Id: I2553974f40bc8e0549876c7d31243960ca92a8a2
2012-06-26 08:59:17 -07:00
The Android Open Source Project
0cedfe09e5 am 51d33db0: Reconcile with jb-release
* commit '51d33db0f1f190110824b03a2ee6dda07b99ecaf':
2012-06-26 07:21:26 -07:00
The Android Open Source Project
51d33db0f1 Reconcile with jb-release
Change-Id: I93b16393c39020ad35743106f8c44970b69b1dfa
2012-06-26 07:18:21 -07:00
Joe Fernandez
3a77ccc63f docs: ADK 2012 documentation with AOA protocol docs
Change-Id: Ife96b3ffa890d42fc97125b30bdd389448645562
2012-06-26 02:24:32 -07:00
Scott Main
bf5c483813 am d1ae2d71: am e066fd3c: Merge "docs: move NDK into Download section" into jb-dev
* commit 'd1ae2d715e135a2895f39ac053499c623faa24ae':
  docs: move NDK into Download section
2012-06-25 21:23:47 -07:00
Scott Main
d1ae2d715e am e066fd3c: Merge "docs: move NDK into Download section" into jb-dev
* commit 'e066fd3c9b2270e182eb87be8efb1d5c4aee60e2':
  docs: move NDK into Download section
2012-06-25 21:20:02 -07:00
Scott Main
e066fd3c9b Merge "docs: move NDK into Download section" into jb-dev 2012-06-25 21:17:49 -07:00
Dianne Hackborn
a4b7f2f75e Use two fingers to work some magic...
Change-Id: Ibcb3dbd3d158c22da8277e544d81fb47eadccd49
2012-06-25 19:19:15 -07:00
Nick Kralevich
6a15634f60 am 3346bc69: am ab294eeb: Merge "DevicePolicyManagerService: dump less" into jb-dev
* commit '3346bc69493e75565208f9b485bd6038e6abefe9':
  DevicePolicyManagerService: dump less
2012-06-25 18:48:27 -07:00
Nick Kralevich
3346bc6949 am ab294eeb: Merge "DevicePolicyManagerService: dump less" into jb-dev
* commit 'ab294eeb20d884855b038600f94a6e17b88b5772':
  DevicePolicyManagerService: dump less
2012-06-25 18:46:12 -07:00
Nick Kralevich
ab294eeb20 Merge "DevicePolicyManagerService: dump less" into jb-dev 2012-06-25 18:43:56 -07:00
Dianne Hackborn
dfcd6653c5 am e53fd84a: am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev
* commit 'e53fd84a28584692d9c99712a3d36100643ba000':
  Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.
2012-06-25 18:17:19 -07:00
Dianne Hackborn
e6c2d62efb am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev
* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
2012-06-25 18:17:15 -07:00
Dianne Hackborn
2ccb112633 am b4215267: (-s ours) am fca66cd8: Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev
* commit 'b4215267f342759c8bdad02ed124dae4bb6d6833':
  DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses
2012-06-25 18:17:12 -07:00
Svetoslav Ganov
11844b14d0 am 4844fccc: am 5d88c14c: Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev
* commit '4844fccc793078f44c8bffd1707ac589fad14f6e':
  Ensure screen reader URL gets updated during ICS to JB update.
2012-06-25 18:17:07 -07:00
Nick Kralevich
be00b41014 DevicePolicyManagerService: dump less
Reduce the amount of unnecessary information emitted from
the DevicePolicyManagerService.

Bug: 6732364
Change-Id: I639f6beab8471bdbe41ce6cd3a5a378acaf678b2
2012-06-25 17:39:12 -07:00
Dianne Hackborn
e53fd84a28 am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev
* commit '9e608c12186d308fb1711e8824901fdf931a3a96':
  Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.
2012-06-25 17:37:17 -07:00
Dianne Hackborn
9906e784fa am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
2012-06-25 17:37:15 -07:00
Dianne Hackborn
b4215267f3 am fca66cd8: Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev
* commit 'fca66cd828e214fe7494e46c7daa2879dfc3210d':
  DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses
2012-06-25 17:37:13 -07:00
Jeff Brown
041c36686d Merge "Improve handling of size and orientation." 2012-06-25 17:37:06 -07:00
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
Jeff Brown
037f727f49 Improve handling of size and orientation.
Some touch device drivers report the range of
ABS_MT_ORIENTATION as [0,1].  The Linux multitouch protocol
spec says that the 0 value should always be considered vertical.

Add a new 'box' calibration mode for size to handle the case
where width and height are being provided.  The 'diameter'
calibration mode is inadequate because it drops one of these
components.

Change-Id: I7bd744fdff95acd4044d295efe8bd7186dbe8061
2012-06-25 17:35:13 -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
debee3942c am fb739ae7: am fcd7cf2a: Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev
* commit 'fb739ae7491a3abd4feecf2fac43a900b4f05850':
  cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f
2012-06-25 16:03:30 -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
85a2d7f94e am c4d7721c: am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev
* commit 'c4d7721cb08cc797ea592f54797135f372689f6a':
  Update documentation on max widget bitmap usage
2012-06-25 15:31:25 -07:00
Jeff Brown
ad51a1e923 am 0086ec0d: am d48cf0c0: Merge "Don\'t wait until boot timeout if there is no wallpaper." into jb-dev
* commit '0086ec0d3009bc8c80e1330cd73ba534aa45f489':
  Don't wait until boot timeout if there is no wallpaper.
2012-06-25 15:31:23 -07:00
Jeff Brown
c585841115 am db65cc52: am a3a59a2f: Merge "Don\'t enable input dispatch until display enabled." into jb-dev
* commit 'db65cc520ebb3f9cfafa4a9d5be9f07621814213':
  Don't enable input dispatch until display enabled.
2012-06-25 15:31:19 -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
Raph Levien
3b00fc2eca Merge "Fix broken build when DEBUG_GLYPHS is set" 2012-06-25 15:18:45 -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
9ac704fe1c am 4415838b: am b032f9fc: Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev
* commit '4415838b4b7014cee4a4bd1bfaeafa39d177a503':
  TabletStatusBar: Hide notifications during Setup Wizard
2012-06-25 15:03:28 -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