OSDN Git Service
Joe Onorato [Wed, 25 May 2011 22:18:56 +0000 (15:18 -0700)]
Merge "move resources" into honeycomb-mr2
Joe Onorato [Wed, 25 May 2011 22:17:41 +0000 (15:17 -0700)]
move resources
Change-Id: I5f89cd0480234dac99cbb187835f389cc6513aae
James Dong [Wed, 25 May 2011 21:51:52 +0000 (14:51 -0700)]
Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
Jeff Brown [Tue, 24 May 2011 22:17:57 +0000 (15:17 -0700)]
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
Change-Id: I20aecca392d2843601e6e0ec4ac913c8ccdbbf89
Jeff Brown [Wed, 20 Apr 2011 04:20:10 +0000 (21:20 -0700)]
Add tap/drag touchpad gesture. (DO NOT MERGE)
The mapper sends a DOWN when the finger is released then starts
a short timer. If the finger is not pressed again before the timer
elapses, then the mapper sends an UP to complete the tap. If the
finger is pressed again then the mapper starts sending MOVEs
as part of a drag.
Double/triple taps work as intended because we also start watching
for a new tap when the finger is pressed again. If a new tap
occurs the old tap is also finished. So each individual finger
short press/release cycle constitutes a distinct tap.
Change-Id: Id0a6ee10dd27e723f6cb04e56b43939abe9e940c
Jeff Brown [Wed, 13 Apr 2011 05:39:53 +0000 (22:39 -0700)]
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
Added a new PointerIcon API (hidden for now) for loading
pointer icons.
Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.
Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements. The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.
Removed the SpotController stub and folded its responsibilities
into PointerController.
Change-Id: Ib647dbd7a57a7f30dd9c6e2c260df51d7bbdd18e
Jeff Brown [Mon, 11 Apr 2011 18:54:25 +0000 (11:54 -0700)]
Add a sprite controller. (DO NOT MERGE)
Refactored PointerController to extract the surface management
code to a new component called a SpriteController so that it can
be used to move finger tracking spots around the screen as well.
The SpriteController is designed to fully decouple the client from
any latency introduced by surface transactions and drawing.
All sprite updates are performed asynchronously on the Looper using
a copy of the sprite state.
Added a stub SpotController implementation for touch pad UX.
It will be implemented in a subsequent patch.
Fixed a little bug in pointer orientation changes when entering
DISPLAY_ORIENTATION_90 the x offset was clobbered.
Change-Id: I6d59d80df9af61e93af50290e7776337d10c9d5a
Jeff Brown [Tue, 24 May 2011 18:23:27 +0000 (11:23 -0700)]
Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
Some drivers report individual finger updates one at a time
instead of all at once. When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data. Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.
This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.
Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.
Change-Id: Ibc6abf8af027d9003011ac75caa12941080caba3
Jeff Brown [Thu, 7 Apr 2011 00:19:48 +0000 (17:19 -0700)]
Allow batching samples onto the pending motion event. (DO NOT MERGE)
This enlarges the window of opportunity for batching to
encompass time spent for the window to become ready (while it is
busy processing the last event).
Change-Id: I8870cc3081d27a4de659fb4e375f888fe966460b
Jeff Brown [Wed, 6 Apr 2011 22:33:01 +0000 (15:33 -0700)]
Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
Alt-TAB should have different semantics from the APP_SWITCH key
or long-press on HOME. Accordingly, remove the fallback action
for Alt-TAB and initiate the task switching behavior directly
in the policy.
Modified RecentApplicationsDialog to be more precise about the
initial modifiers that it considers to be holding the dialog.
The dialog is now dismissed by a second press on the APP_SWITCH
key or by a second long press on HOME.
Change-Id: I07e72dc4e1f3cd8edaf357c1d49e79f60d6d1604
Jeff Brown [Wed, 30 Mar 2011 00:26:44 +0000 (17:26 -0700)]
Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
Change-Id: I0296a09519ba9417c208d197ebd996b586ee3daa
Jeff Brown [Wed, 25 May 2011 21:32:05 +0000 (14:32 -0700)]
Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2
Jeff Brown [Wed, 25 May 2011 21:32:00 +0000 (14:32 -0700)]
Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
Jeff Brown [Wed, 25 May 2011 21:31:54 +0000 (14:31 -0700)]
Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
Jeff Brown [Wed, 25 May 2011 21:31:50 +0000 (14:31 -0700)]
Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
Jeff Brown [Wed, 25 May 2011 21:31:44 +0000 (14:31 -0700)]
Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
Jeff Brown [Wed, 25 May 2011 21:31:38 +0000 (14:31 -0700)]
Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
James Dong [Wed, 25 May 2011 19:17:33 +0000 (12:17 -0700)]
Revert "Use pread() to get the decrypted data for container based DRM file."
This reverts commit
a6f1104b9d829c636b60b9387e379f9667b5df09.
Joe Onorato [Wed, 25 May 2011 18:40:59 +0000 (11:40 -0700)]
Merge "Make adb shell am display-size persistent." into honeycomb-mr2
Joe Onorato [Tue, 24 May 2011 20:48:43 +0000 (13:48 -0700)]
Make adb shell am display-size persistent.
Change-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9
Dianne Hackborn [Wed, 25 May 2011 18:10:15 +0000 (11:10 -0700)]
Merge "Fix issue #
4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2
Amith Yamasani [Wed, 25 May 2011 17:58:24 +0000 (10:58 -0700)]
Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
Dianne Hackborn [Wed, 25 May 2011 17:48:28 +0000 (10:48 -0700)]
Fix issue #
4445007: DPM initializes some values to 1, instead of 0
Also fix not writing the settings file when an admin is removed.
And take care of an old to-do about not removing an admin until
after it has received the broadcast about it being disabled.
Change-Id: I4ebe0ea0461222b65425b2c5438b646b572f18c8
Russell Brenner [Wed, 25 May 2011 16:00:26 +0000 (09:00 -0700)]
Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2
Dianne Hackborn [Wed, 25 May 2011 02:07:55 +0000 (19:07 -0700)]
Merge "More compatibility mode improvements." into honeycomb-mr2
Dianne Hackborn [Wed, 25 May 2011 01:11:57 +0000 (18:11 -0700)]
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
Russell Brenner [Tue, 24 May 2011 20:34:39 +0000 (13:34 -0700)]
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
Amith Yamasani [Tue, 24 May 2011 22:43:14 +0000 (15:43 -0700)]
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
Jeff Brown [Tue, 29 Mar 2011 22:11:34 +0000 (15:11 -0700)]
Support chorded fallback keys. (DO NOT MERGE)
Also be more careful about canceling fallback keys during focus
transitions, when the application handles the key, or when the
policy decides to do something different.
Fixed a crash due to JNI CallObjectMethod returning an undefined
value (not null) when an exception is thrown.
Fixed a crash due to the policy trying to create a Dialog for
recent apps on the dispatcher thread. It should happen on the
policy's Looper instead.
Bug:
4187302
Change-Id: I043f82913830f411b3bb4018d6422467b6ca454f
Jeff Brown [Fri, 25 Mar 2011 18:58:46 +0000 (11:58 -0700)]
Fix focused application handle. (DO NOT MERGE)
Fix a bug where we were always setting the focused application
handle to NULL. This broke ANR processing while starting
applications and caused input events to be dropped while
starting applications.
Bug:
4174573
Change-Id: Ice7ce3a2b65219568a8227fc1383bafb294666b5
Jeff Brown [Sat, 19 Mar 2011 01:14:26 +0000 (18:14 -0700)]
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
When 10 fingers are down, reduces the CPU time spent by the InputReader
thread from ~30% to ~5% on Stingray.
Change-Id: I42ee5c67b8521af715cbab43e763a4af4eb1f914
Kristian Monsen [Tue, 24 May 2011 18:16:39 +0000 (11:16 -0700)]
Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
John Reck [Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)]
Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
Kristian Monsen [Mon, 23 May 2011 13:25:27 +0000 (14:25 +0100)]
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
Jeffrey Tinker [Tue, 24 May 2011 01:10:10 +0000 (18:10 -0700)]
Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2
Mike Lockwood [Tue, 24 May 2011 01:01:50 +0000 (18:01 -0700)]
Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
Mike Lockwood [Tue, 24 May 2011 00:57:43 +0000 (20:57 -0400)]
GPS: Change NTP polling interval from 4 to 24 hours
4 hours is excessive, and we want to save bandwidth on the NTP servers
Change-Id: Ic5ac4f4a8e62167206f3f620ea51635a2ea771d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Brown [Thu, 17 Mar 2011 08:34:19 +0000 (01:34 -0700)]
Refactor how timeouts are calculated. (DO NOT MERGE)
Added a timeout mechanism to EventHub and InputReader so that
InputMappers can request timeouts to perform delayed processing of
input when needed.
Change-Id: I89c1171c9326c6e413042e3ee13aa9f7f1fc0454
Jeff Brown [Tue, 15 Mar 2011 02:39:54 +0000 (19:39 -0700)]
Improve VelocityTracker numerical stability. (DO NOT MERGE)
Replaced VelocityTracker with a faster and more accurate
native implementation. This avoids the duplicate maintenance
overhead of having two implementations.
The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation. This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.
The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.
The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces. The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.
Bug:
4086785
Change-Id: I95054102397c4b6a9076dc6a0fc841b4beec7920
Jeff Brown [Thu, 10 Mar 2011 01:39:48 +0000 (17:39 -0800)]
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
1. Single finger tap performs a click.
2. Single finger movement moves the pointer (hovers).
3. Button press plus movement performs click or drag.
While dragging, the pointer follows the finger that is moving
fastest. This is important if there are additional fingers
down on the touch pad for the purpose of applying force
to an integrated button underneath.
4. Two fingers near each other moving in the same direction
are coalesced as a swipe gesture under the pointer.
5. Two or more fingers moving in arbitrary directions are
transformed into touches in the vicinity of the pointer.
This makes scale/zoom and rotate gestures possible.
Added a native VelocityTracker implementation to enable intelligent
switching of the active pointer during drags.
Change-Id: I7b7ddacc724fb1306e1590dbaebb740d3130d7cd
Amith Yamasani [Tue, 24 May 2011 00:05:47 +0000 (17:05 -0700)]
Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
Mike Lockwood [Tue, 24 May 2011 00:04:01 +0000 (17:04 -0700)]
Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
Mike Lockwood [Mon, 23 May 2011 17:44:04 +0000 (13:44 -0400)]
MountService: Add StorageVolume as extra in storage related broadcasts.
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Fri, 20 May 2011 21:59:06 +0000 (14:59 -0700)]
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
John Reck [Mon, 23 May 2011 23:50:29 +0000 (16:50 -0700)]
Update the Desktop UA to Chrome
Bug:
4347787
Change-Id: I5117c7dbd4e73c39ed417113f12b517de5411e81
John Reck [Mon, 23 May 2011 23:47:32 +0000 (16:47 -0700)]
Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
John Reck [Thu, 28 Apr 2011 17:27:40 +0000 (10:27 -0700)]
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
Dianne Hackborn [Mon, 23 May 2011 22:18:20 +0000 (15:18 -0700)]
Merge "Add "television" mode." into honeycomb-mr2
Dianne Hackborn [Fri, 20 May 2011 23:11:04 +0000 (16:11 -0700)]
Add "television" mode.
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
Jeffrey Tinker [Sun, 22 May 2011 01:19:17 +0000 (18:19 -0700)]
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
Fix for b/
4198446 HC - Support for Widevine Adaptive VOD
Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
Shimeng (Simon) Wang [Mon, 23 May 2011 16:33:31 +0000 (09:33 -0700)]
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
James Dong [Thu, 19 May 2011 22:56:50 +0000 (15:56 -0700)]
Add some logging to track down where ANR happens during MediaPlayer._release().
o add a log message in AwesomePlayer::reset before acquiring the lock
Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug:
4409547
Jim Miller [Fri, 20 May 2011 23:49:08 +0000 (16:49 -0700)]
Merge "Fix
4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
Jim Miller [Fri, 20 May 2011 22:46:24 +0000 (15:46 -0700)]
Fix
4462474: Use new sw600dp resource target for LockScreen & SystemUI
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
Adam Powell [Fri, 20 May 2011 22:59:19 +0000 (15:59 -0700)]
Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
Adam Powell [Fri, 20 May 2011 22:56:25 +0000 (15:56 -0700)]
Change measurement of effective screen height for PopupWindow now that
DisplayMetrics reports it without system decorations.
Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
Dianne Hackborn [Fri, 20 May 2011 21:28:43 +0000 (14:28 -0700)]
Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
Jim Miller [Fri, 20 May 2011 20:13:19 +0000 (13:13 -0700)]
Merge "Fix
4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
Jim Miller [Fri, 20 May 2011 20:12:57 +0000 (13:12 -0700)]
Merge "Fix
4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
Adam Powell [Fri, 20 May 2011 19:59:43 +0000 (12:59 -0700)]
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
Dianne Hackborn [Fri, 20 May 2011 17:37:34 +0000 (10:37 -0700)]
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
Gloria Wang [Fri, 20 May 2011 17:15:21 +0000 (10:15 -0700)]
Use pread() to get the decrypted data for container based DRM file.
For bug
4392094.
Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
satok [Fri, 20 May 2011 09:19:53 +0000 (18:19 +0900)]
Do not merge. Backport two fixes for InputMethethodFramework
Bug:
3420384
backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942
Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
Adam Powell [Fri, 20 May 2011 01:46:47 +0000 (18:46 -0700)]
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
Dianne Hackborn [Fri, 20 May 2011 01:13:32 +0000 (18:13 -0700)]
Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
Jim Miller [Fri, 20 May 2011 00:11:08 +0000 (17:11 -0700)]
Fix
4462474: Fixes crash on 7" tablet due to using wrong resource
Change-Id: Id182bc6e9e69a308329412a91929a65af1329beb
Jim Miller [Fri, 20 May 2011 00:05:30 +0000 (17:05 -0700)]
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
Adam Powell [Thu, 19 May 2011 22:48:38 +0000 (15:48 -0700)]
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 22:02:50 +0000 (15:02 -0700)]
DO NOT MERGE Action bar config changes
Handle action bar padding on configuration changes when the app
handles these changes itself.
Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
Irfan Sheriff [Thu, 19 May 2011 21:54:25 +0000 (14:54 -0700)]
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
Chet Haase [Thu, 19 May 2011 20:57:03 +0000 (13:57 -0700)]
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
Chet Haase [Tue, 22 Mar 2011 18:35:22 +0000 (11:35 -0700)]
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
Joe Fernandez [Thu, 19 May 2011 17:53:04 +0000 (10:53 -0700)]
am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:49:45 +0000 (10:49 -0700)]
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
Mike Lockwood [Thu, 19 May 2011 15:52:40 +0000 (11:52 -0400)]
USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adam Powell [Thu, 19 May 2011 02:13:22 +0000 (19:13 -0700)]
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 02:10:46 +0000 (19:10 -0700)]
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
Xavier Ducrohet [Thu, 19 May 2011 00:40:08 +0000 (17:40 -0700)]
am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:36:16 +0000 (17:36 -0700)]
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
James Dong [Wed, 18 May 2011 23:06:14 +0000 (16:06 -0700)]
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
Irfan Sheriff [Tue, 10 May 2011 23:26:06 +0000 (16:26 -0700)]
Move softap config handling to WifiConfigStore
Move softap config to flat file and read/write on a seperate handler thread
Bug:
4391796
Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
Dianne Hackborn [Wed, 18 May 2011 22:09:58 +0000 (15:09 -0700)]
Merge "Fix fake display size when rotated." into honeycomb-mr2
Dianne Hackborn [Wed, 18 May 2011 22:07:48 +0000 (15:07 -0700)]
Fix fake display size when rotated.
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
Gloria Wang [Wed, 18 May 2011 16:17:50 +0000 (09:17 -0700)]
Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 03:24:39 +0000 (20:24 -0700)]
Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 03:20:47 +0000 (20:20 -0700)]
Fix bug
4416126 - orientation change bug with action bar overflow menu
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
Dianne Hackborn [Wed, 18 May 2011 01:38:37 +0000 (18:38 -0700)]
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 01:30:08 +0000 (18:30 -0700)]
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
Dianne Hackborn [Wed, 18 May 2011 00:44:51 +0000 (17:44 -0700)]
Improve compat mode scaling implementation.
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range. Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially. Instead, we just apply the inverse scale at the few
points we need to do something the app sees.
Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
Adam Powell [Tue, 17 May 2011 03:32:16 +0000 (20:32 -0700)]
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
Katie McCormick [Wed, 18 May 2011 00:38:04 +0000 (17:38 -0700)]
am
566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
* commit '
566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Katie McCormick [Tue, 29 Mar 2011 00:08:08 +0000 (17:08 -0700)]
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
Mike Lockwood [Tue, 17 May 2011 23:42:48 +0000 (16:42 -0700)]
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
Joe Fernandez [Thu, 12 May 2011 17:00:25 +0000 (10:00 -0700)]
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
John Reck [Tue, 17 May 2011 21:38:44 +0000 (14:38 -0700)]
Don't use mobile for large uastring
Bug:
4427114
Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
Mike Lockwood [Tue, 17 May 2011 21:19:37 +0000 (17:19 -0400)]
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>
Eric Fischer [Tue, 17 May 2011 20:25:22 +0000 (13:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Mike Lockwood [Tue, 17 May 2011 20:08:22 +0000 (16:08 -0400)]
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>
Eric Fischer [Tue, 17 May 2011 19:19:30 +0000 (12:19 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
Adam Powell [Tue, 17 May 2011 19:16:29 +0000 (12:16 -0700)]
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2