76212 Commits

Author SHA1 Message Date
Jeff Sharkey
74f64d78e5 am bb1492f7: Merge "Reduce persist threshold for lower warning/limit." into jb-dev
* commit 'bb1492f7fae9fbcdfcb02b6f8475fd98a236c244':
  Reduce persist threshold for lower warning/limit.
2012-05-04 12:54:49 -07:00
Jeff Sharkey
3ddb4f80e5 am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev
* commit 'c065a8af1561544f1557e3f5036e45a4be4a6d7e':
  Begin collecting xtables iface counters.
2012-05-04 12:54:46 -07:00
Jeff Sharkey
8e84ae3653 am 15a5a87e: Merge "Block metered APNs when app is restricted." into jb-dev
* commit '15a5a87e374c26c2502c8b38ca00f80a34f3675f':
  Block metered APNs when app is restricted.
2012-05-04 12:54:44 -07:00
Jeff Sharkey
bb1492f7fa Merge "Reduce persist threshold for lower warning/limit." into jb-dev 2012-05-04 12:53:14 -07:00
Jeff Sharkey
c065a8af15 Merge "Begin collecting xtables iface counters." into jb-dev 2012-05-04 12:53:02 -07:00
Jeff Sharkey
15a5a87e37 Merge "Block metered APNs when app is restricted." into jb-dev 2012-05-04 12:52:49 -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
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
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
Chet Haase
d92c5c03d0 am 6c5f4cd0: Merge "Fix hang/crash in native path code" into jb-dev
* commit '6c5f4cd074e1ec4fd22a807aab409586f9b6b45f':
  Fix hang/crash in native path code
2012-05-04 10:48:52 -07:00
Chet Haase
6c5f4cd074 Merge "Fix hang/crash in native path code" into jb-dev 2012-05-04 10:46:55 -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
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
Daniel Sandler
c5731e424a am e825b3e3: Merge "Back button dismisses notifications again." into jb-dev
* commit 'e825b3e3d41e3fd2f6f3bbdf9feb6b8cc87a77dd':
  Back button dismisses notifications again.
2012-05-04 10:19:27 -07:00
Daniel Sandler
e825b3e3d4 Merge "Back button dismisses notifications again." into jb-dev 2012-05-04 10:17:01 -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
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
Daniel Sandler
c4f2a5652d Back button dismisses notifications again.
Bug: 6441337
Change-Id: Iabc97cd2a3f66ee2af5406807b3023908965b8c8
2012-05-04 11:58:01 -04:00
Andreas Huber
9d8aa0e4ac am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev
* commit 'c52c957c450ded6ecf2444595ea6ddfc9546c786':
  Various changes to Media* APIs requested by the api council.
2012-05-04 08:55:40 -07:00
Andreas Huber
c52c957c45 Merge "Various changes to Media* APIs requested by the api council." into jb-dev 2012-05-04 08:53:23 -07:00
Jean-Baptiste Queru
e48883638a Merge "Ignore from AOSP - there's already an equivalent change in JellyBean" into jb-dev-plus-aosp 2012-05-04 08:16:18 -07:00
Jean-Baptiste Queru
cd19b72c13 Ignore from AOSP - there's already an equivalent change in JellyBean
Change-Id: Idcbe6f7b29255d5873da0abcb1fd23f651d216b4
2012-05-04 08:15:04 -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
Jeff Brown
cf08a24887 am a08dc5de: Merge "Remove obsolete tool." into jb-dev
* commit 'a08dc5de8d039a4fd0a8c1286147c6afd01d2edf':
  Remove obsolete tool.
2012-05-04 00:13:14 -07:00
Jeff Brown
a08dc5de8d Merge "Remove obsolete tool." into jb-dev 2012-05-04 00:11:12 -07:00
Elliott Hughes
6ad4cc8ca8 am 2dfcb613: Merge "libnativehelper is implicitly available." into jb-dev
* commit '2dfcb613312be9119c15d3372ae7ef41699f1935':
  libnativehelper is implicitly available.
2012-05-03 22:31:15 -07:00
Elliott Hughes
2dfcb61331 Merge "libnativehelper is implicitly available." into jb-dev 2012-05-03 22:29:28 -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
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
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
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