satok
5d568de820
am d036ef8a: am be836ee8: Merge "Reset the default system ime to the proper one when the system locale is changed" into jb-dev
...
* commit 'd036ef8aa9cb14d8dddd41de74b48fb5025971f9':
Reset the default system ime to the proper one when the system locale is changed
2012-05-03 22:20:41 -07:00
satok
d036ef8aa9
am be836ee8: Merge "Reset the default system ime to the proper one when the system locale is changed" into jb-dev
...
* commit 'be836ee85806d022021eb0bebb8a9136da4a0f5b':
Reset the default system ime to the proper one when the system locale is changed
2012-05-03 22:17:24 -07:00
satok
be836ee858
Merge "Reset the default system ime to the proper one when the system locale is changed" into jb-dev
2012-05-03 22:14:54 -07:00
Wu-cheng Li
a2f492f521
am 51caa511: am b0dcf5eb: Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev
...
* commit '51caa5111ddf16de677c7021b78eb0298b807f7b':
Avoid deadlocks when calling autoFocus from onAutoFocus callback.
2012-05-03 21:58:01 -07:00
Wu-cheng Li
51caa5111d
am b0dcf5eb: Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev
...
* commit 'b0dcf5ebb26e33fde3dd8fbdec58499175f51d65':
Avoid deadlocks when calling autoFocus from onAutoFocus callback.
2012-05-03 21:55:16 -07:00
Wu-cheng Li
b0dcf5ebb2
Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev
2012-05-03 21:52:44 -07:00
Jason Simmons
34b2feb041
Avoid calling BluetoothSocket.destroyNative twice
...
If the destroyNative JNI method is called twice, it will attempt to free
the socketData twice, and the second free will cause an assertion failure.
To avoid this, check whether mSocketState has already been set to CLOSED
while holding the write lock. If it has, then destroyNative has already
been called and should not be called again.
Bug: 3096033
Change-Id: Ic7c0bbf21823d389b26919da8c533d8ac4d49064
2012-05-03 19:46:01 -07:00
Christopher Tate
9f2bcd2799
Merge "Fix the build (mangled merge)"
2012-05-03 19:40:08 -07:00
Christopher Tate
d9bf38821b
Fix the build (mangled merge)
...
Change-Id: I6d7a09e239fcd53186e797d6c35f0cfded3c43e1
2012-05-03 19:37:56 -07:00
Dianne Hackborn
eabcde2d92
am a112461f: am 610f310b: Merge "New permissions UI." into jb-dev
...
* commit 'a112461fdc7ab36912dce27256ce8289be94471b':
New permissions UI.
2012-05-03 19:22:51 -07:00
Dianne Hackborn
a112461fdc
am 610f310b: Merge "New permissions UI." into jb-dev
...
* commit '610f310b199ec0d93cb6e78106b029d7269015df':
New permissions UI.
2012-05-03 19:05:24 -07:00
Dianne Hackborn
610f310b19
Merge "New permissions UI." into jb-dev
2012-05-03 19:03:11 -07:00
Dianne Hackborn
0e128bb2e0
New permissions UI.
...
Had to keep around a little of the old API for the device
admin settings UI to continue to use.
Change-Id: I84c5666a7f3fec0495eae196a0ffc2223c9e6f82
2012-05-03 19:00:23 -07:00
Jeff Sharkey
615778fb79
am c4ef06b1: am 1c873609: Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev
...
* commit 'c4ef06b1937142c857987f88fb6eced9ad0fc82f':
Make fixed-width dialogs larger on sw600dp.
2012-05-03 18:53:35 -07:00
Jeff Brown
70a46780be
am cd7cf7ab: am 6098c1f4: Fix status bar animation jank on last frame.
...
* commit 'cd7cf7ab0ab546e7a13b5ae5149e5d874b3dc1b1':
Fix status bar animation jank on last frame.
2012-05-03 18:53:33 -07:00
Jeff Brown
ce268e5553
am 4544af9e: am ed5f45ab: Animate status bar flings on vsync.
...
* commit '4544af9e3946290d25c9e20e4a2558eb028d78cd':
Animate status bar flings on vsync.
2012-05-03 18:53:32 -07:00
Christopher Tate
f131611d03
resolved conflicts for merge of b89ce434 to master
...
Change-Id: Ida7ef25adc2f4b9f22d8662c9f0e8a1ec9df0d55
2012-05-03 18:18:34 -07:00
Jeff Sharkey
c4ef06b193
am 1c873609: Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev
...
* commit '1c87360918c81f1cabc7be0760d7e059f2cfa178':
Make fixed-width dialogs larger on sw600dp.
2012-05-03 17:38:35 -07:00
Jeff Brown
cd7cf7ab0a
am 6098c1f4: Fix status bar animation jank on last frame.
...
* commit '6098c1f44b0f2010053f9ebb6d36e01830784fc5':
Fix status bar animation jank on last frame.
2012-05-03 17:38:33 -07:00
Jeff Sharkey
1c87360918
Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev
2012-05-03 17:36:43 -07:00
Jeff Brown
4544af9e39
am ed5f45ab: Animate status bar flings on vsync.
...
* commit 'ed5f45ab8f26740f7f12c2ac7b46ad908f3e9ee5':
Animate status bar flings on vsync.
2012-05-03 17:35:22 -07:00
Craig Mautner
3fe38c0e73
Retain current visibility when copying layoutparam
...
The LayoutParams members, systemUiVisibility and
subtreeSystemUiVisibility are derived values rather than app-generated
values. When copying LayoutParams members make sure these values are
not overwritten.
Overwriting them was causing the STATUS_BAR_DISABLE_XXX flags to be
overwritten exposing elements that should have remained hidden.
Fixes bug b6374541.
Change-Id: Iaae4b4167e1b148bbdba4d05f473844f7fa3bf8d
2012-05-03 17:28:09 -07:00
Jeff Brown
fd1d99f5dd
Remove obsolete tool.
...
Change-Id: I750ad12e9ebc41d9e620942f3df09c7660340715
2012-05-03 17:15:56 -07:00
Jeff Brown
6098c1f44b
Fix status bar animation jank on last frame.
...
Change-Id: Idd99f37c76038de1c02a8297c6454c357a846294
2012-05-03 17:00:04 -07:00
Jeff Sharkey
cc152567d5
Make fixed-width dialogs larger on sw600dp.
...
Leaves at existing size for sw720dp devices.
Bug: 6378944
Change-Id: I8be079869c724eb05949cb56e137626e32140afb
2012-05-03 16:55:16 -07:00
Makoto Onuki
35c29cfce7
Remove SocialContract, which was never used.
...
Bug 6148750
Change-Id: I3061b427ea20c35de826e6c0c7bb8cbe5fa1f04d
2012-05-03 16:39:40 -07:00
Elliott Hughes
89269cf98d
libnativehelper is implicitly available.
...
(And is moving for the PDK.)
Bug: 6369821
Change-Id: I9e082ef294cfb2d70384255eb06d97d8cb92b382
2012-05-03 16:39:22 -07:00
Chet Haase
cb150fe9e6
Minor doc fixes for animation- and view-related things
...
Issue #6016341 Add info about properties and ViewPropertyAnimator to View reference docs
Issue #6441062 Misleading docs in ViewPropertyAnimator
Change-Id: Ica7c026c770fe2e57013fe443ede5428cd6b6604
2012-05-03 16:30:16 -07:00
John Reck
972e8bc09a
am fd84f173: am 84fa241f: Fix tap highlight annoyingness
...
* commit 'fd84f173a021b8c492bbd1479a5a75690c89c17a':
Fix tap highlight annoyingness
2012-05-03 16:21:09 -07:00
John Reck
fd84f173a0
am 84fa241f: Fix tap highlight annoyingness
...
* commit '84fa241f6c6f8b9f72371dd540515ba8041dd6b7':
Fix tap highlight annoyingness
2012-05-03 16:18:31 -07:00
Jeff Brown
ed5f45ab8f
Animate status bar flings on vsync.
...
Use the Choreographer for timing animations. Ideally we would
rewrite this code to use the animation framework instead, but
this change to use the Choreographer directly is easier and less
intrusive for now.
Change-Id: Ibb322de9424d4d109203951d48263766200ed7e8
2012-05-03 16:18:18 -07:00
John Reck
84fa241f6c
Fix tap highlight annoyingness
...
Bug: 6108346
Highlight now correctly doesn't show up unless it is a click, and
no longer has any weirdness with sticking around unusually long
Change-Id: I06f6eae45d970085232466f17cbbd9ebaefc4d69
2012-05-03 16:08:55 -07:00
Chet Haase
5eea7b89a7
am dbad40ac: am f7ee988e: Merge "Better error logs for faulty ObjectAnimators" into jb-dev
...
* commit 'dbad40ac7255016b4cb17c1145346425f933504d':
Better error logs for faulty ObjectAnimators
2012-05-03 16:03:29 -07:00
Andreas Huber
60d610bf10
Various changes to Media* APIs requested by the api council.
...
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
2012-05-03 16:02:29 -07:00
Chet Haase
dbad40ac72
am f7ee988e: Merge "Better error logs for faulty ObjectAnimators" into jb-dev
...
* commit 'f7ee988e55c6f6934cbb9e47feea65e62a3a2f21':
Better error logs for faulty ObjectAnimators
2012-05-03 16:00:23 -07:00
Chet Haase
f7ee988e55
Merge "Better error logs for faulty ObjectAnimators" into jb-dev
2012-05-03 15:57:32 -07:00
Teng-Hui Zhu
508d7053ff
Unify the rect names according to the coordinates
...
This is a pure refactor, no functional change.
bug:6338456
Change-Id: Ib40af53f4e2ff8ce5c9f82f3472989b2d3f2007c
2012-05-03 15:55:29 -07:00
Christopher Tate
b89ce43499
Add streamlined config-based path for no volume key sounds
...
This lets us avoid a Binder roundtrip to the system process during
volume changes. Previously volume change would be staged at key-down,
then applied at key up in tandem with playback of the sonic feedback
about volume key presses. The reason for this two-stage handling was
to defer playback of the sound [at the target volume] while the volume
key was being held for repeat.
On some devices volume is always sent as key down/up pairs rather than
down-repeat-up sequences. On these devices it is more efficient to
apply the new volume immediately during down handling, and have the
up handling be a no-op. This CL adds a configuration resource item
selecting this new fast path.
Bug 6433943
Change-Id: Icffa56e958243b841d514e2fe4609ba3a7b20f14
2012-05-03 15:41:34 -07:00
Eric Fischer
42a8b4a3b6
am 905134f1: (-s ours) am 7b7281ed: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '905134f12f781cff5e9d6bf31e932343fe2fd589':
Import translations. DO NOT MERGE
2012-05-03 15:23:09 -07:00
Eric Fischer
905134f12f
am 7b7281ed: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '7b7281edc1f328caefe97822666b6eb9ba27ef09':
Import translations. DO NOT MERGE
2012-05-03 15:19:59 -07:00
Chet Haase
db4101c7d5
Better error logs for faulty ObjectAnimators
...
Previously, if you set up an ObjectAnimator with the name of a property
which could not be resolved to an existing method (e.g., "foo" becomes "getFoo()"
or "setFoo()"), the errors in the log could be a bit obscure and the animation might
just crash sometime later with an unexplained NPE. This change provides a more
detailed log message detailing the actual method/class involved.
Issue #5990756 NullPointerException on no such property
Change-Id: Ic5bf7069c4879623e00ab8a794b799773cce487c
2012-05-03 15:19:24 -07:00
Jean-Michel Trivi
8269b76d05
am 10e7c858: am c9198161: Merge "Make AudioService aware of device orientation changes" into jb-dev
...
* commit '10e7c858b2d85477550467ac061647a730566f95':
Make AudioService aware of device orientation changes
2012-05-03 15:18:32 -07:00
Eric Fischer
04cf5adeff
Merge "Import translations. DO NOT MERGE"
2012-05-03 15:17:04 -07:00
Eric Fischer
7b7281edc1
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-03 15:16:52 -07:00
Jean-Michel Trivi
10e7c858b2
am c9198161: Merge "Make AudioService aware of device orientation changes" into jb-dev
...
* commit 'c919816155f18e2cf395abc31fc3e1c3923bde76':
Make AudioService aware of device orientation changes
2012-05-03 15:15:13 -07:00
Jean-Baptiste Queru
cd9adbcea0
am 00f94e88: Merge "Enable chromium http stack for x86"
...
* commit '00f94e88f96ed87c95ea65563396609c61e72dca':
Enable chromium http stack for x86
2012-05-03 15:14:56 -07:00
Brian Colonna
b528c53e1f
am ad8af546: am 9b4dc0f7: Merge "Fix 6396479: Made FUL unlock layout look good on nakasi" into jb-dev
...
* commit 'ad8af5463fe5aa064c9aa4e0e5320eeb53f13983':
Fix 6396479: Made FUL unlock layout look good on nakasi
2012-05-03 15:13:45 -07:00
Jean-Michel Trivi
c919816155
Merge "Make AudioService aware of device orientation changes" into jb-dev
2012-05-03 15:13:06 -07:00
Brian Colonna
ad8af5463f
am 9b4dc0f7: Merge "Fix 6396479: Made FUL unlock layout look good on nakasi" into jb-dev
...
* commit '9b4dc0f70194c2e1c24ecc146f4f0c74970cf347':
Fix 6396479: Made FUL unlock layout look good on nakasi
2012-05-03 15:11:35 -07:00
Brian Colonna
9b4dc0f701
Merge "Fix 6396479: Made FUL unlock layout look good on nakasi" into jb-dev
2012-05-03 15:09:18 -07:00