Eric Fischer
183dc8e254
Merge "Import translations. DO NOT MERGE"
2012-05-14 14:51:52 -07:00
Eric Fischer
8e96d58146
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-14 14:51:41 -07:00
Michael Jurka
b520676175
Merge "Hide notification panel when launching recent apps" into jb-dev
2012-05-14 14:44:33 -07:00
Michael Jurka
56a5783c02
Hide notification panel when launching recent apps
...
Bug: 6484280
Change-Id: Ib97af40979ccdd98aa2b8af6c1488b33b34bdf2b
2012-05-14 14:38:38 -07:00
Eric Fischer
1d1a5273a9
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-14 14:31:01 -07:00
Daisuke Miyakawa
df9b20504b
Remove assets for Phone's incoming call widget
...
Bug: 6491970
Change-Id: I6c0965b7807daef91e0e61252f254ac704c60c67
2012-05-14 14:20:31 -07:00
Svetoslav Ganov
844047acb7
Merge "Fix inconsitency in aAccessibilityNodeInfo cache." into jb-dev
2012-05-14 14:14:26 -07:00
Romain Guy
00fdfe4106
Merge "Properly pre-cache latin glyphs Bug #6408362 " into jb-dev
2012-05-14 14:12:27 -07:00
Philip Milne
c8b7747bc0
Merge "Add validation code for GridLayout.LayoutParams" into jb-dev
2012-05-14 14:12:06 -07:00
Romain Guy
ae91c4cbc7
Properly pre-cache latin glyphs
...
Bug #6408362
Change-Id: Ie11644c5a9e2d87d3b851b7e619e5f04b60a7e02
2012-05-14 14:06:02 -07:00
Michael Jurka
143a02aa79
Merge "Prevent ViewPropertyAnimators from getting started twice" into jb-dev
2012-05-14 14:04:27 -07:00
Philip Milne
0f57cea898
Add validation code for GridLayout.LayoutParams
...
Bug 6404882.
The supplied code in this bug sets up a table with 2 columns and then
tries to add a component in column 5. Earlier attempts to fix this
by 'doing what the user meeant' had unwanted side-effects. This CL is
intended to defend against all ways to register invalid LayoutParams
and throw IllegalArgumentExcpetion when any column index falls outside the
range [0 .. N] where N is the number of columns. It also includes the
symmetrical check for rows.
Change-Id: I958a6d16035889cd954b78108773426e8b6b6d95
2012-05-14 13:42:05 -07:00
Eric Fischer
412b1efc84
Import translations. DO NOT MERGE
...
Change-Id: Ib0c7dd568fb3e19da5e8a57ea8b9ffa07b56ebcf
2012-05-14 13:32:07 -07:00
Eric Fischer
fb7a89fe55
Import translations. DO NOT MERGE
...
Change-Id: I7ad9995da8405b20d50ecb211786ebc86469ea42
2012-05-14 13:30:10 -07:00
Dianne Hackborn
776627b8b0
Merge "Add missing XML close tag. Fixes bug 6488238." into jb-dev
2012-05-14 13:18:37 -07:00
Eric Fischer
6c4e985ef9
Import translations. DO NOT MERGE
...
Change-Id: I848dfae2bda73db5bc502c53c3180f833a56d563
2012-05-14 13:16:23 -07:00
Jake Hamby
47509c744f
Merge "Change SMS security check to enforceCallingPermission()." into jb-dev
2012-05-14 13:12:14 -07:00
Raph Levien
d26e18bfe9
Add missing XML close tag. Fixes bug 6488238.
...
Change-Id: Ic1197d0b8bece1595626a92f025cb7ae7e96163d
2012-05-14 13:11:57 -07:00
Eric Fischer
8f38310e40
Import translations. DO NOT MERGE
...
Change-Id: Ie0e5b24e9df9f9c2e3706cf17bb04cc3e1d00cb0
2012-05-14 13:11:13 -07:00
Chet Haase
728e43948c
Merge "Minor touch-up of Animation docs" into jb-dev
2012-05-14 12:58:08 -07:00
Jamie Gennis
04d3521839
Merge "WindowManager: unset the wallpaper window crop" into jb-dev
2012-05-14 12:14:49 -07:00
Jean-Michel Trivi
2411c3361e
Merge "Verify AudioTrack only uses a valid multichannel configuration" into jb-dev
2012-05-14 08:56:53 -07:00
Jean-Michel Trivi
d9e587137b
Verify AudioTrack only uses a valid multichannel configuration
...
Enforce the same rules as for HDMI output:
- FL/FR must be present
- paired channels must be used in pairs (e.g. no rear left
without rear right)
Bug 6392126
Change-Id: I0a39e474dcf509cb7eabd8edd1f0e44852d72b51
2012-05-14 08:49:42 -07:00
Romain Guy
e9561f5268
am ce8b9c33: am 15e84399: Merge "Add call sites for OpenGL\'s debug label extension" into jb-dev
...
* commit 'ce8b9c33b3dec887355b1ef7359d8282a6443d33':
Add call sites for OpenGL's debug label extension
2012-05-14 08:38:17 -07:00
Mangesh Ghiware
96db7444c4
am 5794bf2b: am 05efb04c: Merge "Maintain the anchor at top/left on orientation change." into jb-dev
...
* commit '5794bf2b0ece5dc480513feffcf424d86f44951b':
Maintain the anchor at top/left on orientation change.
2012-05-14 08:38:14 -07:00
Jim Miller
98ada59c9f
am 8c113503: am 5a588dbe: Merge "Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet" into jb-dev
...
* commit '8c113503669fea3fda44e5672ec027e6b15d438f':
Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet
2012-05-14 08:38:04 -07:00
Michael Jurka
577ad3f14d
am e4046724: am c8179e78: Merge "Improve transition out of recents" into jb-dev
...
* commit 'e4046724f6de620d0660dec32c70808fb94abc99':
Improve transition out of recents
2012-05-14 08:37:59 -07:00
Jim Miller
3a1f9337f6
am 73c06387: am 76e07e77: Merge "Fix 6474712: Disable the google gesture on prime while notifications are open" into jb-dev
...
* commit '73c0638726c973dbc107bfd8a70737d693b5b4a1':
Fix 6474712: Disable the google gesture on prime while notifications are open
2012-05-14 08:37:56 -07:00
Jim Miller
465de2ddf4
am a11b24ef: am 01119de9: Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev
...
* commit 'a11b24ef12ace6b5923997566a434a4fd8041ecb':
Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup
2012-05-14 08:37:52 -07:00
Jean-Michel Trivi
d8be1b9e67
am 3d486406: am 2d97a70f: Merge "Start voice-based interactions from headsethook key" into jb-dev
...
* commit '3d486406ab510dfab0e4b6913de90be9486074ad':
Start voice-based interactions from headsethook key
2012-05-14 08:37:47 -07:00
Pin Ting
f579c86ae4
am 4de3c27c: am 59e2a1ea: Merge "Fix typo in javadoc." into jb-dev
...
* commit '4de3c27cc702c019e7a9304d9e548fc81340ad7e':
Fix typo in javadoc.
2012-05-14 08:37:44 -07:00
Jeff Brown
1243d62c29
am a1f13767: am 11cfd0d4: Merge "Tell power HAL when user activity occurs." into jb-dev
...
* commit 'a1f13767b37fe723895f1f09a907b739885483d7':
Tell power HAL when user activity occurs.
2012-05-14 08:37:30 -07:00
Jeff Brown
ac592fb3b6
am a4881637: am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
...
* commit 'a48816375f68a8b4a945efcb68e405308a50adc9':
Move power HAL interactions to PowerManagerService.
2012-05-14 08:37:26 -07:00
Jeff Brown
93a076819e
am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev
...
* commit '1f85b46b3f4764f13c79203564ccb56be7cdf603':
Enable SQLite configuration to be set with system properties.
2012-05-14 08:37:13 -07:00
Jamie Gennis
ba6f4ee86d
am 131006b8: am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev
...
* commit '131006b810121c50425f727a5d879428f1709420':
Trace: add a tracing tag for video
2012-05-14 08:37:02 -07:00
Jamie Gennis
671543f762
am 592cbb83: am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev
...
* commit '592cbb835aa5ed104badf7de6c144a7b90300620':
Surface: replace active rect with window crop
2012-05-14 08:36:58 -07:00
Amith Yamasani
6f0d0e3ff3
am 0df55728: am 775da5fa: Merge "Update assets that didn\'t scale nicely from hdpi to tvdpi." into jb-dev
...
* commit '0df557289b98702ab3c903eadcb051ce5dc7dbee':
Update assets that didn't scale nicely from hdpi to tvdpi.
2012-05-14 08:36:47 -07:00
Victoria Lease
74023bfbb5
am a54e9953: am f1b0c4e5: Merge "Add fallback fonts for Malayalam, Kannada, and Telugu scripts" into jb-dev
...
* commit 'a54e995377d4ebb0a3633fdb82badb9536931a94':
Add fallback fonts for Malayalam, Kannada, and Telugu scripts
2012-05-14 08:36:31 -07:00
James Dong
16ff4fbab7
am f4513bb9: am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
...
* commit 'f4513bb95b6c8b831b747bf08accd74f96ce712b':
Improve notifying TimedText by reducing marshall/unmarshalling.
2012-05-14 08:36:21 -07:00
Adam Powell
e60a635919
am e48c70e4: am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev
...
* commit 'e48c70e4d9302795d5f02d352c7907302ca5c8b6':
Automatic persistent text selection for ListViews
2012-05-14 08:36:17 -07:00
Gilles Debunne
579cc204a2
am b00ceecb: am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev
...
* commit 'b00ceecb96063a30bb73b13e156a6da00e3900e7':
Cut long text into multiple DL at start
2012-05-14 08:36:08 -07:00
Craig Mautner
cf462d65d2
am ba523324: am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev
...
* commit 'ba523324f32ca55221e07e31b2d0699826daa2fe':
Keep launcher screen from flashing over lockscreen
2012-05-14 08:36:05 -07:00
Fabrice Di Meglio
96469491b7
am 791044c2: am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev
...
* commit '791044c2bf80d53ac2e1c2af153fb9d857374259':
Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly
2012-05-14 08:35:59 -07:00
Kenny Root
0a0e3468aa
am 0058ae9d: am c559e3b7: Merge "Add in constant for WPA supplication settings" into jb-dev
...
* commit '0058ae9d7bdcb5d677d1aad44079155b6e99b188':
Add in constant for WPA supplication settings
2012-05-14 08:35:48 -07:00
Jeff Sharkey
d640d0641a
am f2fe4cb1: am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
...
* commit 'f2fe4cb11b2b93acf1a983e856efe26b6bb79683':
Enforce READ_EXTERNAL through Settings.Secure.
2012-05-14 08:35:42 -07:00
Jim Miller
dc3ee963bf
am 07827454: am 2b5cebeb: Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
...
* commit '07827454efef7f46d46e923a5091d8cf1e5d0d8c':
Fix 6040870: Update MultiWaveView for new device
2012-05-14 08:35:24 -07:00
Eric Fischer
694ddb6dee
am 9f382b09: (-s ours) am 42097f5c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9f382b093feb76a9f7f7fc68cf5b131d59c658fe':
Import translations. DO NOT MERGE
2012-05-14 08:35:16 -07:00
Brian Colonna
a5cf93a84a
Merge "Fix 6283709: set max FUL failed attempts to 5" into jb-dev
2012-05-14 07:56:07 -07:00
Eric Fischer
4f6831c51d
am a7faeb0c: (-s ours) am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'a7faeb0c6b97c8a43339e45e3f37056c30e4c685':
Import translations. DO NOT MERGE
2012-05-14 07:49:28 -07:00
Irfan Sheriff
8c898e1e43
am aa7b072d: am ba1db8a5: Merge "Fix wifi direct issues" into jb-dev
...
* commit 'aa7b072dffa8ba12e74f770cafe0b7acb5b81e02':
Fix wifi direct issues
2012-05-14 07:49:15 -07:00