4295 Commits

Author SHA1 Message Date
Mathias Agopian
affca7e481 am b4645353: am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread
Merge commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368'

* commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368':
  fix [3118445] Transform * Transform does not work as expected
2010-10-25 13:53:26 -07:00
Mathias Agopian
b464535309 am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread
Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp

* commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
  fix [3118445] Transform * Transform does not work as expected
2010-10-25 13:38:11 -07:00
Mathias Agopian
ce4d36ad72 Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 2010-10-25 13:31:03 -07:00
Wu-cheng Li
b877a54a27 am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp

* commit '89821204379816f6bee6902c4f132c014700c3b0':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
2010-10-25 09:09:26 -07:00
Wu-cheng Li
8982120437 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 2010-10-25 08:55:54 -07:00
Wu-cheng Li
d55f7e56b9 Mirror the camera preview if the camera is front-facing.
bug:3095272
Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
2010-10-25 15:02:44 +08:00
Wu-cheng Li
994c02bbfe Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Now overlay does flip before rotation.
bug:3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
2010-10-25 14:56:22 +08:00
Mathias Agopian
546c21dbfa fix [3118445] Transform * Transform does not work as expected
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.

We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.

Also added a simple test for Transform.

Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
2010-10-24 14:53:05 -07:00
Joe Onorato
a2a764b9fa am b34fe2f0: am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.
Merge commit 'b34fe2f0258eb1ed512b682206b7fe65116f1dbd'

* commit 'b34fe2f0258eb1ed512b682206b7fe65116f1dbd':
  Make sure that when the screen is off, we don't try to turn the buttons on too.
2010-10-24 09:30:05 -07:00
Joe Onorato
b34fe2f025 am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.
Merge commit '60607a9012c9b7d39bef8fcf0284772f1b061efc' into gingerbread-plus-aosp

* commit '60607a9012c9b7d39bef8fcf0284772f1b061efc':
  Make sure that when the screen is off, we don't try to turn the buttons on too.
2010-10-24 09:25:49 -07:00
Joe Onorato
60607a9012 Make sure that when the screen is off, we don't try to turn the buttons on too.
Bug: 3117801
Change-Id: I763f114a2b0426660d29bbda04ea7db12c1137e8
2010-10-23 14:49:57 -07:00
Chris Tate
9d21067231 Merge "Fix error recovery when a drag can't be started" 2010-10-22 19:20:24 -07:00
Chris Tate
ef70a07753 Fix error recovery when a drag can't be started
Also make sure to properly dispose *both* ends of the drag input
channel when we're done.  That was being tidied up after, but was
also making the system work harder and was provoking a bit of
debug logging.

Change-Id: I1ff3100bc4c441f1609c57242864d5744ff1aaa2
2010-10-22 19:12:52 -07:00
Brad Fitzpatrick
599ca29986 Expose (internally only) the number of animations currently running.
This will be used for StrictMode to annotate violations with
whether or not they janked up an animation.

Change-Id: I5bc691f49b74c45279cd2ae044d2a81dcf1204a9
2010-10-22 15:58:47 -07:00
Dianne Hackborn
e6634981f1 resolved conflicts for merge of 9c7489f8 to master
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
2010-10-22 14:35:09 -07:00
Dianne Hackborn
9c7489f8bd am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Dianne Hackborn
5383f502e4 Fix issue #3122240: Expose xlarge in GB.
Plus some other small API cleanup.

Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
2010-10-22 12:59:20 -07:00
Kenny Root
0c4b1a8292 Merge "Reorganize PackageManager dump to avoid NPE" 2010-10-22 12:21:16 -07:00
Kenny Root
1174f71e94 Reorganize PackageManager dump to avoid NPE
versionCode and mVersionName were added recently but ps.pkg can be null
in some situations. Move them to where it will check before
dereferencing it.

Bug: 3121050
Change-Id: I46081f300e7a40354cb757f9eaa7ec98b9334c8b
2010-10-22 10:07:11 -07:00
Joe Onorato
eb95b0877a Show app services in adb bugreport (dumpstate).
There is a 60s timeout for this command.  I'd rather do it as an individual timeout
for each of the services, but this is easier and will probably cover for busted apps
well enough.  Also, this is running last in dumpstate, so if it's lost... oh well.

Also, clean up the formatting of the service dump so it's more readable in bugreport.

Change-Id: Ibd727f4b3366f7af9e7ef1e231868f5cedc48132
2010-10-22 12:36:07 -04:00
Joe Onorato
8d0083423f Merge "Fix bug introduced in Change I856118d8." 2010-10-22 09:22:50 -07:00
Mike Lockwood
4c918335ef am d78c8d8b: am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Merge commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780'

* commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780':
  GPS: Fix network type logic in requestRefLocation
2010-10-22 09:17:38 -07:00
Mike Lockwood
d78c8d8bb9 am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Merge commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b' into gingerbread-plus-aosp

* commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b':
  GPS: Fix network type logic in requestRefLocation
2010-10-22 09:03:17 -07:00
Mike Lockwood
edc0f3876c GPS: Fix network type logic in requestRefLocation
Change-Id: I20ef81bcf029b289389dba57e6cf457fda5acbf4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-22 09:16:17 -04:00
Dianne Hackborn
1b36424419 am eb5aeae6: am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit 'eb5aeae676fb23b2ad748185867c085e3cd65314'

* commit 'eb5aeae676fb23b2ad748185867c085e3cd65314':
  Adjust boundaries for screen sizes.
2010-10-21 20:27:30 -07:00
Dianne Hackborn
eb5aeae676 am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp

* commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
  Adjust boundaries for screen sizes.
2010-10-21 20:18:11 -07:00
Dianne Hackborn
fdbb2168f7 Merge "Adjust boundaries for screen sizes." into gingerbread 2010-10-21 19:21:28 -07:00
Mathias Agopian
46beb43357 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
2010-10-21 16:26:02 -07:00
Mathias Agopian
0c63605535 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Dianne Hackborn
b51dc0fe2a Adjust boundaries for screen sizes.
Part of issue #3116702: New manifest tags for supported screen sizes

Kind-of.

If you turn your head side-ways.

Change-Id: I446f1e2eadba1ce284c93ff9fb0197bb0e6b0fca
2010-10-21 15:34:47 -07:00
Chris Tate
d4533f1469 Report drag success/fail in the DRAG_ENDED message
DragEvent.getResult() returns 'true' if the drop was ultimately accepted;
false otherwise.  The validity of this datum is only guaranteed when the
DragEvent's action verb is ACTION_DRAG_ENDED.

Also fixes the drag-start timeout handling (though the offending app is
not yet officially declared ANR).

Implements bug 3097807

Change-Id: I6908ac628c72ff7d6193d87060d769a559a78d0e
2010-10-21 14:25:06 -07:00
Wink Saville
3fbc560013 Fix bug introduced in Change I856118d8.
Change-Id: I9f1c2b2611396bb811b491b7e240b4913fa76fb4
2010-10-21 14:19:21 -07:00
Mathias Agopian
ac6f0cc317 am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit 'fb31036fd844444c395a2ae9c97439eec9f774e4'

* commit 'fb31036fd844444c395a2ae9c97439eec9f774e4':
  Use the context_priority extension when present.
2010-10-21 13:48:36 -07:00
Jean-Baptiste Queru
7df7cfebdf am c20f205d: am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f'

* commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f':
  BatteryService: Set bool to true if sysfs entry is not 0
2010-10-21 13:46:41 -07:00
Joe Onorato
f3c3c4fd14 Refactor SystemUI so the status bar isn't a Service of its own.
There is now one SystemUIService, which starts the status bar service.
Pretty soon there will be other things running in here too.  This way
we don't need to have each of them started by something individually.

This also moves the choice between tablet and phone status bar into
SystemUI.apk, which seems like a much better place for it.

Change-Id: Ib69ef2f43d648764f8dbb52008f5d036a1ee07d9
2010-10-21 15:42:34 -04:00
Joe Onorato
163d8d972b Don't remove items from mRecords while iterating over it.
This change also make removeList a member, because it's only
actually used in an error case (when the client process has
gone away).

Bug: 3118244
Bug: 3083062
Bug: 2876696
Bug: 2778958
Change-Id: I856118d8de4309cd63287d7c57cd938e1c35dab0
2010-10-21 13:32:49 -04:00
Joe Onorato
749984798c fix bad merge
Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81
2010-10-21 11:38:25 -04:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
2010-10-21 07:39:10 -07:00
Mathias Agopian
fb31036fd8 am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp

* commit '583fefc8dcadecc7fc933513d3569dd9c16c100c':
  Use the context_priority extension when present.
2010-10-20 21:28:25 -07:00
Mathias Agopian
583fefc8dc Merge "Use the context_priority extension when present." into gingerbread 2010-10-20 20:04:46 -07:00
Jean-Baptiste Queru
c20f205d10 am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp

* commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
  BatteryService: Set bool to true if sysfs entry is not 0
2010-10-20 16:45:50 -07:00
Wink Saville
4b7ba09c8b Change removeNetowrk to a synchronous channel call.
Change-ID: Iad0380d56972826615e044fa2aaee418b617d732
2010-10-20 15:52:42 -07:00
Irfan Sheriff
4f5f7c9683 Fix wake and scan behavior
- Add wakelock for driver start/stop to ensure a wifilock
  acquisition kick starts driver. Also cleaned up state machine
  driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
  reconnections when wifilock exists or when user chooses
  never to sleep
- some minor clean up

Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
2010-10-20 12:04:21 -07:00
Tony Wu
b09773dee0 Fix isUsbMassStorageConnected() will always return true
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.

Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
2010-10-20 10:17:28 -07:00
Wu-cheng Li
b982fb4fd3 Mirror the preview for front-facing cameras. do not merge
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.

bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
2010-10-20 18:29:18 +08:00
James Dong
38311859e8 Camera framework change required for 0-memcpy recording
bug - 3042125

Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
2010-10-19 23:07:08 -07:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
2010-10-19 12:29:43 -07:00
Joe Onorato
431bb22695 Reduce logging.
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
2010-10-19 15:08:05 -04:00
Chris Tate
a30c88359f am 18580319: DO NOT MERGE. Turn down backup logging for release.
Merge commit '1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp

* commit '1858031946b3627b599475c5894655362e510351':
  DO NOT MERGE.  Turn down backup logging for release.
2010-10-19 12:04:44 -07:00
Chris Tate
1858031946 DO NOT MERGE. Turn down backup logging for release.
Change-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427
2010-10-19 11:22:03 -07:00