Oscar Montemayor
8063589c6c
Removed extra parameter tag in JavaDocs
...
Change-Id: I0bc6f201d12a95a7c96b3fac90688d113a554d22
2010-08-04 18:34:12 -07:00
Oscar Montemayor
f7c851749d
Merge "Fix for SDK breakage with hidden field."
2010-08-04 18:28:43 -07:00
Oscar Montemayor
ac54fb9da1
Fix for SDK breakage with hidden field.
...
Change-Id: If66c31b8823a886e9a0853b63ef9bbdf25dc9a71
2010-08-04 18:24:14 -07:00
Scott Main
c9de8c34a3
am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
...
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp
* commit '97c2d840a10813164d82571775a3566637d6c5de':
fix some doc errors in the resources;
2010-08-04 18:05:26 -07:00
Scott Main
97c2d840a1
am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
...
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread
* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
fix some doc errors in the resources;
2010-08-04 18:02:25 -07:00
Adam Powell
8e552630e7
Let action modes overlay window content
...
Change-Id: Ic0512c3e6338e1de15facec0a6650f9da9808a24
2010-08-04 17:42:44 -07:00
Scott Main
8dd87ad944
fix some doc errors in the resources;
...
add link to resource docs for ColorStateList class
Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
2010-08-04 17:33:33 -07:00
Oscar Montemayor
2cd1dbe50d
Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists."
2010-08-04 17:15:25 -07:00
Manuel Roman
96183e16e4
Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown"
2010-08-04 16:42:55 -07:00
Oscar Montemayor
c4c9df3d71
Merge "Device Policy Manager changes to enable Global Proxy."
2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a
Merge "Avoid hostname lookup in NetworkProperties"
2010-08-04 16:07:13 -07:00
Oscar Montemayor
b8f66019ad
Fix for bug 2890320 Browser crashes, after adding bookmark.
...
Fixed Proxy class locking and dealing with empty exclusion lists.
Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
2010-08-04 16:07:02 -07:00
Oscar Montemayor
69238c6a37
Device Policy Manager changes to enable Global Proxy.
...
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
2010-08-04 16:01:56 -07:00
Irfan Sheriff
1cf56ab9c6
Avoid hostname lookup in NetworkProperties
...
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
2010-08-04 15:15:49 -07:00
Chet Haase
bb688d6f37
Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)"
2010-08-04 13:58:52 -07:00
Patrick Dubroy
40771bc433
Fix NPE in onAnimationEnd when using Sequencer.after(long)
2010-08-04 13:49:39 -07:00
Vasu Nori
0c9e14aa4a
add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown
...
Change-Id: I3dd69b6907d68b7c1184139f22297ab92337f043
2010-08-04 13:34:34 -07:00
Jeff Hamilton
31d95db2cc
Improve the documentation for the browser provider, and a few small cleanups.
...
Change-Id: If6eb918ce4cdb09f74bd7eaaedf265d7981365ee
2010-08-04 15:26:25 -05:00
Mike Lockwood
c3cc7011c2
Merge changes I085cb3cf,Ied1cddc6
...
* changes:
MTP: Add support for syncing MTP playlists
MTP: Fix some thread safety issues in MTP server start/stop sequence.
2010-08-04 13:02:06 -07:00
Vasu Nori
a7dd5eab33
requery() return value should be checked
...
if not checked and if the cursor continues to be used, it will result in
bug:2529736
Change-Id: I920f665643561374c2211acded6cc31fa8931909
2010-08-04 12:54:48 -07:00
Brett Chabot
f71925c84f
Merge "resolved conflicts for merge of 10928c37 to master"
2010-08-04 12:04:54 -07:00
Brett Chabot
f22e876393
resolved conflicts for merge of 10928c37 to master
...
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
2010-08-04 12:03:46 -07:00
Chet Haase
df030d2c16
View x/y properties now feed into matrix translation
...
Change-Id: I35d8953ab6c7a511cdf90f3f94a4a1b5ef549fc3
2010-08-04 12:01:51 -07:00
Jaikumar Ganesh
c4ed734bd8
am 737998f5: Merge "Add Blocked Device property." into gingerbread
...
Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp
* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
Add Blocked Device property.
2010-08-04 11:36:03 -07:00
Jaikumar Ganesh
737998f595
Merge "Add Blocked Device property." into gingerbread
2010-08-04 11:28:55 -07:00
Jaikumar Ganesh
6eb300e650
Add Blocked Device property.
...
Change-Id: I76b3c361af95ac9d5fb43178965763f873c0fbf9
2010-08-04 11:26:38 -07:00
Chris Tate
5bac1cc0b8
am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
...
Merge commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4'
* commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4':
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
2010-08-04 11:12:32 -07:00
Konstantin Lopyrev
bf0d12c2e2
am 77c444dd: am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
...
Merge commit '77c444dd2bdc9bb2d54fc58420d263a83018190c'
* commit '77c444dd2bdc9bb2d54fc58420d263a83018190c':
Improving profiling of views.
2010-08-04 11:12:19 -07:00
Adam Powell
4be0d52125
Added android.widget.PopupMenu
...
Change-Id: Id507cf93ebd0484f141a0a44266b883c01aa10db
2010-08-04 11:06:22 -07:00
Romain Guy
529b60a3b1
Add android:hardwareAccelerated to Activity.
...
Hardware acceleration can now be enabled/disabled locally on each activity
declared in the manifest. It can also be enabled/disabled directly on a
window through the WindowManager.LayoutParams.
Change-Id: I91dd0b26c4e7eb8cd7288e523ed6b7bda6d0990b
2010-08-04 10:55:46 -07:00
Eric Fischer
c1b387aed8
am d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit 'd89443d86603dbc9e02e1db32b9071780b4702bc' into gingerbread-plus-aosp
* commit 'd89443d86603dbc9e02e1db32b9071780b4702bc':
Import revised translations. DO NOT MERGE
2010-08-04 10:43:27 -07:00
Eric Fischer
d89443d866
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-04 10:40:36 -07:00
Eric Fischer
33dc1d7cd0
Import revised translations. DO NOT MERGE
...
Change-Id: Ibc3e9f1f83159835c2e6c3bcdaa8ff6a7e7fa384
2010-08-04 10:37:25 -07:00
Kenny Root
c5183acae5
am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
...
Merge commit 'c68bcc320522abf856211e9aa00bba71ccaddacb' into gingerbread-plus-aosp
* commit 'c68bcc320522abf856211e9aa00bba71ccaddacb':
Only allow one movePackage operation in-flight
2010-08-04 09:18:27 -07:00
Kenny Root
deb112674e
Only allow one movePackage operation in-flight
...
When a movePackage operation is requested, don't allow multiple requests
to pile up for one package. Once a move is completed, an observer will
receive the message and be allowed to call movePackage again.
Change-Id: Ie3842b6d96446febc0037bf9b8f1ca250735edc2
2010-08-04 08:44:31 -07:00
Daniel Sandler
d0a2f86f35
Fix crash when startForeground posts a broken Notification.
...
The NotificationManager tries to crash the calling app, but
in the case of a service calling startForeground, the caller
is the ActivityManager, so system_server goes down.
NotificationManagerService#enqueueNotificationInternal is a
new internal-only method that accepts a UID/PID to use when
punishing bogus notifications (such as the one in
http://b/2869787 ).
Change-Id: I84a9854bae630bc90288cebb94f174809d5dac8c
2010-08-04 10:52:51 -04:00
Kristian Monsen
bc3008bd73
Update Browser useragent string to reflect WebKit merge at r64264
...
Change-Id: Ic29d7b918b179d99c16150bd0aec2f09d5707408
2010-08-04 10:50:26 +01:00
Gilles Debunne
8a3f95dd4b
Merge "Generated hdpi drawable size reduced"
2010-08-03 18:39:31 -07:00
Brett Chabot
412ae2b4df
Merge "Fix Framework core tests import of android-common."
2010-08-03 17:59:08 -07:00
Brett Chabot
672079a75a
Fix Framework core tests import of android-common.
...
android.database.CursorWindowTest#testWriteCursorToWindow (and possibly other
tests) were was failing because it couldn't locate a android-common class.
Fix is to include android-common as a static library, as opposed to a runtime
library.
Change-Id: Iae50cf409e76a85ee79e4af71e9b903d18630078
2010-08-03 17:28:19 -07:00
Dianne Hackborn
b3cf10ffa8
Add facility to switch to new fragments from preferences.
...
Change-Id: I009315b59cf81b4962e9c5a4490f0f82743ed64a
2010-08-03 17:07:45 -07:00
Gilles Debunne
ed3cfb5e1b
Generated hdpi drawable size reduced
...
Change-Id: Id17bb27500ba8729c33613bbf457f1b3193ced38
2010-08-03 16:13:54 -07:00
Brett Chabot
10928c37f1
am c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread
...
Merge commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp
* commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4':
Frameworks core tests size cleanup.
2010-08-03 16:04:03 -07:00
Brett Chabot
c458b2cab3
Merge "Frameworks core tests size cleanup." into gingerbread
2010-08-03 16:02:09 -07:00
Steve Howard
c7ad9fa080
am 80782220: am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
...
Merge commit '80782220708fdc8575502ac68c884ddab5c78ac2'
* commit '80782220708fdc8575502ac68c884ddab5c78ac2':
New secure setting for mobile download size limit.
2010-08-03 15:52:23 -07:00
Adam Powell
1f9c7afc5a
Add support for action buttons without an icon.
...
Change-Id: I026bb7463e7a73419dbaf79950d579ba05d04ea8
2010-08-03 15:01:31 -07:00
Mike Lockwood
9a2046fb5c
MTP: Add support for syncing MTP playlists
...
MTP playlists now correspond to playlists in the media provider
(like those created by the Music app).
Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-03 15:36:22 -04:00
Chris Tate
9f6b16a29b
am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
...
Merge commit '5d46ce24cc46dc57d31f809302af916999114ced' into gingerbread-plus-aosp
* commit '5d46ce24cc46dc57d31f809302af916999114ced':
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
2010-08-03 12:25:29 -07:00
Chris Tate
5d46ce24cc
Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
2010-08-03 12:22:50 -07:00
Chet Haase
d4b5020174
Merge "remove offending .pn file to fix build"
2010-08-03 11:58:53 -07:00