Commit Graph

16870 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
02241ab292 am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.
2010-10-11 17:49:42 -07:00
Vasu Nori
182e5cf105 am a23964f9: am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'

* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-11 17:43:34 -07:00
Brad Fitzpatrick
d532d8d8c1 am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'

* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-11 17:43:06 -07:00
Jeff Brown
dd8b0c9040 am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.
2010-10-11 17:42:30 -07:00
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -07:00
Jeff Brown
f2e0681ada am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp

* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
  Fix an event injection bug when the policy is bypassed.
2010-10-11 17:26:51 -07:00
Kenny Root
b4de3dca96 Merge "OBB: rearrange to be entirely asynchronous" into gingerbread 2010-10-11 17:24:54 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Romain Guy
20b4cf8cc7 Merge changes I9a5e01bc,If1caee31
* changes:
  Optimize GLSL shaders.
  Improve performance of linear gradients.
2010-10-11 17:13:32 -07:00
Romain Guy
707b2f78cc Optimize GLSL shaders.
Change-Id: I9a5e01bced63d8da0c61330a543a2b805388a59d
2010-10-11 16:34:59 -07:00
Jeff Brown
1da8d4d169 Merge "Fix an event injection bug when the policy is bypassed." into gingerbread 2010-10-11 16:27:36 -07:00
Jeff Brown
b931a1b418 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
2010-10-11 16:26:13 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-11 15:22:30 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device.
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
2010-10-11 15:16:28 -07:00
Shimeng (Simon) Wang
21d4e42366 Merge "Initialized the orientation variable to -1." 2010-10-11 13:56:15 -07:00
Shimeng (Simon) Wang
2edfcd584e Initialized the orientation variable to -1.
issue: 3057966
Change-Id: I31047d31376d79b1718c42633c9e6802e51213a7
2010-10-11 13:50:25 -07:00
Shimeng (Simon) Wang
10186c45ff Merge "Avoid sending false orientation event to webkit." 2010-10-11 13:23:42 -07:00
Brad Fitzpatrick
9fc2fc5757 StrictMode: link to designing for responsiveness ANR docs
Change-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e
2010-10-11 13:17:48 -07:00
Shimeng (Simon) Wang
5f7c5a25de Avoid sending false orientation event to webkit.
issue: 3057966
Change-Id: I1061df6da751e3a0ef158b5eabfb520d0473d3d0
2010-10-11 13:12:48 -07:00
Romain Guy
7f92b04089 Merge "Redraw the screen when needed." 2010-10-11 12:44:28 -07:00
Romain Guy
101e2ae00c Redraw the screen when needed.
Bug #3085265

Change-Id: Ibb47500f819b823eb4f3dee829f0396dce9a3d65
2010-10-11 12:41:21 -07:00
Gilles Debunne
fe14293f58 resolved conflicts for merge of 2da9338c to master
Change-Id: I0a5d667b578e23c064ebe7bacc898125fbf40cc2
2010-10-11 12:23:55 -07:00
Brad Fitzpatrick
3a4b7dfdda am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Merge commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp

* commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
  StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-11 12:05:14 -07:00
Brad Fitzpatrick
5804b4fd47 Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread 2010-10-11 11:56:40 -07:00
Amith Yamasani
5a8c345654 Merge "2763342 Toasts do not fire accessibility events" 2010-10-11 11:34:27 -07:00
Brad Fitzpatrick
191cdf023c StrictMode: check max-offenses-per-loop earlier, before allocations
Previously a tight loop of StrictMode violations would still allocate
Exception objects and populate their stack frames, just to orphan them
later when checking the max-10-violations-per-loop constraint.

With this patch, we do that check _before_ allocating any memory.

Change-Id: Iae96aba33f8fcc6a8ec5838a231aecc08e95122d
2010-10-11 11:31:15 -07:00
Amith Yamasani
8399985007 Merge "2853037 AccessibilityEvent should describe Tab controls" 2010-10-11 11:29:29 -07:00
Adam Powell
3608d33b26 Merge "Updated styles and metrics." 2010-10-11 11:26:57 -07:00
Adam Powell
be4d68e7b2 Updated styles and metrics.
* Added preliminary ButtonGroup support for buttons that display as a unit.
* Fixed a bug with MenuBuilder that caused old-style icon menus to fail.
* Added support for explicitly setting line height in text.

Change-Id: I1ba65f09dd9e1bc833d247ebe72052a21e3f99f0
2010-10-11 11:22:54 -07:00
Brad Fitzpatrick
f21b4cde18 resolved conflicts for merge of b3ffd4ad to master
Change-Id: I80b227b678ef168a45494acf879debed5861de39
2010-10-11 10:46:01 -07:00
Gilles Debunne
2493c164b0 resolved conflicts for merge of 2da9338c to master
Change-Id: I190aed34c356d26142dfa355adbdb9c7ff22a4af
2010-10-11 10:37:51 -07:00
Chet Haase
d9944c1dbe Merge "Double the performance of animations." 2010-10-11 10:08:00 -07:00
Gilles Debunne
569a4bbae1 resolved conflicts for merge of 42dd7ec9 to master
Change-Id: Id388745d7ec22c48b34b744d5a4c07097cf2650b
2010-10-11 09:57:05 -07:00
Jean-Baptiste Queru
e69f1f1a74 resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
2010-10-11 09:38:10 -07:00
Jean-Baptiste Queru
e3cfd35bf4 Merge "Dismissing AlertDialog before destroying WebView." 2010-10-11 09:15:50 -07:00
Chet Haase
608fc3cbed Double the performance of animations.
There is a hard-coded limit to the frame rate of animations; this commit increases that rate by changing the inter-frame delay from 30 ms to 10 ms (although the actual delay will be determined by the maximum refresh rate of the system and the system load). For example, the effective maximum on current devices is 55 fps, or a delay of about 16 ms.

Change-Id: Id96a41cef36851e2d9508a98934f4b25595251ea
2010-10-11 08:47:13 -07:00
Cary Clark
84e8827a47 Merge "Check mNativeClass != null in public functions" 2010-10-11 06:49:01 -07:00
Bjorn Bringert
888edab661 Move SyncStateContentProviderHelper to frameworks/ex
Change-Id: I26cdb3e72a0075e4df3854b526bdf6bb08d671a2
2010-10-11 07:53:30 +01:00
Brad Fitzpatrick
764437aa9e am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635'

* commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635':
  Minor SharedPreference clean-up.
2010-10-10 19:13:24 -07:00
Jean-Baptiste Queru
fae998c860 resolved conflicts for merge of 7c08b70c to master
Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088
2010-10-10 19:02:41 -07:00
Jean-Baptiste Queru
c43189e769 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-10 18:51:43 -07:00
Gilles Debunne
a20e873476 resolved conflicts for merge of d7d47941 to master
Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e
2010-10-10 18:45:23 -07:00
Jean-Baptiste Queru
2aaa1ce176 Merge "Hold partial wakelock during shutdown to avoid entering sleep" 2010-10-10 18:41:58 -07:00
Gilles Debunne
1457bb0ef6 am 6b8bdaa9: New AppsPermission and market style
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
2010-10-10 18:08:25 -07:00
Gilles Debunne
6b8bdaa9c8 New AppsPermission and market style
Bug 3067333

Change-Id: Ibbf444cfd9b1e2d7b51f4194d57c6dee30ac18ee
2010-10-10 17:57:55 -07:00
Dianne Hackborn
50d3fa72d8 am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'

* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
  Fix issue #3074745: Crash in system process
2010-10-10 17:47:01 -07:00
Brad Fitzpatrick
8775eae941 am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc'

* commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc':
  DropBoxManager.Entry implements Closeable
2010-10-10 17:46:10 -07:00
Jean-Baptiste Queru
89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -07:00
Jeff Brown
325b05f611 am b13998f2: am d00b4386: Merge "Clarify some comments on individual key codes." into gingerbread
Merge commit 'b13998f2b482ff0ebe96cd683801758a01d10799'

* commit 'b13998f2b482ff0ebe96cd683801758a01d10799':
  Clarify some comments on individual key codes.
2010-10-10 17:45:25 -07:00
Imre Sunyi
9239612870 Support showing "Cold" battery health.
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idcc156aae6aabce73391081143f79d052edf332e
2010-10-10 17:20:24 -07:00