OSDN Git Service
Cary Clark [Fri, 5 Nov 2010 18:20:32 +0000 (14:20 -0400)]
Don't draw the selection pointer on long press.
bug:
3169375
Change-Id: I76cedf0951213c1ee869ccbaa97938f0c6385942
Amith Yamasani [Fri, 5 Nov 2010 18:26:27 +0000 (18:26 +0000)]
Merge "Adjust default screen timeout."
Amith Yamasani [Fri, 5 Nov 2010 18:22:21 +0000 (11:22 -0700)]
Adjust default screen timeout.
Bug:
3165933
James Dong [Fri, 5 Nov 2010 18:18:30 +0000 (18:18 +0000)]
Merge "Use meta data in the media recording framework"
Vasu Nori [Fri, 5 Nov 2010 18:12:04 +0000 (18:12 +0000)]
Merge "address couple of review comments"
Vasu Nori [Fri, 5 Nov 2010 18:02:52 +0000 (11:02 -0700)]
address couple of review comments
by reviewers on previous CLs
Change-Id: Ifc4529b367651f68fbb4117e449c70bfd9fae462
Gloria Wang [Fri, 5 Nov 2010 17:45:26 +0000 (17:45 +0000)]
Merge "Add support for WV DRM"
Daniel Sandler [Fri, 5 Nov 2010 17:41:35 +0000 (17:41 +0000)]
Merge "Rotation lock bugfix."
Gloria Wang [Mon, 1 Nov 2010 22:53:16 +0000 (15:53 -0700)]
Add support for WV DRM
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
Gilles Debunne [Fri, 5 Nov 2010 16:51:18 +0000 (16:51 +0000)]
Merge "Created missing assets by up/down scaling the one in other dpi"
Gilles Debunne [Fri, 5 Nov 2010 16:51:01 +0000 (16:51 +0000)]
Merge "Created missing assets by up/down scaling the one in other dpi"
Patrick Scott [Fri, 5 Nov 2010 14:42:06 +0000 (10:42 -0400)]
Fix the build and scrollable layers gesture.
Change-Id: I06f7c379f187df982ac82c9a52cc643358987085
Daniel Sandler [Fri, 5 Nov 2010 14:24:27 +0000 (10:24 -0400)]
Rotation lock bugfix.
We were using a stale version of the accelerometer rotation
setting when figuring out what the current rotation lock
state is.
Change-Id: I7780617c875a8f6c9697e829642f86f9f664df89
Ben Murdoch [Fri, 29 Oct 2010 10:44:17 +0000 (11:44 +0100)]
Display the AutoFill preview string in the drop down box.
Native code now provides us with a preview string as well as
an autofill query id. Display the preview string in the
drop down box.
Requires a change in external/webkit:
https://android-git.corp.google.com/g/#change,77132
Change-Id: Ia5e26b98546cda1090142f1720f6a7836be6595c
Ben Murdoch [Fri, 5 Nov 2010 10:12:21 +0000 (10:12 +0000)]
Merge "Work around race condition in CallBackProxy."
satok [Thu, 4 Nov 2010 12:17:48 +0000 (21:17 +0900)]
Change API for getting InputMethodSubtype's mode from resource id to String
Change-Id: I00aa99f8ab9901d40806a6bb336ab718eb857e8b
Vasu Nori [Fri, 5 Nov 2010 01:51:03 +0000 (18:51 -0700)]
Merge "add API to return Uri for the given downloaded file id & get mimetype"
Shimeng (Simon) Wang [Fri, 5 Nov 2010 01:22:28 +0000 (18:22 -0700)]
Merge "Use minPrefWidth instead of viewsize.x."
Jason Sams [Fri, 5 Nov 2010 01:21:45 +0000 (18:21 -0700)]
Merge "More RS exceptions cleanup. Remove some dead code."
Adam Powell [Fri, 5 Nov 2010 00:54:45 +0000 (17:54 -0700)]
Fix bug
3167099 and bug
3009490 - GridView choice modes and
getCheckedItemCount after orientation change
Remove the restriction on choice modes for GridView - this is handled
by common code in AbsListView. Persist the checked item count in saved
instance state.
Change-Id: Iebb964bb3c43779c082a458ea3f2754ab694b69d
Gilles Debunne [Fri, 5 Nov 2010 01:11:14 +0000 (18:11 -0700)]
Merge "Assets remove from bare drawable-xlarge directory."
Irfan Sheriff [Fri, 5 Nov 2010 01:08:36 +0000 (18:08 -0700)]
Merge "Initiate wake up scan only in a disconnected state"
Shimeng (Simon) Wang [Fri, 5 Nov 2010 00:58:17 +0000 (17:58 -0700)]
Use minPrefWidth instead of viewsize.x.
This is to fix a bug I introduced in one of my last CLs, which is tested
under hw accerlation, and the problem was not there.
issue:
3161799
Change-Id: Ic7e7c186d1830c3cbd9359af0e283afbbdfbbac1
Vasu Nori [Wed, 3 Nov 2010 04:55:30 +0000 (21:55 -0700)]
add API to return Uri for the given downloaded file id & get mimetype
Change-Id: I1f5dd734e394db0056579a3a0c26862fee27981e
Elliott Hughes [Fri, 5 Nov 2010 00:50:15 +0000 (17:50 -0700)]
Merge "Use InetAddress.isNumeric."
James Dong [Tue, 2 Nov 2010 20:20:11 +0000 (13:20 -0700)]
Use meta data in the media recording framework
o This patch allows us to do 720p video recording
Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
Dianne Hackborn [Fri, 5 Nov 2010 00:32:07 +0000 (17:32 -0700)]
Merge "Rough cut at new window animations."
Dianne Hackborn [Fri, 5 Nov 2010 00:25:28 +0000 (17:25 -0700)]
Rough cut at new window animations.
Change-Id: I5c698de205d820b770e2405ea9d3d483b6b8a463
Gilles Debunne [Fri, 5 Nov 2010 00:12:07 +0000 (17:12 -0700)]
Created missing assets by up/down scaling the one in other dpi
Some of these assets may no longer be used. An other CL will remove these later.
Needed to remove warnings in new aapt version.
Change-Id: Iac296247012a05757bd3264ab50212d37ce80adf
Gilles Debunne [Fri, 5 Nov 2010 00:10:10 +0000 (17:10 -0700)]
Merge "wallpaper moved to nodpi"
Robert Greenwalt [Fri, 5 Nov 2010 00:02:44 +0000 (17:02 -0700)]
Merge "Tell each VM to flush their DNS cache."
Brian Carlstrom [Thu, 4 Nov 2010 23:46:05 +0000 (16:46 -0700)]
Merge "Fixing CloseGuard reported issue in WiredAccessoryObserver"
Elliott Hughes [Thu, 4 Nov 2010 23:46:00 +0000 (16:46 -0700)]
Use InetAddress.isNumeric.
This code is trying to detect anything equivalent to localhost, but without
accidentally causing a DNS lookup.
Bug:
3073384
Change-Id: Ib611c8ca46059e00b07fc4b94d4af777217da1fb
Gilles Debunne [Thu, 4 Nov 2010 23:34:54 +0000 (16:34 -0700)]
wallpaper moved to nodpi
Change-Id: I14a7ee8e04e0bf7882ca793b2541c07447b829ea
Chris Tate [Thu, 4 Nov 2010 23:02:52 +0000 (16:02 -0700)]
Implement local-window-only drags
Change-Id: I19a9c4a045c532b99e3af9eb878797aed5cda1bf
Gilles Debunne [Thu, 4 Nov 2010 23:28:25 +0000 (16:28 -0700)]
Assets remove from bare drawable-xlarge directory.
Those were already copied to mdpi, and have been upscaled to hdpi.
Change-Id: Ifd8fe5f96ceb9992ba22086f4c4c3d23d7f18879
Brian Carlstrom [Thu, 4 Nov 2010 23:23:21 +0000 (16:23 -0700)]
Fixing CloseGuard reported issue in WiredAccessoryObserver
This was previously masked by the ArrayIndexOutOfBoundsException so I
missed it on my first pass.
Change-Id: I0bdca9c888c77cb31f21def18809649321aa5427
Andrew Stadler [Thu, 4 Nov 2010 23:19:05 +0000 (16:19 -0700)]
Merge "Avoid NPE when reloading headers in single-pane mode"
Elliott Hughes [Thu, 4 Nov 2010 23:09:04 +0000 (16:09 -0700)]
Merge "Remove NetworkUtils.isIpAddress."
Andrew Stadler [Thu, 4 Nov 2010 22:49:05 +0000 (15:49 -0700)]
Avoid NPE when reloading headers in single-pane mode
Change-Id: I696102b371566872ab1e6dca7281015da534b83f
Gil Dobjanschi [Thu, 4 Nov 2010 22:43:54 +0000 (15:43 -0700)]
Merge "Added audio and video codec parameters to the export method."
Dianne Hackborn [Thu, 4 Nov 2010 22:37:47 +0000 (15:37 -0700)]
Revert "StrictMode: now in more system server threads."
This reverts commit
0721861d6111a8a03eb0d4aad14b7a90fd83cab6.
Gil Dobjanschi [Thu, 4 Nov 2010 22:35:42 +0000 (15:35 -0700)]
Added audio and video codec parameters to the export method.
Change-Id: I1badd08ce7148da540bf91df0e19c3da59287756
Gilles Debunne [Thu, 4 Nov 2010 22:34:53 +0000 (15:34 -0700)]
Created missing assets by up/down scaling the one in other dpi
Some of these assets may no longer be used. An other CL will remove these later.
Needed to remove warnings in new aapt version.
Change-Id: I84048d7fd237e6623b14810deeb7887dbe50ab73
Dianne Hackborn [Thu, 4 Nov 2010 22:08:59 +0000 (15:08 -0700)]
Push the jumpDrawablesToCurrentState() thing off everywhere it should be.
Also add a new interface that items in AbsListView can implement to
adjust the bounds of the selection shown for them. This will allow
contacts to use list view's regular selection facility rather than
implementing something special in their item views.
Change-Id: I29cbdbc7122111ee97e47fe7d6ec55ff07be79cc
Elliott Hughes [Thu, 4 Nov 2010 22:27:33 +0000 (15:27 -0700)]
Remove NetworkUtils.isIpAddress.
Bug:
3073384
Change-Id: I5bd46d1995186c2384c68d0afff3b869f46624c5
Adam Powell [Thu, 4 Nov 2010 22:24:23 +0000 (15:24 -0700)]
Merge "Fix bug
3163150 - move holo extended themes to an overlay file."
Irfan Sheriff [Wed, 3 Nov 2010 23:13:32 +0000 (16:13 -0700)]
Initiate wake up scan only in a disconnected state
When wifi is connected to an access point, we should
not wake up the device to initiate scans.
Change-Id: I1a48387a0cac7b23a8d947d8409cafc63da18d38
Brian Carlstrom [Thu, 4 Nov 2010 22:12:31 +0000 (15:12 -0700)]
Merge "Add android.os.StrictMode.VmPolicy.Builder.detectLeakedClosableObjects API"
Brian Carlstrom [Thu, 4 Nov 2010 22:10:29 +0000 (15:10 -0700)]
Add android.os.StrictMode.VmPolicy.Builder.detectLeakedClosableObjects API
Change-Id: I7b21b65e522d9533b97e286c7685234d06999d28
Dmitry Shmidt [Thu, 4 Nov 2010 21:53:17 +0000 (14:53 -0700)]
Merge "bugreport: Add bcm4329 internal counters dump"
Romain Guy [Thu, 4 Nov 2010 21:40:26 +0000 (14:40 -0700)]
Merge "Lines would not set the scissor before drawing."
Dmitry Shmidt [Thu, 4 Nov 2010 21:39:24 +0000 (14:39 -0700)]
bugreport: Add bcm4329 internal counters dump
Change-Id: I8e74bc1bf9a269e2a429ada1b1141d10cb7d914f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Romain Guy [Thu, 4 Nov 2010 21:36:26 +0000 (14:36 -0700)]
Lines would not set the scissor before drawing.
Lines were not drawing in Calendar because they were getting clipped
by the previous clip rectangle. This change simply updates the scissor
as needed. This change also reduces the number of state changes in GL.
Change-Id: I41ab13dca3a33cfa6d1a44371c48852ab418b04e
Brian Carlstrom [Thu, 4 Nov 2010 21:32:33 +0000 (14:32 -0700)]
Merge "Integrate StrictMode with CloseGuard"
Jason Sams [Thu, 4 Nov 2010 21:32:19 +0000 (14:32 -0700)]
More RS exceptions cleanup.
Remove some dead code.
Change-Id: If97e3fdfe6de7bb28f22e1c5ee748c81cea3db93
Adam Powell [Thu, 4 Nov 2010 21:23:57 +0000 (14:23 -0700)]
Fix bug
3163150 - move holo extended themes to an overlay file.
The file themes_extended is meant to be overridden per-device in an
overlay file. The overlay should include enhancements appropriate for
the device when hardware acceleration is requested by an app.
Change-Id: If2878b973845f1793a00651089bc0dd66952d916
Brian Carlstrom [Thu, 4 Nov 2010 18:24:58 +0000 (11:24 -0700)]
Integrate StrictMode with CloseGuard
In additional to adding the StringMode API for controling CloseGuard,
this checkin fixes several CloseGuard issues found booting a device.
Bug:
3041575
Change-Id: I4dffd184f49438d6d477ed81a1c2a2a5b56cc76b
Jeff Sharkey [Thu, 4 Nov 2010 19:42:18 +0000 (12:42 -0700)]
Respect padding when positioning custom view.
Fixes http://b/
3164071
Change-Id: I74700fecf7e9f4785e8e944b2660724b3d270b0d
Daniel Sandler [Thu, 4 Nov 2010 21:15:56 +0000 (14:15 -0700)]
Merge "Rotation lock."
Chet Haase [Thu, 4 Nov 2010 21:05:57 +0000 (14:05 -0700)]
Merge "Adding JNI methods as a faster reflection mechanism"
Daniel Sandler [Tue, 17 Aug 2010 04:41:00 +0000 (00:41 -0400)]
Rotation lock.
IWindowManager now supports two new methods,
freezeRotation() and thawRotation(), that allow a caller to
temporarily stash the device's current rotation as the
default rotation (when no other constraints are present).
The system bar uses this to implement a user-accessible
rotation lock by calling freezeRotation() and then turning
off accelerometer-based display rotation; unless overridden
by an app, the display will continue to appear in the frozen
rotation until the rotation is unlocked by the user (either
via the rotation lock icon in the system bar or by checking
"rotate screen automatically" in Settings).
Bug:
2949639
Change-Id: Icd21c169d1053719590e72401f229424b254622f
Elliott Hughes [Thu, 4 Nov 2010 20:47:13 +0000 (13:47 -0700)]
Merge "Fix an off-by-one error."
Chet Haase [Thu, 4 Nov 2010 02:41:18 +0000 (19:41 -0700)]
Adding JNI methods as a faster reflection mechanism
This approach is only for the common cases of void-return,
single-argument float/int methods.
Change-Id: Ifb31535a6f717b85417eced93c579be6e461e039
Jason Sams [Thu, 4 Nov 2010 20:33:19 +0000 (13:33 -0700)]
Merge "Fix potental incremental build failure with leftover RS generated files."
Jason Sams [Thu, 4 Nov 2010 20:28:14 +0000 (13:28 -0700)]
Fix potental incremental build failure with
leftover RS generated files.
Change-Id: I4b2ed98372ac9caba61ff6622b26f1bb1b435df0
Dianne Hackborn [Thu, 4 Nov 2010 18:39:12 +0000 (11:39 -0700)]
Add API to find out if there is a vibrator.
Change-Id: If29f6ee19448222433cad9fad325d0095a8e5737
Ben Murdoch [Wed, 3 Nov 2010 19:35:52 +0000 (19:35 +0000)]
Work around race condition in CallBackProxy.
If WebCore requests two (or more) alert/prompt/confirm dialogs
in quick succeession, we have a race that when the dialog is dismissed
the WebView does not have it's focus restored before the next dialog
is requested to be shown and we early out of displaying the dialog (i.e.
we do not show it).
Work around this by no longer verifying that the Activity has focus as
this check seems to be redundant anyway (see
3166409).
Bug:
3151825,
3166409
Change-Id: I7f650b066ee63da92bc9a620b8e190c91b306d3e
Mike Lockwood [Thu, 4 Nov 2010 19:40:26 +0000 (12:40 -0700)]
Merge "MediaStore: Make definitions for Files table public"
Elliott Hughes [Thu, 4 Nov 2010 18:55:47 +0000 (11:55 -0700)]
Fix an off-by-one error.
I/SystemServer( 104): Wired Accessory Observer
E/SystemServer( 104): Failure starting WiredAccessoryObserver
E/SystemServer( 104): java.lang.ArrayIndexOutOfBoundsException: index=3 length=3
E/SystemServer( 104): at com.android.server.WiredAccessoryObserver.<init>(WiredAccessoryObserver.java:79)
E/SystemServer( 104): at com.android.server.ServerThread.run(SystemServer.java:401)
Change-Id: I6d40259d96b8c57c0ff04eab362a66b70e9fcd25
Dianne Hackborn [Thu, 4 Nov 2010 19:21:48 +0000 (12:21 -0700)]
Merge "StrictMode: now in more system server threads."
Romain Guy [Thu, 4 Nov 2010 19:14:37 +0000 (12:14 -0700)]
Merge "Fix possible rendering issue when drawing a path."
Romain Guy [Thu, 4 Nov 2010 19:10:40 +0000 (12:10 -0700)]
Fix possible rendering issue when drawing a path.
Change-Id: I25f2e609589f0dd9294bcf7930de6398c0d7e377
Robert Greenwalt [Tue, 2 Nov 2010 21:08:23 +0000 (14:08 -0700)]
Tell each VM to flush their DNS cache.
bug:
3095357
Change-Id: I93de24e3e5a7d8b94d55f4facfffc863a2b8c202
Kenny Root [Thu, 4 Nov 2010 18:50:51 +0000 (11:50 -0700)]
Merge "Add "nodpi" to DpiTest Android.mk"
Kenny Root [Thu, 4 Nov 2010 18:29:48 +0000 (11:29 -0700)]
Add "nodpi" to DpiTest Android.mk
Part of the drawables for DpiTest is a nodpi directory, but the
LOCAL_AAPT_FLAGS didn't specify it.
Bug:
3165492
Change-Id: I989068d76f922db6048e6db7cc6822ab3234d36e
Jamie Gennis [Thu, 4 Nov 2010 18:18:14 +0000 (11:18 -0700)]
Merge "Fix a MediaBuffer leak in Stagefright."
Leon Scroggins [Thu, 4 Nov 2010 18:11:42 +0000 (11:11 -0700)]
Merge "Use the new web email and password variations."
Xavier Ducrohet [Thu, 4 Nov 2010 18:03:45 +0000 (11:03 -0700)]
Merge "Layoutlib native delegate: FloatMath."
Xavier Ducrohet [Thu, 4 Nov 2010 18:03:39 +0000 (11:03 -0700)]
Merge "Layoutlib native delegate: path effects and xfermode."
Leon Scroggins [Mon, 1 Nov 2010 17:20:24 +0000 (13:20 -0400)]
Use the new web email and password variations.
Bug:
2460543
Bug:
3094312
Bug:
2692655
Bug:
2710595
Use the NEXT flag when there is a following
textfield.
In TextView, treat the new variations like email and password
variations.
Requires a change in LatinIME so that these fields work propely:
https://android-git.corp.google.com/g/#change,77721
Change-Id: Id6517a016db7d50b77570ff77f2635027796da4a
Scott Main [Thu, 4 Nov 2010 17:57:48 +0000 (10:57 -0700)]
am
13259f0b: am
17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
* commit '
13259f0ba08cde334a9b6760b20f14c269893652':
docs: more revisions to the installing docs for GB
Jean-Baptiste Queru [Thu, 4 Nov 2010 17:57:34 +0000 (10:57 -0700)]
am
0d7c66b3: Merge
42c94791 from open-source master
* commit '
0d7c66b3a555356315c17da48969fee28181ceda':
Fix the animation disappeared issue
Gilles Debunne [Mon, 1 Nov 2010 18:29:24 +0000 (11:29 -0700)]
Rationalized the single/multiple line initialization in TextViews.
The TYPE_TEXT_FLAG_MULTI_LINE was set directly, instead of calling
setSingleLine, which has some side effects, like correctly updating
the mSingleLine field.
Generalized the use of setSingleLine everywhere. This may change some
behavior, but is probably fixing more state inconsistencies.
Change-Id: I6b4da2e140a8dc75481cff9e44473daa6b3a83c4
Amith Yamasani [Thu, 4 Nov 2010 17:44:55 +0000 (10:44 -0700)]
Merge "For extra large devices, use a dialog style for LauncherActivity."
James Dong [Thu, 4 Nov 2010 17:32:06 +0000 (10:32 -0700)]
am
c25c28a4: (-s ours) am
c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
* commit '
c25c28a496012f64da57f5beb3b99f7424abb602':
Revert "Support rotation in media recorder"
Scott Main [Thu, 4 Nov 2010 17:29:14 +0000 (10:29 -0700)]
am
974ea38a: am
42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
* commit '
974ea38a7c941eb8d85cea3b9a2ab87ed0b8e592':
docs: some more edits to the sdk install docs
Mathias Agopian [Thu, 4 Nov 2010 17:29:09 +0000 (10:29 -0700)]
am
b20c2e7c: am
477c4fee: Merge "[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit '
b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
[
3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
Hiroshi Lockheimer [Thu, 4 Nov 2010 17:29:05 +0000 (10:29 -0700)]
am
0ce42c9d: (-s ours) am
c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit '
0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897':
Support rotation in media recorder
Mike Lockwood [Thu, 4 Nov 2010 17:16:48 +0000 (13:16 -0400)]
MediaStore: Make definitions for Files table public
This provides a public API for the new MediaProvider support for
arbitrary file types. MediaProvider is no longer limited to supporting
only media (audio, video, image and playlist files).
This also allows querying across multiple media file types and supports
navigating the directory hierarchy of the media storage via database queries.
BUG:
2984284
Change-Id: I6222a6d601a4641cc7e544335e45d05b194532b1
Signed-off-by: Mike Lockwood <lockwood@google.com>
Gilles Debunne [Thu, 4 Nov 2010 17:13:00 +0000 (10:13 -0700)]
Merge "Tapping on paste popup with an empty clipboard does not crash in TextView."
Gilles Debunne [Thu, 4 Nov 2010 16:57:14 +0000 (09:57 -0700)]
am
67e1ae5b: am
698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
* commit '
67e1ae5b96bc3be5f9fc57350dada06194eb7f68':
ldpi assets created from hdpi in core.
Hiroshi Lockheimer [Thu, 4 Nov 2010 16:56:57 +0000 (09:56 -0700)]
am
5f5bcf50: am
e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
* commit '
5f5bcf5039774050eec587dcc31905bd5a370b7b':
Squash ANRs in UsbStorageActivity.
Jason Chen [Thu, 4 Nov 2010 16:29:55 +0000 (09:29 -0700)]
resolved conflicts for merge of
f0452c25 to master
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
Scott Main [Thu, 4 Nov 2010 16:20:40 +0000 (09:20 -0700)]
am
17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
* commit '
17c87d80c65d047c2db353d9826fef3e0d4d3535':
docs: more revisions to the installing docs for GB
Scott Main [Thu, 4 Nov 2010 16:17:54 +0000 (09:17 -0700)]
Merge "docs: more revisions to the installing docs for GB" into gingerbread
Jean-Baptiste Queru [Thu, 4 Nov 2010 14:22:33 +0000 (07:22 -0700)]
Merge
42c94791 from open-source master
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
Scott Main [Thu, 4 Nov 2010 14:20:33 +0000 (07:20 -0700)]
am
d9bb6bc2: am
08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
* commit '
d9bb6bc283b3f7ee75da14c42c8a563214103c05':
docs: provide overview of the web apps docs and revise images in the targeting doc
Kristian Monsen [Mon, 1 Nov 2010 15:49:45 +0000 (15:49 +0000)]
Move more of android file handling in Java
Moving some of the code (finding which kind of file it is and
deleting parts of the url) to Java from C++.
Is needed by the following change in external/webkit:
https://android-git.corp.google.com/g/#change,77383
Change-Id: Ifc6008501eb580a0aaa5e307732b6f49ebd19ac4
satok [Thu, 4 Nov 2010 06:09:46 +0000 (23:09 -0700)]
Merge "Find the most applicable subtype when there is no selected subtype but IME has subtypes"