OSDN Git Service
Matthew Xie [Mon, 29 Aug 2011 23:34:05 +0000 (16:34 -0700)]
am
d56b3c95: Merge "Move Bluetooth remove service record handler to the app main thread"
* commit '
d56b3c952469a63aa9d4fc860be24b80a4b0e3b6':
Move Bluetooth remove service record handler to the app main thread
Jim Miller [Mon, 29 Aug 2011 23:33:51 +0000 (16:33 -0700)]
am
f0eb7655: Merge "Fix
5044158: Reduce overall memory footprint of lockscreen"
* commit '
f0eb7655ac897ca06034296f7674b73a65f0e8a9':
Fix
5044158: Reduce overall memory footprint of lockscreen
Daniel Lehmann [Mon, 29 Aug 2011 23:33:38 +0000 (16:33 -0700)]
am
82e0c6f3: Merge "Add the lookup_key column, which should have been in the previous CL"
* commit '
82e0c6f3dec5c7359166b9ff720f9fcc8c6801d7':
Add the lookup_key column, which should have been in the previous CL
Wink Saville [Mon, 29 Aug 2011 23:33:30 +0000 (16:33 -0700)]
am
03605fa8: Merge "Fix leak in SIM ready registrants"
* commit '
03605fa832ea42dedca00fc7798a6da6c8a6c8a3':
Fix leak in SIM ready registrants
James Dong [Mon, 29 Aug 2011 23:33:14 +0000 (16:33 -0700)]
am
2a451021: Merge "The test application falsely reports that the test result even if the test failed."
* commit '
2a45102186a25877df04404d591171b2b2e85626':
The test application falsely reports that the test result even if the test failed.
Irfan Sheriff [Mon, 29 Aug 2011 23:33:00 +0000 (16:33 -0700)]
am
335e40c0: Merge "Use seperate config file for p2p"
* commit '
335e40c0f1c3aec550e61fa159130527fda597b6':
Use seperate config file for p2p
Jason Simmons [Mon, 29 Aug 2011 23:31:23 +0000 (16:31 -0700)]
Merge "resolved conflicts for merge of
35c0bf31 to ics-aah" into ics-aah
Matthew Xie [Mon, 29 Aug 2011 23:27:54 +0000 (16:27 -0700)]
Merge "Move Bluetooth remove service record handler to the app main thread"
Matthew Xie [Thu, 25 Aug 2011 23:45:58 +0000 (16:45 -0700)]
Move Bluetooth remove service record handler to the app main thread
Move Bluetooth remove service record handler to the app main thread.
This removes the dependency of caller thread that constructs the
BluetoothAdapter singleton instance. The caller thread could stop while
BluetoothAdapter singleton exists but lose the handler context.
Make the BluetoothService.removeServiceRecord return quickly without
blocking on native call.
bug
4999443
Change-Id: I302534baa381f4aca8192e1e4a9ea21793b07ba6
Jason Simmons [Mon, 29 Aug 2011 23:16:49 +0000 (16:16 -0700)]
resolved conflicts for merge of
35c0bf31 to ics-aah
Change-Id: If736c93821359a2f97a0670ad3be8ada5f398bd7
Jim Miller [Mon, 29 Aug 2011 23:04:10 +0000 (16:04 -0700)]
Merge "Fix
5044158: Reduce overall memory footprint of lockscreen"
Jim Miller [Sun, 28 Aug 2011 22:44:24 +0000 (15:44 -0700)]
Fix
5044158: Reduce overall memory footprint of lockscreen
On devices that do not require showing lock before unlock, we now only create
just the unlock screen. In addition to simplifying the code, this also
prevents keeping around a potentially unusued lock screen and saves ~1MB
in the system process on devices with only a secure lockscreen.
Change-Id: I533f2692b44a7991d4850cecc874c76166e7ce71
John Grossman [Mon, 29 Aug 2011 23:01:00 +0000 (16:01 -0700)]
Make the LocalClock HAL wrapper use a singleton HAL instance.
Change the local clock helper wrapper to hold just a single copy of the local
time HAL instead of having each wrapper hold their own HAL instance.
Change-Id: Ibc365eccc78a98bd2ea6cf1c57a55a84b843bc2a
Daniel Lehmann [Mon, 29 Aug 2011 22:51:56 +0000 (15:51 -0700)]
Merge "Add the lookup_key column, which should have been in the previous CL"
Wink Saville [Mon, 29 Aug 2011 22:46:45 +0000 (15:46 -0700)]
Merge "Fix leak in SIM ready registrants"
Jeff Sharkey [Mon, 29 Aug 2011 22:39:35 +0000 (15:39 -0700)]
am
51e77f1a: Merge "Make Paint.set() copy shadow config."
* commit '
51e77f1a52fe1ae56086a3c8e364bfc1c96eeaa4':
Make Paint.set() copy shadow config.
Chet Haase [Mon, 29 Aug 2011 22:39:11 +0000 (15:39 -0700)]
am
32901b4f: Merge "Fixed bug with invalidation in top-level Views."
* commit '
32901b4fec5db9a137add68f0f38518636593668':
Fixed bug with invalidation in top-level Views.
Glenn Kasten [Mon, 29 Aug 2011 22:39:07 +0000 (15:39 -0700)]
am
b4bf90b4: Merge "Add C++ thread API androidGetThreadSchedulingGroup"
* commit '
b4bf90b40e30096479a4d4cc9cf135e991ef1994':
Add C++ thread API androidGetThreadSchedulingGroup
James Dong [Mon, 29 Aug 2011 22:28:23 +0000 (15:28 -0700)]
Merge "The test application falsely reports that the test result even if the test failed."
Irfan Sheriff [Mon, 29 Aug 2011 22:22:58 +0000 (15:22 -0700)]
Merge "Use seperate config file for p2p"
Robert Ly [Mon, 29 Aug 2011 22:19:04 +0000 (15:19 -0700)]
am
bce1667e: Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325"
* commit '
bce1667e7ae69ff575e73e776040524fb5515c5f':
cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325
Stephen Hines [Mon, 29 Aug 2011 22:18:59 +0000 (15:18 -0700)]
am
660c7f60: Merge "Updated time/type docs for Renderscript."
* commit '
660c7f6053d29ecee8f9258a884bf29fb1f30427':
Updated time/type docs for Renderscript.
Irfan Sheriff [Mon, 29 Aug 2011 22:18:54 +0000 (15:18 -0700)]
am
ad4d2c99: Merge "Remove work around for driver state change"
* commit '
ad4d2c99ed3a08a5090c38e9dd906df8fb894614':
Remove work around for driver state change
Jeff Brown [Mon, 29 Aug 2011 22:18:46 +0000 (15:18 -0700)]
am
8d3feb62: Merge "Add a "show touches" option for demos and presentations. Bug:
4569045"
* commit '
8d3feb6292ba7e87adeb4982e8cf27114a8ee2e4':
Add a "show touches" option for demos and presentations. Bug:
4569045
Jeff Brown [Mon, 29 Aug 2011 22:18:42 +0000 (15:18 -0700)]
am
df7e2644: Merge "Prioritize INPUT_PROP_DIRECT first."
* commit '
df7e2644992c5828be94980b4243ac9f1f48b177':
Prioritize INPUT_PROP_DIRECT first.
Andreas Huber [Mon, 29 Aug 2011 22:18:26 +0000 (15:18 -0700)]
am
499f3658: Merge "Return an error to the client instead of asserting if decoder instantiation fails"
* commit '
499f36581c63579f24c3d9bbf95c7f8677cd1191':
Return an error to the client instead of asserting if decoder instantiation fails
Jamie Gennis [Mon, 29 Aug 2011 22:18:14 +0000 (15:18 -0700)]
am
a258f0c8: Merge "Surface: move the SurfaceTexture ctor"
* commit '
a258f0c8ffeb447aa8d3216ec276bc26b4f3f5d8':
Surface: move the SurfaceTexture ctor
Bill Gruber [Mon, 29 Aug 2011 22:17:55 +0000 (15:17 -0700)]
am
f455e9a3: Merge "Cherry pick from honeycomb-mr2 Change ID I7ded723152d7beface51b45b882d4ccf92981927 Doc fix: Hello World tutorial updates Bug:
5149925"
* commit '
f455e9a3b3fa2d4680750e7b65692e35d2bf4023':
Cherry pick from honeycomb-mr2 Change ID I7ded723152d7beface51b45b882d4ccf92981927 Doc fix: Hello World tutorial updates Bug:
5149925
Gilles Debunne [Mon, 29 Aug 2011 22:17:49 +0000 (15:17 -0700)]
am
474cac1c: Merge "Suggestions popup window is dismissed on tap outside."
* commit '
474cac1c212e1f02deaffe5512941af9cb2a760b':
Suggestions popup window is dismissed on tap outside.
John Reck [Mon, 29 Aug 2011 22:17:41 +0000 (15:17 -0700)]
am
082a9fa3: Merge "Tap highlight fix + small perf increase"
* commit '
082a9fa3438d343942851e538bb38b86ab1873b3':
Tap highlight fix + small perf increase
Adam Powell [Mon, 29 Aug 2011 22:17:14 +0000 (15:17 -0700)]
am
890be6b9: Merge "Fix bug
5217267 - Action bars and menu shortcuts"
* commit '
890be6b919ce0c65d018a2dc40a6a1d59bc2b14d':
Fix bug
5217267 - Action bars and menu shortcuts
Brandon Keely [Mon, 29 Aug 2011 22:16:39 +0000 (15:16 -0700)]
am
54717814: Merge "Massaging framework window transitions."
* commit '
5471781430ef51fbe649179c22b98975e64d2a5e':
Massaging framework window transitions.
Chet Haase [Mon, 29 Aug 2011 22:16:15 +0000 (15:16 -0700)]
am
890a631e: Merge "Made the Switch class public."
* commit '
890a631ede4f0d209b53d1924a545ed8d3b6f003':
Made the Switch class public.
Romain Guy [Mon, 29 Aug 2011 22:16:03 +0000 (15:16 -0700)]
am
f8c015d2: Merge "Italic should be italic and bold should be bold."
* commit '
f8c015d2628d8ef3056698a3b6a052889ae15d01':
Italic should be italic and bold should be bold.
Svetoslav Ganov [Mon, 29 Aug 2011 22:15:29 +0000 (15:15 -0700)]
am
6537b003: Merge "Clean up and bug fixes in the TouchExplorer."
* commit '
6537b003b7b616d4babde4b69a3d5e68459c555a':
Clean up and bug fixes in the TouchExplorer.
Adam Powell [Mon, 29 Aug 2011 22:14:54 +0000 (15:14 -0700)]
am
b5d80fca: Merge "Fix bug
5124021 - Menu visibility incorrect when restoring ListView selection mode"
* commit '
b5d80fca2eb7f6053e6d404a0d4a7c213dad1317':
Fix bug
5124021 - Menu visibility incorrect when restoring ListView selection mode
Eric Laurent [Mon, 29 Aug 2011 22:12:41 +0000 (15:12 -0700)]
Merge "Audioflinger: reverse logic of BT NREC indication"
Jeff Sharkey [Mon, 29 Aug 2011 22:10:55 +0000 (15:10 -0700)]
Merge "Make Paint.set() copy shadow config."
Jeff Sharkey [Sat, 27 Aug 2011 22:09:26 +0000 (15:09 -0700)]
Make Paint.set() copy shadow config.
Also unify all Java variable copying into single method.
Change-Id: I8fefa615f6f164ae5662913d612b388b46890089
Eric Laurent [Mon, 29 Aug 2011 19:42:48 +0000 (12:42 -0700)]
Audioflinger: reverse logic of BT NREC indication
The interpretation of BT NREC by AudioFlinger to enable
or disable AEC and NS was wrong: NREC to ON (default) means
the phone (Audio Gateway) must enable local AEC and NS.
Change-Id: I88a264e7fc9831c43bbace4f6b585baec73f2006
James Dong [Mon, 29 Aug 2011 21:33:25 +0000 (14:33 -0700)]
The test application falsely reports that the test result even if the test failed.
Change-Id: Ia632f04da73642dc4c1e3147b16664b5672108bc
Chet Haase [Mon, 29 Aug 2011 21:39:47 +0000 (14:39 -0700)]
Merge "Fixed bug with invalidation in top-level Views."
Glenn Kasten [Mon, 29 Aug 2011 21:38:52 +0000 (14:38 -0700)]
Merge "Add C++ thread API androidGetThreadSchedulingGroup"
Daniel Lehmann [Mon, 29 Aug 2011 21:37:31 +0000 (14:37 -0700)]
Add the lookup_key column, which should have been in the previous CL
Also added some more javadocs
Bug:
5134325
Change-Id: I486b753f7cfb622e0211bb7f6bd04eb18b6e1e5b
Chet Haase [Mon, 29 Aug 2011 21:34:30 +0000 (14:34 -0700)]
Fixed bug with invalidation in top-level Views.
There was a bug in an InputMethod app, where popups for the keys
would not pop-down again. The problem was that they were being
marked INVISIBLE, but the new invalidation logic noop'd the
invalidate() call that used to take place. Adding to that was logic
in setFlags() that only invalidated a parent for parents that are
instanceof ViewGroup. In this case, the parent is a ViewRootImpl.
Fix is to call invalidateChild() on the parent if it's not a ViewGroup.
Change-Id: I2c2352072d383cee1367ea7ee6c2207077721fd5
Robert Ly [Mon, 29 Aug 2011 21:30:48 +0000 (14:30 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325"
Stephen Hines [Mon, 29 Aug 2011 21:25:55 +0000 (14:25 -0700)]
Merge "Updated time/type docs for Renderscript."
Irfan Sheriff [Mon, 29 Aug 2011 21:13:42 +0000 (14:13 -0700)]
Merge "Remove work around for driver state change"
Irfan Sheriff [Mon, 29 Aug 2011 21:05:14 +0000 (14:05 -0700)]
Remove work around for driver state change
When we first ported wpa_supplicant 0.8, we had a work around
to fix the supplicant state change behavior from the driver.
Remove the work around since the driver behavior is fixed.
Bug:
5195278
Change-Id: I320f21ab01704931a3def6214b0cc40f214a688e
Jeff Brown [Mon, 29 Aug 2011 21:04:31 +0000 (14:04 -0700)]
Merge "Add a "show touches" option for demos and presentations. Bug:
4569045"
Jeff Brown [Mon, 29 Aug 2011 21:04:21 +0000 (14:04 -0700)]
Merge "Prioritize INPUT_PROP_DIRECT first."
Andreas Huber [Mon, 29 Aug 2011 20:47:24 +0000 (13:47 -0700)]
Merge "Return an error to the client instead of asserting if decoder instantiation fails"
Jamie Gennis [Mon, 29 Aug 2011 20:41:45 +0000 (13:41 -0700)]
Merge "Surface: move the SurfaceTexture ctor"
John Grossman [Mon, 29 Aug 2011 20:06:41 +0000 (13:06 -0700)]
Reintroduce a line of code which disappeared during reformatting.
Reintroduce a line of code which went missing during a global reformat for style
reasons.
Change-Id: I6ddc2f5b9ed6a272e79f28cb80227fd71675eb01
Bill Gruber [Mon, 29 Aug 2011 20:04:05 +0000 (13:04 -0700)]
Merge "Cherry pick from honeycomb-mr2 Change ID I7ded723152d7beface51b45b882d4ccf92981927 Doc fix: Hello World tutorial updates Bug:
5149925"
Andreas Huber [Mon, 29 Aug 2011 20:01:23 +0000 (13:01 -0700)]
Return an error to the client instead of asserting if decoder instantiation fails
after a surface change.
Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug:
5212725
Gilles Debunne [Mon, 29 Aug 2011 19:58:36 +0000 (12:58 -0700)]
Merge "Suggestions popup window is dismissed on tap outside."
John Reck [Mon, 29 Aug 2011 19:55:50 +0000 (12:55 -0700)]
Merge "Tap highlight fix + small perf increase"
Bill Gruber [Tue, 23 Aug 2011 19:57:39 +0000 (12:57 -0700)]
Cherry pick from honeycomb-mr2 Change ID I7ded723152d7beface51b45b882d4ccf92981927
Doc fix: Hello World tutorial updates
Bug:
5149925
Change-Id: I715947dbda66657a92d5b86fb467444f331029cd
Adam Powell [Mon, 29 Aug 2011 19:07:52 +0000 (12:07 -0700)]
Merge "Fix bug
5217267 - Action bars and menu shortcuts"
Adam Powell [Sun, 28 Aug 2011 21:20:24 +0000 (14:20 -0700)]
Fix bug
5217267 - Action bars and menu shortcuts
Don't try to "close" the menu after completing a shortcut action if an
action bar is present.
Change-Id: I54a75543cf9a52e3186ff464924a0b37d0b20b9d
Brandon Keely [Mon, 29 Aug 2011 18:34:02 +0000 (11:34 -0700)]
Merge "Massaging framework window transitions."
Chet Haase [Mon, 29 Aug 2011 18:21:49 +0000 (11:21 -0700)]
Merge "Made the Switch class public."
Romain Guy [Mon, 29 Aug 2011 18:13:23 +0000 (11:13 -0700)]
Merge "Italic should be italic and bold should be bold."
Romain Guy [Mon, 29 Aug 2011 18:12:19 +0000 (11:12 -0700)]
Italic should be italic and bold should be bold.
Change-Id: I68933a7d7c32951c4d52d945baaedcb2583caef4
Svetoslav Ganov [Mon, 29 Aug 2011 18:04:33 +0000 (11:04 -0700)]
Merge "Clean up and bug fixes in the TouchExplorer."
Chet Haase [Fri, 26 Aug 2011 16:54:06 +0000 (09:54 -0700)]
Made the Switch class public.
Tweaked the API of Switch slightly and made the class public (it was
hidden before).
Change-Id: I4a099e8afd18a11a5850252025ae3bbbb866830d
John Grossman [Mon, 29 Aug 2011 17:42:56 +0000 (10:42 -0700)]
Merge "Add a missing NULL check." into ics-aah
Adam Powell [Mon, 29 Aug 2011 17:42:43 +0000 (10:42 -0700)]
Merge "Fix bug
5124021 - Menu visibility incorrect when restoring ListView selection mode"
John Grossman [Mon, 29 Aug 2011 17:26:47 +0000 (10:26 -0700)]
Add a missing NULL check.
The get_next_write_timestamp method introduced to the audio HAL is optional.
HALs which do not implement it leave it set to NULL. Callers (there is
currently only one in the AudioMixer code) need to be certain to check for NULL
before invoking it.
Change-Id: I9e06d688311c388446bb53993291ebc0f98cff89
John Reck [Mon, 29 Aug 2011 17:19:02 +0000 (10:19 -0700)]
Tap highlight fix + small perf increase
Bug:
5229717
Change-Id: I9ebc92dc96d77ff9051517b717d203686b574f7a
Jean-Michel Trivi [Mon, 29 Aug 2011 17:25:53 +0000 (10:25 -0700)]
am
2db44c58: Merge "Update IRemoteControlDisplay when it registers."
* commit '
2db44c5838fb0bb35092a19f31ee887892a451a1':
Update IRemoteControlDisplay when it registers.
Jean-Michel Trivi [Mon, 29 Aug 2011 17:09:04 +0000 (10:09 -0700)]
Merge "Update IRemoteControlDisplay when it registers."
Jean-Michel Trivi [Sat, 27 Aug 2011 02:10:51 +0000 (19:10 -0700)]
Update IRemoteControlDisplay when it registers.
When an IRemoteControlDisplay registers, it must receive information
from the current client.
Change-Id: Id845e7a87ac74c2db2c59e0281b28a45f8d20528
Claudia de Veaux [Mon, 29 Aug 2011 16:07:47 +0000 (09:07 -0700)]
am
3b21427b: Merge "Simplified punctuation on lock screen. Bug:
5221162"
* commit '
3b21427b4c1b10221947603f4e37514554766cca':
Simplified punctuation on lock screen. Bug:
5221162
Claudia de Veaux [Mon, 29 Aug 2011 16:06:13 +0000 (09:06 -0700)]
Merge "Simplified punctuation on lock screen. Bug:
5221162"
Justin Ho [Mon, 29 Aug 2011 16:02:50 +0000 (09:02 -0700)]
am
05ef0439: Merge "Updated text_select handles Bug:
5076695"
* commit '
05ef04394ec5400bb0b03ea52ffb1bade6769520':
Updated text_select handles Bug:
5076695
Justin Ho [Mon, 29 Aug 2011 16:01:20 +0000 (09:01 -0700)]
Merge "Updated text_select handles Bug:
5076695"
Jean-Michel Trivi [Mon, 29 Aug 2011 15:57:57 +0000 (08:57 -0700)]
am
aca6d629: Merge "Cannot compare Binder references for RC display to unregister"
* commit '
aca6d629e2e72742abc0f46d14b23252489e64ee':
Cannot compare Binder references for RC display to unregister
Jean-Michel Trivi [Mon, 29 Aug 2011 15:56:23 +0000 (08:56 -0700)]
Merge "Cannot compare Binder references for RC display to unregister"
Andreas Huber [Mon, 29 Aug 2011 15:13:47 +0000 (08:13 -0700)]
am
b3c084af: Merge "Signal errors to the client instead of asserting in ACodec."
* commit '
b3c084af16dfd50c20c10320bf2b1e8d4d0cc5b8':
Signal errors to the client instead of asserting in ACodec.
Andreas Huber [Mon, 29 Aug 2011 15:10:56 +0000 (08:10 -0700)]
Merge "Signal errors to the client instead of asserting in ACodec."
Svetoslav Ganov [Sat, 27 Aug 2011 03:33:33 +0000 (20:33 -0700)]
Clean up and bug fixes in the TouchExplorer.
1. The downTime of the first down event was zero but it should the event time.
2. Hover exit events were not injected while transitioning to delegating
state and when tapping.
3. Differentiation between dragging and delagating state based on
two moving pointer direction and distance is now based only on
the direction. Hence, two pointers moving in the same direction
are dragging, otherwise the event stream is delegated unmodified.
The reason for that is the blind people cannot easily determine
and control the distance between their fingers resulting in
different behavior for gestures which the user thinks are the same
which creates confusion. Also in some cases the delegation and
draggig yield the same result, for example in list view, further
adding to the confusion. This was also causing the status bar to
be opened closed inreliably creating frustration.
4. Refactored the code such that now there is only one method that
injects motion events and all request go through it. Some bugs
were introduced by inconsistent implementation in the different
injection methods.
5. Fixed a couple of event stream inconsistencies reported by the
event consistency verifier.
bug:
5224183
bug:
5223787
bug:
5214829
Change-Id: I16c9be3562ad093017af5b974a41ab525b73453f
Adam Powell [Sun, 28 Aug 2011 23:18:16 +0000 (16:18 -0700)]
Fix bug
5124021 - Menu visibility incorrect when restoring ListView
selection mode
Fix visibility of menus when action modes are initiailized early.
Fix ListView problems persisting check states.
Change-Id: Idc21036dc39259e72f0e6831a0ccb4695f8858ef
Adam Powell [Mon, 29 Aug 2011 00:00:22 +0000 (17:00 -0700)]
am
6b316513: Merge "Fix bug
5067075 - missing scrollbar when entering long signatures"
* commit '
6b316513e8ce5c35cafacbeb3b9428fc5c06df67':
Fix bug
5067075 - missing scrollbar when entering long signatures
Adam Powell [Mon, 29 Aug 2011 00:00:19 +0000 (17:00 -0700)]
am
63543e29: Merge "Fix bug
5133509 - Align holo menu panel windows along the bottom of the screen"
* commit '
63543e299764ac5a904dadd8b45e9ce301ea1023':
Fix bug
5133509 - Align holo menu panel windows along the bottom of the screen
Adam Powell [Sun, 28 Aug 2011 23:58:54 +0000 (16:58 -0700)]
Merge "Fix bug
5067075 - missing scrollbar when entering long signatures"
Adam Powell [Sun, 28 Aug 2011 23:58:27 +0000 (16:58 -0700)]
Merge "Fix bug
5133509 - Align holo menu panel windows along the bottom of the screen"
Jim Miller [Sun, 28 Aug 2011 22:11:56 +0000 (15:11 -0700)]
am
816879f2: Merge "Fix
5216579: Don\'t show IME switch option in numeric mode of lockscreen"
* commit '
816879f2d57a22394816b5a405f9e15e6ac56b3b':
Fix
5216579: Don't show IME switch option in numeric mode of lockscreen
Jim Miller [Sun, 28 Aug 2011 22:10:27 +0000 (15:10 -0700)]
Merge "Fix
5216579: Don't show IME switch option in numeric mode of lockscreen"
Jamie Gennis [Sun, 28 Aug 2011 22:09:17 +0000 (15:09 -0700)]
Surface: move the SurfaceTexture ctor
This change moves the Surface ctor that takes a SurfaceTexture to the
portion of the file containing the public APIs.
Change-Id: I192df7bf5c0e6d0d0607bd577d72646312b2f717
Jim Miller [Sun, 28 Aug 2011 22:00:29 +0000 (15:00 -0700)]
Fix
5216579: Don't show IME switch option in numeric mode of lockscreen
Since LockScreen provides its own PIN entry keyboard, we don't need to show
the IME switcher button.
Change-Id: I04528acaee66e5109d631c0c79a3e7c64876e4c5
Pannag Sanketi [Sun, 28 Aug 2011 21:42:33 +0000 (14:42 -0700)]
am
3451df1a: Merge "Default W, H allowed in SurfaceMediaSource dequeue"
* commit '
3451df1a5cc1547fe1061a482a50a639fcc0e8e4':
Default W, H allowed in SurfaceMediaSource dequeue
Pannag Sanketi [Sun, 28 Aug 2011 21:40:26 +0000 (14:40 -0700)]
Merge "Default W, H allowed in SurfaceMediaSource dequeue"
Adam Powell [Sun, 28 Aug 2011 21:36:05 +0000 (14:36 -0700)]
Fix bug
5067075 - missing scrollbar when entering long signatures
Let DialogPreferences decide their own IME adjust mode as normal
rather than forcing adjustPan.
Change-Id: Ib53e9f648342430640469a0682308b056e7ef991
Adam Powell [Sun, 28 Aug 2011 20:21:56 +0000 (13:21 -0700)]
Fix bug
5133509 - Align holo menu panel windows along the bottom of
the screen
Alter preferred options panel gravity policy.
Integrate new menu panel assets for holo apps.
Change-Id: I9fa98ed9359148ea6d1f1d1e727ddcd437b16e2f
Pannag Sanketi [Sat, 27 Aug 2011 03:08:09 +0000 (20:08 -0700)]
am
b8a9e15c: Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
* commit '
b8a9e15c2aa3d317834555244a90f184b46e1dcb':
Modify enum value of OMX_COLOR_FormatAndroidOpaque
Pannag Sanketi [Sat, 27 Aug 2011 03:05:58 +0000 (20:05 -0700)]
Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
Pannag Sanketi [Sat, 27 Aug 2011 03:03:09 +0000 (20:03 -0700)]
am
2b9c5d8a: Merge "Fixing small syntax error in MPEG4 logging"
* commit '
2b9c5d8a89065ab18e58d79ae65a81267b248e1c':
Fixing small syntax error in MPEG4 logging
Pannag Sanketi [Sat, 27 Aug 2011 03:01:46 +0000 (20:01 -0700)]
Merge "Fixing small syntax error in MPEG4 logging"