20614 Commits

Author SHA1 Message Date
Joe Onorato
5520610cb2 Merge "Make adb shell am display-size persistent." into honeycomb-mr2 2011-05-25 11:40:59 -07:00
Joe Onorato
571ae90801 Make adb shell am display-size persistent.
Change-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9
2011-05-25 11:40:21 -07:00
Amith Yamasani
99a8e1d293 Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 2011-05-25 10:58:24 -07:00
Russell Brenner
64796477f6 Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
Dianne Hackborn
c404e9b201 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Dianne Hackborn
5be8de3420 More compatibility mode improvements.
We now correctly adjust display metrics, fixing for example issues
seen in Barcode Scanner.  In addition the decision about when to use
compatibility mode has a bug fixed where certain apps would not go
out of compatibility mode even though they should be able to.

Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
2011-05-24 18:13:25 -07:00
Russell Brenner
1d87cbf602 DO NOT MERGE-Refire the redraw event if webkit wasn't ready
If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: Ib0c4cedb10f58821f95c439824c30043a906f8b8
2011-05-24 17:17:40 -07:00
Amith Yamasani
6ea08998ee More preference item visual adjustments for smaller tablets. DO NOT MERGE
Use medium text size for locale picker.
Hide icon region if there's no icon.

Bug: 4462313

Change-Id: I8062646f31bfec753bcd476f54c8ab5b66375b5e
2011-05-24 15:50:36 -07:00
Kristian Monsen
36ac304c6e Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2 2011-05-24 11:16:39 -07:00
John Reck
2959916b13 Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 2011-05-24 11:03:11 -07:00
Kristian Monsen
f147b5f2a6 Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
This is the WebView part, passing the bypass list to
the native side.

Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.

Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,111108

Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111107

Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-24 18:58:51 +01: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
5443ba43bb Update the Desktop UA to Chrome
Bug: 4347787

Change-Id: I5117c7dbd4e73c39ed417113f12b517de5411e81
2011-05-23 16:50:29 -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
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
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
Jim Miller
2c7906eb39 Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 2011-05-20 16:49:08 -07:00
Jim Miller
024e429b49 Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
2011-05-20 16:14:15 -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
1b144e625f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Jim Miller
14e45f9b19 Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 2011-05-20 13:13:19 -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
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
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
Jim Miller
74de8b923a Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
This fixes LockScreen on 7" tablets by moving the resources to xlarge.

In addition, it has some minor layout tweaks to center pattern and
wave unlock widgets on both so we can share the layout resources.

Change-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb
2011-05-19 17:05:30 -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
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
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
Adam Powell
67a0a6ab09 DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
2011-05-18 19:10:46 -07:00
Adam Powell
5d6c990b7f Fix bug 4416126 - orientation change bug with action bar overflow menu
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Adam Powell
185d9c4dbf Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2 2011-05-17 18:30:08 -07:00
Adam Powell
bd964f9624 Tweak padding and sizing of alert dialog elements to fit better in
landscape mode on large screen devices. Integrate new dialog frame
assets that take up less space.

Change-Id: Icd1261063511355844579d6c5c34f32284031f82
2011-05-17 18:25:56 -07:00
Mike Lockwood
27ac64ecee Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 2011-05-17 16:42:48 -07:00
John Reck
1147bf638a Don't use mobile for large uastring
Bug: 4427114

Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
2011-05-17 14:39:45 -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
Eric Fischer
da48094557 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-17 13:25:22 -07:00
Mike Lockwood
50b2763159 Remove some cruft that was left in config.xml by mistake
This should fix build breakage for products with nosdcard set.

Change-Id: I989f8630015baaf22fa3d597fc3c1c1646ce44ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 16:08:22 -04:00
Eric Fischer
876533d98a Import revised translations. DO NOT MERGE
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
2011-05-17 12:19:30 -07:00
Adam Powell
1b4a1628f3 Prevent cases of bogus action bar measurement.
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
2011-05-17 12:14:17 -07:00
Adam Powell
a7f52d4665 Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 2011-05-17 09:41:52 -07:00