Commit Graph

15569 Commits

Author SHA1 Message Date
Amith Yamasani
5b00912e58 am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
* commit '51652f5674e266d62607324255517d41d225d9be':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:08:48 -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
Amith Yamasani
51652f5674 Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 2011-05-23 17:05: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
Amith Yamasani
1d2385d08a DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
Breadcrumbs move to the action bar on certain configs.

Padding around fragments and to the left of preference items
adjusted for different display sizes.

Change-Id: Ie899f9742f4ebd7044f158b1c7db06df82ad2d75
2011-05-23 16:53:16 -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
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
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
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
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
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
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
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
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
Wink Saville
ab5baa1d5f Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Mike Lockwood
ae448e2c90 am a88b42d5: USB: Add method to access raw USB device descriptors
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
  USB: Add method to access raw USB device descriptors
2011-05-19 10:01:53 -07:00
Mike Lockwood
a88b42d569 USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-19 12:57:41 -04:00
Wink Saville
be2b058ec1 Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.


Change-Id: I008aea969378648192852161959fdf4aad6211a1
2011-05-18 15:59:04 -07:00
Robert Greenwalt
59b1a4ede7 Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
2011-05-18 15:25:43 -07:00
Kazuhiro Ondo
01758e81b3 Linkproperties update via unsol data call state change.
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.

Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
2011-05-17 20:53:40 -07:00
Mike Lockwood
5a79cfd751 am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
  StorageVolume: Add getStorageId() accessor
2011-05-17 16:44:51 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 17:19:37 -04:00
Dianne Hackborn
417448369c am 7916ac65: Add new command line option to change global screen size.
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
  Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc Add new command line option to change global screen size.
For example:

adb shell am display-size 1024x600

Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
2011-05-16 20:55:41 -07:00
Dianne Hackborn
1d340a3c24 am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00
Dianne Hackborn
0eac092766 Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 2011-05-16 13:10:23 -07:00
Dianne Hackborn
68066c2f38 DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Not yet working, so turned off.

Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.

Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
2011-05-16 13:08:07 -07:00
Dianne Hackborn
fddd927fb7 am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:02:57 -07:00
Dianne Hackborn
9d0f2c6d97 Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 2011-05-16 13:01:07 -07:00
Dianne Hackborn
29735689ce DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
2011-05-16 12:57:38 -07:00
Dianne Hackborn
d90a2c4d44 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
  DO NOT MERGE.  Integrate from master: Rework display size access.
2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Mike Lockwood
b822d2464d am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
* commit '0a93d875527c52183080b63a0b19d567856952af':
  StorageManager:  Clean up and generalize storage configuration resources
2011-05-16 12:36:29 -07:00
Mike Lockwood
0a93d87552 Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 2011-05-16 12:34:02 -07:00