drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,688 Commits 1 Branch 0 Tags
Commit Graph

76688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
67772a0929 am c5731e42: am e825b3e3: Merge "Back button dismisses notifications again." into jb-dev 
* commit 'c5731e424ac7311fe79c802124a6853bbf1a4350':
  Back button dismisses notifications again.
 2012-05-04 10:22:34 -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
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
Andreas Huber
4b27a9133e am 9d8aa0e4: am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev 
* commit '9d8aa0e4ac0498e2a139bd60342d986c42251e2b':
  Various changes to Media* APIs requested by the api council.
 2012-05-04 08:58:22 -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
8c79a1ea95 am e4888363: Merge "Ignore from AOSP - there\'s already an equivalent change in JellyBean" into jb-dev-plus-aosp 
* commit 'e48883638ad223289e60c9086e42767f9c7b3a4f':
  Enable chromium http stack for x86
 2012-05-04 08:18:15 -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
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
Jean-Baptiste Queru
bfad7d6396 Fix build 
Change-Id: I7309cb3ca67f8c17545bdfa40fd9370464856942
 2012-05-04 07:13:43 -07:00
Jeff Brown
2989bb0de3 am cf08a248: am a08dc5de: Merge "Remove obsolete tool." into jb-dev 
* commit 'cf08a248878320296c3fc283b1baff390bf0e172':
  Remove obsolete tool.
 2012-05-04 00:16:09 -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
edbb64f5aa am 6ad4cc8c: am 2dfcb613: Merge "libnativehelper is implicitly available." into jb-dev 
* commit '6ad4cc8ca8fbe1d0039755759497305c1a6c53e1':
  libnativehelper is implicitly available.
 2012-05-03 22:33:25 -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
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
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