Jeff Sharkey
bc0c990689
am ed191e1f: Merge "Data usage buckets active time, parsing ISE."
...
* commit 'ed191e1fae0f860323f6ed76ea982287c42ec83e':
Data usage buckets active time, parsing ISE.
2011-08-25 13:23:37 -07:00
Jeff Sharkey
8bb898f1e3
am 235c47ff: Merge "Register for kernel global data usage alerts."
...
* commit '235c47ff3edc9228609e82d2201275e70889921f':
Register for kernel global data usage alerts.
2011-08-25 13:23:32 -07:00
Svetoslav Ganov
0a1dc8689d
am 12bde60b: Merge "Intra-process view hierarchy interrogation does not work."
...
* commit '12bde60b39affbfdcb7ef6317e0a5f99c3f41b10':
Intra-process view hierarchy interrogation does not work.
2011-08-25 13:22:27 -07:00
satok
3d9e56b19e
am 1e3fac8b: Merge "Add functions to enable / disable spell checker"
...
* commit '1e3fac8bc62a2495eb9bb79cc208573b5782cedc':
Add functions to enable / disable spell checker
2011-08-25 13:20:00 -07:00
satok
213861b497
am 47d0e481: Merge "Dismiss the ime switch notification properly"
...
* commit '47d0e48197c566be5d4c11534ceabc8a38a18cec':
Dismiss the ime switch notification properly
2011-08-25 13:19:32 -07:00
Dianne Hackborn
a3e1ccc5ee
am 6ff00377: Merge "Fix to show the correct HW accel background in the preview window."
...
* commit '6ff0037792619c4441d9d3caa4f9ab4f45c11236':
Fix to show the correct HW accel background in the preview window.
2011-08-25 13:18:29 -07:00
Brett Chabot
495954b7f1
am b26db260: Merge "Disable package verification by default."
...
* commit 'b26db260ae91a335fcee4f67df9341d002fbe1b0':
Disable package verification by default.
2011-08-25 13:17:54 -07:00
Mathias Agopian
3740c8bbad
am 7345d36f: Merge changes I6b6f7537,I18e5b72d
...
* commit '7345d36fd0b3d7df6105ae20ae147bba1dec37b6':
Fix a few style issues and remove LOG spam
More error checks to avoid div by zero.
2011-08-25 13:16:29 -07:00
Mathias Agopian
ee14f37d79
am 7d0dd6ad: Merge "Fix Recent thumbnails aren\'t taken when leaving an activity via notification"
...
* commit '7d0dd6addba0f72acb30eea7e9804f56f8c8646f':
Fix Recent thumbnails aren't taken when leaving an activity via notification
2011-08-25 13:15:55 -07:00
Romain Guy
aacf1d7310
am c39e8e89: Merge "Add OpenGL backend to ImageWallpaper Bug #5204874 "
...
* commit 'c39e8e89eb370ed66f552da3be258e57f1aabeb9':
Add OpenGL backend to ImageWallpaper Bug #5204874
2011-08-25 13:14:23 -07:00
Dianne Hackborn
e67afddf4a
am 19bc995e: Merge "Fix animation scale to also scale start offset."
...
* commit '19bc995e9ae4ec9ea48c183758759e2b68ec964b':
Fix animation scale to also scale start offset.
2011-08-25 13:14:11 -07:00
Jamie Gennis
2e4643069d
am 011833c3: Merge "SurfaceFlinger: use the HWC gralloc usage bit"
...
* commit '011833c308f68928a024de71ee89c0db1c491570':
SurfaceFlinger: use the HWC gralloc usage bit
2011-08-25 13:11:01 -07:00
Christopher Tate
3b34eb58e3
am 1c424f86: Merge "Make sure to go to the right Settings panel when tapping a notification"
...
* commit '1c424f86c634a8c27ef1bbb82938ae64b4f3a385':
Make sure to go to the right Settings panel when tapping a notification
2011-08-25 13:09:00 -07:00
Chia-chi Yeh
a95e198d13
am 42577560: Merge "VPN: stop daemons by closing the control sockets."
...
* commit '42577560fb0a1aead62a378caa267734e9d91207':
VPN: stop daemons by closing the control sockets.
2011-08-25 13:06:58 -07:00
Dianne Hackborn
42a6f9e002
am 2da59ffb: Merge "Fix issue #5192141 : systemui asplodes after enough tapping on the windowlist button"
...
* commit '2da59ffbda80594e6312f400341810f91e1d333a':
Fix issue #5192141 : systemui asplodes after enough tapping on the windowlist button
2011-08-25 13:06:03 -07:00
Jeff Brown
cb629a876a
am 81843932: Merge "Improve input device wake heuristics. Bug: 5205674"
...
* commit '818439323c1721476953049a8d557836e69337f5':
Improve input device wake heuristics. Bug: 5205674
2011-08-25 13:04:14 -07:00
Mike Lockwood
35314a0ace
am d0bf536f: Merge "No longer disable notification lights when screen turns on"
...
* commit 'd0bf536fd6618414bb9c84424a931865e62e6876':
No longer disable notification lights when screen turns on
2011-08-25 11:38:09 -07:00
satok
7435c945fd
am cfc0f2c2: Merge "Add functions to set / get SpellCheckerSubtype"
...
* commit 'cfc0f2c206af24350245f83b36e0032a7d4de49a':
Add functions to set / get SpellCheckerSubtype
2011-08-25 11:33:20 -07:00
Mathias Agopian
33daffbd61
am f33bc2df: Merge changes I14e03939,I9aafe6f2
...
* commit 'f33bc2dfb5fc6e51ff3c90b9468ef3fe9e0d10a9':
Fix an issue where Surface::lock() would never update the output region
Add a debug option to turn the "transformation hint" off
2011-08-25 11:31:52 -07:00
Jeff Sharkey
178e3a3945
am 006efb24: Merge "Proactively disable data when over policy limit."
...
* commit '006efb24706378293a2faa137c7c7ca34a2e15cd':
Proactively disable data when over policy limit.
2011-08-25 11:31:30 -07:00
Mathias Agopian
a27eecb783
am 96daa0ef: Merge "Minor cleanup"
...
* commit '96daa0ef4088b0e123a7dce20f572238ec42575b':
Minor cleanup
2011-08-25 11:31:13 -07:00
Jeff Brown
431080e0f7
am aaee52cf: Merge "Clean up InputDispatcher debugging."
...
* commit 'aaee52cfa8bb1d0070b69cd4087be63dd2c0fee9':
Clean up InputDispatcher debugging.
2011-08-25 11:30:53 -07:00
Jeff Brown
9bd23e2568
am a2bc2d25: Merge "Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301"
...
* commit 'a2bc2d2569e52dccb8df8fa73b9557e465113aab':
Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301
2011-08-25 11:29:51 -07:00
Jeff Sharkey
ed191e1fae
Merge "Data usage buckets active time, parsing ISE."
2011-08-25 11:13:38 -07:00
Jeff Sharkey
235c47ff3e
Merge "Register for kernel global data usage alerts."
2011-08-25 11:13:32 -07:00
Jason Simmons
df6bb0a7ee
resolved conflicts for merge of 33264596 to ics-aah
...
Change-Id: I1b0b2c3a63d97d49940666ceec71293bdbab4e2e
2011-08-25 09:57:48 -07:00
Svetoslav Ganov
12bde60b39
Merge "Intra-process view hierarchy interrogation does not work."
2011-08-25 08:54:29 -07:00
satok
1e3fac8bc6
Merge "Add functions to enable / disable spell checker"
2011-08-25 01:21:05 -07:00
satok
a33c4fc5be
Add functions to enable / disable spell checker
...
Bug: 5057977
Change-Id: I2b27bd5f55feb305368034d7e95f83257ac4b3e6
2011-08-25 17:08:19 +09:00
satok
47d0e48197
Merge "Dismiss the ime switch notification properly"
2011-08-25 00:36:35 -07:00
satok
dbf2950781
Dismiss the ime switch notification properly
...
Bug: 5159818
Change-Id: I606294dd453d3cc105714c62b945fcf1fa11164d
2011-08-25 15:29:48 +09:00
Dianne Hackborn
6ff0037792
Merge "Fix to show the correct HW accel background in the preview window."
2011-08-24 20:56:05 -07:00
Dianne Hackborn
07213e6d88
Fix to show the correct HW accel background in the preview window.
...
Also tweak wallpaper service to do a cleaner transition to a
static wallpaper.
Change-Id: I876a32091f92dd5a529d7fd809d3b8e730bb7d2a
2011-08-24 20:05:39 -07:00
Brett Chabot
b26db260ae
Merge "Disable package verification by default."
2011-08-24 19:45:51 -07:00
Mathias Agopian
7345d36fd0
Merge changes I6b6f7537,I18e5b72d
...
* changes:
Fix a few style issues and remove LOG spam
More error checks to avoid div by zero.
2011-08-24 18:45:01 -07:00
Mathias Agopian
3a3fca3dce
Fix a few style issues and remove LOG spam
...
Change-Id: I6b6f75373f4ac28f98dea6a6f1c2567a6aa02243
2011-08-24 18:40:33 -07:00
Brett Chabot
ae05e8655d
Disable package verification by default.
...
Change-Id: I0e02cd177dbb99fc97e964ac87251a900d915b95
2011-08-24 18:38:26 -07:00
Michael Johnson
f5cfea78b0
More error checks to avoid div by zero.
...
Change-Id: I18e5b72d02bf5420c14334d3a03f18fa40572d31
2011-08-24 18:34:49 -07:00
Mathias Agopian
7d0dd6addb
Merge "Fix Recent thumbnails aren't taken when leaving an activity via notification"
2011-08-24 17:53:21 -07:00
Mathias Agopian
e328134b8f
Fix Recent thumbnails aren't taken when leaving an activity via notification
...
When taking screenshots we need to use the full drawing state list
instead of the visible list.
Bug: 5186823
Change-Id: I214ee0203aaf8e2c038e44581f7f1ae36edf08c5
2011-08-24 17:44:41 -07:00
Romain Guy
c39e8e89eb
Merge "Add OpenGL backend to ImageWallpaper Bug #5204874 "
2011-08-24 17:09:30 -07:00
Dianne Hackborn
19bc995e9a
Merge "Fix animation scale to also scale start offset."
2011-08-24 17:07:51 -07:00
Romain Guy
407ec78b82
Add OpenGL backend to ImageWallpaper
...
Bug #5204874
Currently disabled.
Change-Id: I5e7b35dce2981b0691f107e39c6394b260466543
2011-08-24 17:06:58 -07:00
Svetoslav Ganov
8bd69610aa
Intra-process view hierarchy interrogation does not work.
...
The content retrieval APIs are synchronous from a client's
perspective but internally they are asynchronous. The client thread
calls into the system requesting an action and providing a callback
to receive the result after which it waits up to a timeout for that
result. The system enforces security and then delegates the request
to a given view hierarchy where a message is posted (from a binder
thread) describing what to be performed by the main UI thread the
result of which it delivered via the mentioned callback. However,
the blocked client thread and the main UI thread of the target view
hierarchy can be the same one, for example an accessibility service
and an activity run in the same process, thus they are executed on the
same main thread. In such a case the retrieval will fail since the UI
thread that has to process the message describing the work to be done
is blocked waiting for a result is has to compute! To avoid this scenario
when making a call the client also passes its process and thread ids so
the accessed view hierarchy can detect if the client making the request
is running in its main UI thread. In such a case the view hierarchy,
specifically the binder thread performing the IPC to it, does not post a
message to be run on the UI thread but passes it to the singleton
interaction client through which all interactions occur and the latter is
responsible to execute the message before starting to wait for the
asynchronous result delivered via the callback. In this case the expected
result is already received so no waiting is performed.
bug:5138933
Change-Id: I382e2d8689f5189110226613c2387f553df98bd3
2011-08-24 16:26:43 -07:00
Jeff Sharkey
558a232006
Data usage buckets active time, parsing ISE.
...
When recording data usage, measure the actual active time, since
buckets can be quite long. Offer incrementOperationCount() version
that reads thread stats tag for caller. Rethrow any NPE as ISE
during stats parsing, which callers already handle.
Bug: 5171812, 5184508, 5180659
Change-Id: I6da80ccc0162be68bee279529e3a23b6f98ebd87
2011-08-24 16:00:39 -07:00
Dianne Hackborn
a4bacb8b74
Fix animation scale to also scale start offset.
...
Also more better info in meminfo dump.
Change-Id: I45ab41821cd8dd81b61605de6a0cf7074e76c71a
2011-08-24 15:12:38 -07:00
Jamie Gennis
011833c308
Merge "SurfaceFlinger: use the HWC gralloc usage bit"
2011-08-24 15:12:04 -07:00
Christopher Tate
1c424f86c6
Merge "Make sure to go to the right Settings panel when tapping a notification"
2011-08-24 14:12:18 -07:00
Christopher Tate
765f97d5e6
Make sure to go to the right Settings panel when tapping a notification
...
We now use Intent.makeRestartActivityTask() to build the notification
PendingIntent objects, so that when tapped they restart the activity
in the desired state.
Fixes bug 5011926
Change-Id: Ie1ec3543cc0f49d1bd407622a617316cf53a078c
2011-08-24 14:06:00 -07:00
Chia-chi Yeh
42577560fb
Merge "VPN: stop daemons by closing the control sockets."
2011-08-24 13:03:50 -07:00