George Mount
977b97b1c9
am c24c069e: am a2c21308: Merge "Limit when auto-complete popups attach to WebView." into jb-dev
...
* commit 'c24c069e2bd925d1644e8dd5ffeff5242cbb2d4f':
Limit when auto-complete popups attach to WebView.
2012-05-04 11:49:43 -07:00
George Mount
c24c069e2b
am a2c21308: Merge "Limit when auto-complete popups attach to WebView." into jb-dev
...
* commit 'a2c213080d26c08235f11829fb2bbcf07cdfdd46':
Limit when auto-complete popups attach to WebView.
2012-05-04 11:47:07 -07:00
George Mount
a2c213080d
Merge "Limit when auto-complete popups attach to WebView." into jb-dev
2012-05-04 11:44:54 -07:00
Romain Guy
de4368687e
am edc773ca: am 531d164d: Merge "Fix javadoc" into jb-dev
...
* commit 'edc773cab7a3e89752747419cd67a18e12c44901':
Fix javadoc
2012-05-04 11:42:55 -07:00
Romain Guy
edc773cab7
am 531d164d: Merge "Fix javadoc" into jb-dev
...
* commit '531d164d677b5f924896fd758d8f544ed7a8d07a':
Fix javadoc
2012-05-04 11:40:07 -07:00
Romain Guy
531d164d67
Merge "Fix javadoc" into jb-dev
2012-05-04 11:36:25 -07:00
Romain Guy
3dd4b51fc3
Fix javadoc
...
Change-Id: I1f1262a9a385e981a98876f8396ad375ab74827d
2012-05-04 11:31:01 -07:00
Andy Stadler
09b45a3ad9
Add System Tracing capability to Sync Manager
...
This tracing code is enabled via "systrace.py --set-tags sync"
Change-Id: Ia8bc01adbba345a568405b0ac8ade96e56b40cc1
2012-05-04 11:24:33 -07:00
Chet Haase
c0400e9f26
am 78c481c1: am 4380f954: Merge "Minor doc fixes for animation- and view-related things" into jb-dev
...
* commit '78c481c18254bb4b45329fd4e4cb4da381593a80':
Minor doc fixes for animation- and view-related things
2012-05-04 10:56:20 -07:00
Chet Haase
78c481c182
am 4380f954: Merge "Minor doc fixes for animation- and view-related things" into jb-dev
...
* commit '4380f9542fcb4a452332ecbea6a2036a2b159ab3':
Minor doc fixes for animation- and view-related things
2012-05-04 10:52:10 -07:00
Chet Haase
4380f9542f
Merge "Minor doc fixes for animation- and view-related things" into jb-dev
2012-05-04 10:49:21 -07:00
John Reck
c52f0d3d80
am 722211ed: am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev
...
* commit '722211ed8384122e85c45c0490a6fa411d255130':
Monkeys are touching my destroyed stuff
2012-05-04 10:34:15 -07:00
John Reck
722211ed83
am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev
...
* commit '90673b9d0e33de1162a671995796171ba953d35d':
Monkeys are touching my destroyed stuff
2012-05-04 10:31:42 -07:00
Daniel Sandler
b4b2223fa1
Add number back to legacy notifications.
...
Bug: 5816717
Change-Id: I52c98143378c315dec5b525cb3d96c214ee8196e
2012-05-04 13:31:33 -04:00
John Reck
90673b9d0e
Merge "Monkeys are touching my destroyed stuff" into jb-dev
2012-05-04 10:29:10 -07:00
John Reck
026bb684be
Monkeys are touching my destroyed stuff
...
Bug: 6443402
Change-Id: I4e992d8d0f53958f0cbeb405f30635e0d172009f
2012-05-04 10:25:43 -07:00
George Mount
57bd51713e
Limit when auto-complete popups attach to WebView.
...
Bug 6401222
Only create the anchor view when the popup window
is ready to show and detach it when it is dismissed.
Change-Id: Ic16485e9970b00744c07b470df5420568332c8f0
2012-05-04 10:24:28 -07:00
Teng-Hui Zhu
826bcf0d9b
am 5a63ec30: am 0008f736: Merge "Unify the rect names according to the coordinates" into jb-dev
...
* commit '5a63ec30d670ac8ed384525cd8cd3067d39ad742':
Unify the rect names according to the coordinates
2012-05-04 09:34:56 -07:00
Teng-Hui Zhu
5a63ec30d6
am 0008f736: Merge "Unify the rect names according to the coordinates" into jb-dev
...
* commit '0008f736471dca879b87028b892172689ff3534c':
Unify the rect names according to the coordinates
2012-05-04 09:30:38 -07:00
Makoto Onuki
de70e49457
am e8d4d402: am d7247c76: Merge "Remove SocialContract, which was never used." into jb-dev
...
* commit 'e8d4d402aa23f39df238fc30ab281001120e6a2e':
Remove SocialContract, which was never used.
2012-05-04 09:28:46 -07:00
Teng-Hui Zhu
0008f73647
Merge "Unify the rect names according to the coordinates" into jb-dev
2012-05-04 09:28:23 -07:00
Makoto Onuki
e8d4d402aa
am d7247c76: Merge "Remove SocialContract, which was never used." into jb-dev
...
* commit 'd7247c7633a1c97db824f1bd6298fbf5f13cd8f4':
Remove SocialContract, which was never used.
2012-05-04 09:24:33 -07:00
Makoto Onuki
d7247c7633
Merge "Remove SocialContract, which was never used." into jb-dev
2012-05-04 09:22:39 -07:00
Craig Mautner
e819926a14
am 5bdf1143: am 602290a0: Merge "Retain current visibility when copying layoutparam" into jb-dev
...
* commit '5bdf114327fa219ed5a5243883713c09c020aa3a':
Retain current visibility when copying layoutparam
2012-05-04 08:07:16 -07:00
Craig Mautner
5bdf114327
am 602290a0: Merge "Retain current visibility when copying layoutparam" into jb-dev
...
* commit '602290a01124b2eac045b066a87a6fc4911153c6':
Retain current visibility when copying layoutparam
2012-05-04 08:04:19 -07:00
Craig Mautner
602290a011
Merge "Retain current visibility when copying layoutparam" into jb-dev
2012-05-04 08:01:59 -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
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
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
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
Makoto Onuki
35c29cfce7
Remove SocialContract, which was never used.
...
Bug 6148750
Change-Id: I3061b427ea20c35de826e6c0c7bb8cbe5fa1f04d
2012-05-03 16:39:40 -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
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
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
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
Eino-Ville Talvala
92718ecace
am b239d1a9: am 163a3ae7: Merge "Update docs for YV12 format and camera preview callbacks." into jb-dev
...
* commit 'b239d1a974c9fafef5dd905f51d657a9efe42f27':
Update docs for YV12 format and camera preview callbacks.
2012-05-03 13:55:42 -07:00
Eino-Ville Talvala
b239d1a974
am 163a3ae7: Merge "Update docs for YV12 format and camera preview callbacks." into jb-dev
...
* commit '163a3ae770c290f87347e5b413ec8ff9f128a311':
Update docs for YV12 format and camera preview callbacks.
2012-05-03 13:51:39 -07:00
Eino-Ville Talvala
163a3ae770
Merge "Update docs for YV12 format and camera preview callbacks." into jb-dev
2012-05-03 13:49:57 -07:00
Jeff Sharkey
ac3fcb1590
Reduce persist threshold for lower warning/limit.
...
Default is 2MB persist threshold, but even that can be substantial
for devices on 100MB/month plans. This change gradually reduces the
persist threshold up to 8x lower (256kb outstanding) based on lowest
active policy.
Bug: 5382676
Change-Id: Ief4e8cdb169bfb151a3d1b45722a8eaa01926508
2012-05-03 12:12:10 -07:00
Jeff Brown
3025afded3
am d4daf521: am e19dbd9f: Merge "Separate the internal and external display rotations." into jb-dev
...
* commit 'd4daf5212ebee0886ad02ceb6301a829cb1674a1':
Separate the internal and external display rotations.
2012-05-03 12:01:13 -07:00
Jeff Brown
d4daf5212e
am e19dbd9f: Merge "Separate the internal and external display rotations." into jb-dev
...
* commit 'e19dbd9f9d0fea5959d8384d5d9d577d25cc8963':
Separate the internal and external display rotations.
2012-05-03 11:59:05 -07:00