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

17037 Commits

Author SHA1 Message Date
Mike Lockwood
49b9449b66 am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:09:30 -07:00
Mike Lockwood
d8d8470825 am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:06:47 -07:00
Mike Lockwood
988b6648b0 Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 2011-05-23 17:04:01 -07:00
Mike Lockwood
a5250c9392 MountService: Add StorageVolume as extra in storage related broadcasts. 
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:01:55 -04:00
John Reck
f656d95078 am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit '82de141db736b95b0e388ff060e2d2535192d769':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-23 16:53:28 -07:00
John Reck
82de141db7 am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit '4a74eb679917797bf77a20773e0c079f5cc808e4':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-23 16:50:23 -07:00
John Reck
4a74eb6799 Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 2011-05-23 16:47:32 -07:00
Dianne Hackborn
bbca81334e am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2 
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.
 2011-05-23 16:16:54 -07:00
Dianne Hackborn
4bb78889d0 am 40277df7: Merge "Add "television" mode." into honeycomb-mr2 
* commit '40277df7c33c0fc381eec589c768fe86de4b4404':
  Add "television" mode.
 2011-05-23 16:07:43 -07:00
John Reck
3e1aecea2e DO NOT MERGE Use previous version if version is a codename 
When the version is reported as a codename, use the previous version
 in the user agent string.
 Bug: 4347787

Change-Id: I4ed804a7334d6ca242446176ff042c4ac7938a0f
 2011-05-23 15:45:16 -07:00
Dianne Hackborn
40277df7c3 Merge "Add "television" mode." into honeycomb-mr2 2011-05-23 15:18:20 -07:00
Dianne Hackborn
e360bb6bd8 Add "television" mode. 
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
 2011-05-23 15:11:08 -07:00
Shimeng (Simon) Wang
f55a00b1b8 am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-23 12:55:37 -07:00
Shimeng (Simon) Wang
de60ce66c1 am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit '358d2cd96403383cfb91bb68598a4cb2fe2e170e':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-23 12:14:04 -07:00
Shimeng (Simon) Wang
358d2cd964 Simplify browser pause/resume logic to avoid stuck timer. 
The current browser pause/resume logic uses an integer count to track
the pause/resume behavior, which is mostly working fine in phone.  The interger
count is usually 0 when browser is paused, and its value is usually 1
when the browser is resumed and will trigger any delayed timer.

But in tablet, where tabs can be easily created/switched/deleted, this
logic will not work well and sometimes cause resources timers get stuck.
For example, in case multiple tabs are created, and you reload one of the
tabs, when it's almost finished, switch to another tab, and hit home or power
button, at this point of time, the browser will be suspended at
Controller.java::onPause, hence the integer count will be 0; but since
the other tab is also finished after the pause, the current logic at
Controller.java::onPageFinished will call pause timer again, which will make
the integer count to be -1.  Before the time the browser is resumed, it's very
possible some tabs will have some resources, such as images/flashs,
scheduled to be loaded, these will be in delayed timer in
ResourceLoadScheduler.cpp's m_requestTimer.
Now when the browser is resumed, the integer count will be 0, which will not
trigger delayed timer.  Then all the new timers will be stuck as well since
old timers are not executed yet.

The fix is to simplify the pause/resume logic by just using a boolean variable
instead of error-prone integer counting.

issue: 4177932
Change-Id: Id10af9298c7be1f82222d0b94c34c5dc68403630
 2011-05-23 10:00:39 -07:00
Adam Powell
7dfdb91420 am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit 'f483ed90401d63b7317f823fcac10315146d3072':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-20 16:14:42 -07:00
Dianne Hackborn
070a19e035 am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 16:13:54 -07:00
Adam Powell
f483ed9040 am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-20 16:02:21 -07:00
Adam Powell
bdc26dc34a Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 2011-05-20 15:59:19 -07:00
Adam Powell
3f4a764cf4 Change measurement of effective screen height for PopupWindow now that 
DisplayMetrics reports it without system decorations.

Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
 2011-05-20 15:56:25 -07:00
Jaikumar Ganesh
e2271a55ad am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:52:27 -07:00
Dianne Hackborn
5c8caba2e5 am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 14:32:35 -07:00
Dianne Hackborn
1b144e625f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Jaikumar Ganesh
d7030e551a am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:21:23 -07:00
Jaikumar Ganesh
198ed3e46a Merge "BT: Wrong publishing result of bonding error code." 2011-05-20 13:35:20 -07:00
Adam Powell
f2004180f8 am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:09:13 -07:00
Adam Powell
f5abccefb1 am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:04:11 -07:00
Adam Powell
73a31ec91c Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 2011-05-20 12:59:43 -07:00
Dianne Hackborn
ea2117bdc0 Add ParcelFileDescriptor.fromFd() and .adoptFd(). 
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
 2011-05-20 12:48:22 -07:00
satok
33bdc3c999 am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:51:14 -07:00
satok
d9435bcecc am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:41:03 -07:00
satok
b4788fdbfd Do not merge. Backport two fixes for InputMethethodFramework 
Bug: 3420384

backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942

Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
 2011-05-20 22:11:54 +09:00
Dianne Hackborn
06a8ceacb0 am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:34:21 -07:00
Dianne Hackborn
c851ea5672 am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:30:32 -07:00
Adam Powell
8abebcde3f New opaque cab assets; search dialog tweaks. 
* New opaque assets (now actually opaque!)

* SearchDialog determines theme to use from parent context

* SearchDialog now disallows action modes

Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
 2011-05-19 18:48:44 -07:00
Dianne Hackborn
69cb87576b Add new "-swNNNdp" resource qualifier. 
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
 2011-05-19 18:23:29 -07:00
Adam Powell
90177e59e5 am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:17:30 -07:00
Adam Powell
d40575eb98 am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:06:09 -07:00
Adam Powell
b9537db8d9 Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 2011-05-19 15:48:38 -07:00
Adam Powell
dacbb746c9 DO NOT MERGE Action bar config changes 
Handle action bar padding on configuration changes when the app
handles these changes itself.

Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
 2011-05-19 15:38:27 -07:00
Chet Haase
7189d571e2 am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 14:03:04 -07:00
Chet Haase
f0c6ddd99b am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 13:59:06 -07:00
Chet Haase
51fb97031f Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 2011-05-19 13:57:03 -07:00
Chet Haase
19e748a3d1 DO NOT MERGE: Add custom fragment anims for popping backstack 
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.

The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.

Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
 2011-05-19 13:44:40 -07:00
Kenny Root
b2d0ee164a Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-19 12:48:41 -07:00
Kenny Root
e6cd0c747e resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp 
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
 2011-05-19 12:48:14 -07:00
Wink Saville
09ded82b78 am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE 
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
  Reset connection while data state changed.
 2011-05-19 11:28:36 -07:00
Wink Saville
ab5baa1d5f Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Kenny Root
2433c443bb am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread 
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
  Break apart queries to getInstalled* API
 2011-05-19 11:04:01 -07:00
Kenny Root
f2006f3123 Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00