Commit Graph

23902 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
2729347c6d am 0b5d57ab: am 715f8610: Merge "Clarify documentation of Cursor get* methods."
* commit '0b5d57ab7ea062af4502be5af2d51883d251c0bc':
  Clarify documentation of Cursor get* methods.
2010-11-03 10:59:36 -07:00
Gloria Wang
fb7b3918e1 am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
  - Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
2010-11-03 10:59:23 -07:00
Joe Malin
3f1072eb34 am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
* commit 'fcea62a64cba3422ae7d0c1eeee529fd49485984':
  DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-03 10:59:03 -07:00
Raphael
d325165d7c am 19ed73ae: am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
* commit '19ed73ae7fddf66b335a89a33d346a5b50c1f274':
  Support for <compatible-screens><screen> in ADT.
2010-11-03 10:58:47 -07:00
Gilles Debunne
5f3db64914 am a090d64a: (-s ours) am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit 'a090d64ac198b878a3ea01204298d5ed5eb8fbb8':
  Rescaled/updated mdpi assets added.
2010-11-03 10:58:09 -07:00
Gilles Debunne
3180d34a1a am 51b9cc04: (-s ours) am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '51b9cc04e816a2bd613ad624b3ed7c6f12381928':
  Rescaled/updated mdpi assets added.
2010-11-03 10:50:29 -07:00
Gil Dobjanschi
9b8279e176 Merge "Use SoftReference for WaveformData" 2010-11-02 20:26:22 -07:00
Xavier Ducrohet
411fa52829 Merge "More implementation of the layoutlib Paint/Canvas delegates." 2010-11-02 18:28:16 -07:00
Jeff Brown
3a1cbeeb9a Merge "Fix a key repeating bug." 2010-11-02 18:23:55 -07:00
Jeff Brown
92988aab48 Fix a key repeating bug.
This change fixes a bug in the dispatcher where the window manager
policy would incorrectly receive a key repeat count of 0 in the case
where the key repeat was generated by the hardware or driver.
Long-press on HOME was broken as a result.

Bug: 3159581
Change-Id: If0f02662313f5b879a4e566fbb461389e274a550
2010-11-02 17:58:22 -07:00
Jeff Brown
b0bb949f09 Merge "Add plumbing for volume mute key." 2010-11-02 17:38:18 -07:00
Jeff Brown
7e5660f3e2 Add plumbing for volume mute key.
Full support for the volume mute key will be implemented in a
later change.

Bug: 2912307
Change-Id: I98c27d6360f159c8b7447e04b45f442eff87b38a
2010-11-02 17:31:39 -07:00
Gloria Wang
5fc1dd15f5 Merge "Use SystemProperties.get() instead of System.getProperty()" 2010-11-02 17:26:24 -07:00
Romain Guy
e113710ebd Merge "Optimize FBO drawing with regions. This optimization is currently disabled until Launcher is modified to take advantage of it. The optimization can be enabled by turning on RENDER_LAYERS_AS_REGIONS in the OpenGLRenderer.h file." 2010-11-02 16:23:22 -07:00
Romain Guy
b801624dc4 Optimize FBO drawing with regions.
This optimization is currently disabled until Launcher is
modified to take advantage of it. The optimization can be
enabled by turning on RENDER_LAYERS_AS_REGIONS in the
OpenGLRenderer.h file.

Change-Id: I2fdf59d0f4dc690a3d7f712173ab8db3848b27b1
2010-11-02 16:17:23 -07:00
Irfan Sheriff
0754fc6ec9 Merge "Use AsynChannel for synchronous API" 2010-11-02 16:12:13 -07:00
Gloria Wang
5d4f85bfce Merge "Disable some logs" 2010-11-02 15:32:44 -07:00
Amith Yamasani
3c52e01ecc Merge "Use Holo theme for Ringtone picker." 2010-11-02 14:37:59 -07:00
Jean-Baptiste Queru
84b0164224 am 715f8610: Merge "Clarify documentation of Cursor get* methods."
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
  Clarify documentation of Cursor get* methods.
2010-11-02 14:18:02 -07:00
Stephen Hines
0dc3352c28 Merge "New RS types test for checking compilation." 2010-11-02 14:14:35 -07:00
Gloria Wang
9bc44ea84f Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-11-02 14:05:13 -07:00
Gloria Wang
49bcf3e8b6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
2010-11-02 14:02:59 -07:00
Roy West
bd6a73630a Merge "Fix bug 2248975, edits to load error HTML pages." 2010-11-02 13:54:30 -07:00
Joe Malin
dc6805745f am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
* commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d':
  DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-02 13:18:47 -07:00
Joe Malin
65b842595d Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 2010-11-02 13:17:16 -07:00
Jean-Baptiste Queru
b664bdce42 Merge "Clarify documentation of Cursor get* methods." 2010-11-02 13:11:56 -07:00
Raphael
8acbc9d954 am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
* commit '46468dde8d7f9bd42ad180c2882bff6ef98685cd':
  Support for <compatible-screens><screen> in ADT.
2010-11-02 11:45:07 -07:00
Raphael
1dfaaa7368 Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 2010-11-02 11:43:11 -07:00
Kenny Root
3fa3666a2d Merge "Fix default return code for getResource" 2010-11-02 11:40:27 -07:00
Kenny Root
ec033c57b6 Fix default return code for getResource
Reorganization of getResource to allow for other densities accidentally
overrode the default return code for getResource from BAD_VALUE to
BAD_INDEX. This corrects the default return to BAD_VALUE which restores
other things to working.

Bug: 3155824
Change-Id: I13dafff85bc6978c5f5435fc09ab0474c7885c4d
2010-11-02 11:27:31 -07:00
Vasu Nori
71054a7c34 Merge "deperecate Cursor requery() and sa, Loader should be used instead" 2010-11-02 11:27:29 -07:00
Joe Onorato
8c6bd3d023 Merge "Put back the back button" 2010-11-02 10:11:25 -07:00
Gilles Debunne
3166db0994 am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '18149c47bfc87c88798e6820d7153e588b374ed3':
  Rescaled/updated mdpi assets added.
2010-11-02 10:08:27 -07:00
Gilles Debunne
ba3328cd2a Merge "Made paste window nicer: asset and padding" 2010-11-02 10:06:56 -07:00
Gilles Debunne
27d7d3eda1 am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '94da7f983cc33d10bf1560bb32ec19400437a42a':
  Rescaled/updated mdpi assets added.
2010-11-02 10:05:55 -07:00
Gilles Debunne
b14d942ae5 Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:05:52 -07:00
Gilles Debunne
3c65ce2dc3 Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:04:40 -07:00
satok
28f6f366ef Merge "Update the subtype icon properly." 2010-11-02 04:14:17 -07:00
Jeff Brown
2d283a68e4 am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression.
* commit '7ab5d2d951792c9b1a1e7cfb279280c2d076506f':
  Fix bugs related to cheek event suppression.
2010-11-02 02:34:15 -07:00
Jeff Brown
5d0a9b474b am a87ea46c: Fix bugs related to cheek event suppression.
* commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d':
  Fix bugs related to cheek event suppression.
2010-11-01 21:02:05 -07:00
Jeff Brown
f6149c3229 Fix bugs related to cheek event suppression.
Two issues:

1. First, due to an inverted conditional in the input dispatcher, we were
   reporting touches as long touches and vice-versa to the power manager.

2. Power manager user activity cheek event suppression also suppresses touch
   events (but not long touch or up events).  As a result, if cheek event
   suppression was enabled, touches would not poke the user activity timer.
   However due to the above logic inversion, this actually affected long
   touches.  Net result, if cheek suppression was enabled in the power manager
   and you held your thumb on the screen long enough, the phone would
   go to sleep!

Cheek event suppression is commonly turned on when making a phone call.
Interestingly, it does not seem to get turned off afterward...

This change fixes the logic inversion and exempts touches from the cheek
suppression.  The reason we do the latter is because the old behavior
was actually harmful in other ways too: a touch down would be suppressed
but not a long touch or the touch up.  This would cause bizarre behavior
if you touched the screen while it was dimmed.  Instead of brightening
immediately, it would brighten either when you lifted your finger or
300ms later, whichever came first.

Bug: 3154895
Change-Id: Ied9ccec6718fbe86506322ff47a4e3eb58f81834
2010-11-01 20:51:58 -07:00
Gloria Wang
1e04f5b26c Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled." 2010-11-01 20:38:51 -07:00
Daniel Lehmann
d6a3cddba5 Merge "Added missing label and char limits" 2010-11-01 20:25:31 -07:00
Neal Nguyen
8feb41267e am 424963ef: am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests.
* commit '424963ef8d46c34d67ea24d25735944c0d87409c':
  Adding some StorageManager integration test infrastructure and some basic tests.
2010-11-01 19:44:50 -07:00
Neal Nguyen
fbadab9066 am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests.
* commit '5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954':
  Adding some StorageManager integration test infrastructure and some basic tests.
2010-11-01 19:42:22 -07:00
satok
8a219246f3 Merge "Fix a bug that enabled Subtype ID can't be saved propery." 2010-11-01 19:41:44 -07:00
Neal Nguyen
9c0a63107f am af35b8f4: am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.
* commit 'af35b8f43262a27c941c396186501a9695954cd8':
  Cleaning up some more flakiness in DownloadManager tests.
2010-11-01 17:44:13 -07:00
Neal Nguyen
815a6bc0cf am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.
* commit 'bd06f02d02e07ca15e420ee9e50e35253646ba64':
  Cleaning up some more flakiness in DownloadManager tests.
2010-11-01 17:41:24 -07:00
Jamie Gennis
d17f110351 Merge "Stop using OMX_COLOR_FormatAndroidPrivateStart." 2010-11-01 17:16:50 -07:00
Nicolas Roard
7061c2493e Merge "Update layers only" 2010-11-01 16:58:01 -07:00