Alex Sakhartchouk
54f09aba9d
am 169b9c1e: am bfa62339: Merge "Removing things that shouldn\'t be public" into honeycomb
...
* commit '169b9c1e31f04d4b45e164920d1cd414425be2e7':
Removing things that shouldn't be public
2011-01-14 14:23:59 -08:00
Alex Sakhartchouk
169b9c1e31
am bfa62339: Merge "Removing things that shouldn\'t be public" into honeycomb
...
* commit 'bfa62339ef97c6be6ac904532a115712d669025b':
Removing things that shouldn't be public
2011-01-14 14:21:29 -08:00
Alex Sakhartchouk
bfa62339ef
Merge "Removing things that shouldn't be public" into honeycomb
2011-01-14 14:19:45 -08:00
Patrick Dubroy
ec84c3a189
Allow old view hierarchy to be GC'ed more quickly during rotation.
2011-01-14 14:13:31 -08:00
Jaikumar Ganesh
a3363ef2cd
Do Not Merge: Expose insecure rfcomm Bluetooth API.
...
This complements the secure rfcomm API.
The link key is unauthenticated and is subject to MITM attacks.
The link key may be encrypted depending on the type of Bluetooth device.
This helps apps which don't need the extra security or
have their own security layer built on top of the rfcomm link.
Bug: 3352266
Change-Id: I633fd0372e5e23288d6fec950dd1abc2896031f1
2011-01-14 13:24:03 -08:00
Kenny Root
27b775a62d
am d9fa11b4: am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
...
* commit 'd9fa11b446da5dbc92776518c20bab1f04e55537':
Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:46:34 -08:00
Kenny Root
d9fa11b446
am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
...
* commit '312206b98749bbe395416634e6e82bd242b1d5f2':
Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:44:39 -08:00
Kenny Root
312206b987
Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
2011-01-14 12:42:12 -08:00
Dianne Hackborn
0142e990ff
am f21ae269: am d922ae01: Add Holo theme for IMEs.
...
* commit 'f21ae26935349f45c55afa5c8e45e1f6aa880915':
Add Holo theme for IMEs.
2011-01-14 12:35:06 -08:00
Dianne Hackborn
f21ae26935
am d922ae01: Add Holo theme for IMEs.
...
* commit 'd922ae01ca99a2b6d39a9393f86776a1d10ebd14':
Add Holo theme for IMEs.
2011-01-14 12:31:59 -08:00
Dianne Hackborn
d922ae01ca
Add Holo theme for IMEs.
...
Also clean up theme selection code to get rid of duplication.
Change-Id: Idf7b21db70ee83fce24756ead877169bd08b77a9
2011-01-14 12:28:23 -08:00
Kenny Root
5d40fe9c68
Add the {get,set}PackageObbPaths calls to API
...
Add getPackageObbPaths() and setPackageObbPaths() to the public API.
Bug: 3214719
Change-Id: I8627b5f674a795d5780eb5c08911419110670a41
2011-01-14 12:18:48 -08:00
Alex Sakhartchouk
0473ff1ef6
Removing things that shouldn't be public
...
Change-Id: I23ea748f7f4ba27307807d7e1d56e49b7c10a827
2011-01-14 12:16:02 -08:00
Steve Block
6c29a586f3
am 39bc608b: am 1916e7f3: Adds a new WebViewFragment class
...
* commit '39bc608bb1d88895cb73ea8144f0240fe1cee26e':
Adds a new WebViewFragment class
2011-01-14 04:38:27 -08:00
Steve Block
39bc608bb1
am 1916e7f3: Adds a new WebViewFragment class
...
* commit '1916e7f3a341f9b25571ca4bde8ea1d8a22d815a':
Adds a new WebViewFragment class
2011-01-14 04:36:46 -08:00
Steve Block
1916e7f3a3
Adds a new WebViewFragment class
...
Cherry pick from master change 85641.
Bug: 3262357
Change-Id: Ife095f7db820bf0a2add682b47586854a4ea9499
2011-01-14 11:44:35 +00:00
Jeff Hamilton
86fbc0144e
am d7b3dde6: Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'd7b3dde6870f00c461f92798534d639669632184':
Add dispatching overrides for foreground apps.
2011-01-13 23:00:00 -08:00
Jeff Hamilton
93ec68e6a9
resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp
...
Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f
2011-01-14 00:38:31 -06:00
Alex Sakhartchouk
b961887f17
am 037a3b57: am 49dc58bf: Merge "Docs plus removing some junk per API review." into honeycomb
...
* commit '037a3b575a78aa5b01e1fcc8701e612c783375a2':
Docs plus removing some junk per API review.
2011-01-13 16:31:02 -08:00
Alex Sakhartchouk
037a3b575a
am 49dc58bf: Merge "Docs plus removing some junk per API review." into honeycomb
...
* commit '49dc58bf1cb6ed971899cd8a9d43174723b14dcf':
Docs plus removing some junk per API review.
2011-01-13 16:29:14 -08:00
Alex Sakhartchouk
49dc58bf1c
Merge "Docs plus removing some junk per API review." into honeycomb
2011-01-13 16:27:23 -08:00
Adam Powell
23872ce73b
am 2aadcd78: am 379a51d9: Merge "Fix bug 3242262 - Add queryHint attribute for SearchView" into honeycomb
...
* commit '2aadcd78f4af97895a60dd50c3d819ca8eb3c3c7':
Fix bug 3242262 - Add queryHint attribute for SearchView
2011-01-13 14:57:18 -08:00
Adam Powell
2aadcd78f4
am 379a51d9: Merge "Fix bug 3242262 - Add queryHint attribute for SearchView" into honeycomb
...
* commit '379a51d96f1dc9db2dcc3288d536594c32f4b514':
Fix bug 3242262 - Add queryHint attribute for SearchView
2011-01-13 14:54:32 -08:00
Alex Sakhartchouk
f5c876e82d
Docs plus removing some junk per API review.
...
Change-Id: I45f995b656754550be68c78e467071d6e59b348f
2011-01-13 14:53:43 -08:00
Adam Powell
c0171d5e8e
Fix bug 3242262 - Add queryHint attribute for SearchView
...
Change-Id: I211b65139622c2a2cba03bd1323e2543b09bb111
2011-01-13 14:46:15 -08:00
Jeff Hamilton
06bb3aef0d
am 52d3203e: Add dispatching overrides for foreground apps.
...
* commit '52d3203ef69d4babbc4dd030a15c08c0b8d1d226':
Add dispatching overrides for foreground apps.
2011-01-13 12:46:16 -08:00
Jeff Hamilton
52d3203ef6
Add dispatching overrides for foreground apps.
...
Apps can register to override the default dispatching
but only when they're in the foreground.
Change-Id: I8e9a9254d3f79f097fb3c8c677d806043574ba4d
2011-01-13 14:24:07 -06:00
Wei-Ta Chen
62cd5c9788
am 61d9ffbf: Merge "Do not merge." into gingerbread
...
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
2011-01-13 12:06:38 -08:00
Wei-Ta Chen
61d9ffbfd8
Merge "Do not merge." into gingerbread
2011-01-13 12:02:32 -08:00
Jamie Gennis
88d0738ef3
am c75d901c: am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
...
* commit 'c75d901cc4b50818f4bc601979da0be4204b277a':
Add getTransformMatrix to the SurfaceTexture API.
2011-01-13 11:33:25 -08:00
Jamie Gennis
c75d901cc4
am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
...
* commit '9aba2324ac8d7216732b42346bfcaf0be71eb22e':
Add getTransformMatrix to the SurfaceTexture API.
2011-01-13 11:31:03 -08:00
Jamie Gennis
9aba2324ac
Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
2011-01-13 11:29:14 -08:00
Andy Stadler
328526c975
am 199ae7dc: am 7b0f8f08: API changes to support encryption in DPM
...
* commit '199ae7dce11badac71c27b1d973e24387dd5f924':
API changes to support encryption in DPM
2011-01-12 21:18:48 -08:00
Andy Stadler
199ae7dce1
am 7b0f8f08: API changes to support encryption in DPM
...
* commit '7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
API changes to support encryption in DPM
2011-01-12 21:17:03 -08:00
Andy Stadler
7b0f8f08ac
API changes to support encryption in DPM
...
* New uses-policies value
* Definitions for storage domain and encryption status
* API to get and set encryption status
* Intent to launch encryption changes
* Both new calls bottom out in the DPM service and are suitable for
a device that does not support encryption.
NOTE: Nobody should use ACTION_START_ENCRYPTION yet. It needs a receiver
to be built in Settings (different CL).
Change-Id: I2ae193bedbec59f6ba46c0ec7de12ecf321e5803
2011-01-12 21:11:32 -08:00
Chet Haase
900bc7e6d8
am dd14ec2e: am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
...
* commit 'dd14ec2e85204f93b7f80c5afd2361c68b3dc4f0':
Supress layout requests while a LayoutTransition is running.
2011-01-12 18:38:15 -08:00
Chet Haase
dd14ec2e85
am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
...
* commit 'ef9932c2505eaf5a4256c6c398aa640bee3b47ea':
Supress layout requests while a LayoutTransition is running.
2011-01-12 18:35:14 -08:00
Chet Haase
9c0874408c
Supress layout requests while a LayoutTransition is running.
...
LayoutTransition works by animating layout-related properties
(left, right, top, and bottom). This works great when that animation
is the only thing affecting the layout of the UI. But if there are other things
happening in the application that cause layout to run on that
container or in its parent hierarchy, this can cause the layout properties
on its children to get mis-set during the middle of the transition.
This results in artifacts like animating objects jumping to locations where
they would be were there no animation running.
The fix is to supress layout requests on that container (and its children)
until the transition is complete (then issue a layout request on the container
to make sure that the container has the correct layout data)
Change-Id: I15bf0423a11409f854076f86099233db7fe4edc0
2011-01-12 18:14:40 -08:00
Elliott Hughes
ef04ebdb85
update-api build fix.
...
Change-Id: If2524976f9212f61d8704422d4d14869379e3b80
2011-01-12 17:36:33 -08:00
Elliott Hughes
50853aff78
am d91ce5d4: am f7bb4044: Merge "Fix build." into honeycomb
...
* commit 'd91ce5d4b14d3f948b1d32cb17eb666e5d493ba3':
Fix build.
2011-01-12 17:18:49 -08:00
Elliott Hughes
d91ce5d4b1
am f7bb4044: Merge "Fix build." into honeycomb
...
* commit 'f7bb4044e3e11845fd0980ad2393236add5b32ac':
Fix build.
2011-01-12 17:16:17 -08:00
Elliott Hughes
f63e21d9ba
Fix build.
...
False-positive API change. (Removal of throws clauses for unchecked exceptions.)
Change-Id: I2c1fed74a5dc852ec1f3df72240bcfbdb6c77344
2011-01-12 17:13:40 -08:00
James Dong
9efe47374b
Squash commits of the following patches, cherry-picked from other branch - do not merge.
...
o Prepare for publishing MediaMetadataRetriever as public API
step one:
o replaced captureFrame with getFrameAtTime
o removed getMode
o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
as part of the preparation for publishing MediaMetadataRetriever as public Java API
o Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method
o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java
o Publish MediaMetadataRetriever.java as public API
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc
o part of a multi-project change.
bug - 3309041
Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
2011-01-12 17:12:46 -08:00
Carl Shapiro
21e382d043
am b0b43c5f: am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
...
* commit 'b0b43c5f5681aa521bb1c80d0eb763654c9c512f':
Deprecate the allocation limit interfaces.
2011-01-12 17:06:59 -08:00
Carl Shapiro
b0b43c5f56
am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
...
* commit '0123afbb228c2849f481b5219ce82c070562b04a':
Deprecate the allocation limit interfaces.
2011-01-12 17:04:38 -08:00
Carl Shapiro
1107383e02
Deprecate the allocation limit interfaces.
...
Allocation limits relied on conditionally compiled code in the virtual
machine that was disabled in released versions of Android. As such,
these setter methods were glorified no-ops. Now that the feature has
been removed from the allocator this interface is thoroughly obsolete.
Change-Id: Id7f9de37ecfece4b909e35f110e118e131457133
2011-01-12 16:56:48 -08:00
Brad Fitzpatrick
2f71565aac
am ef5864f1: am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
...
* commit 'ef5864f1bb1418307c40fc8ed4cae7545d8a44dd':
Unhide Content{Resolver,Provider}.call()
2011-01-12 15:07:34 -08:00
Stephen Hines
190ab4a501
am 564d3602: am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb
...
* commit '564d36027726b6e245fb1447abbf49cfbc414f5c':
Unhide more of the RS APIs.
2011-01-12 15:07:26 -08:00
Kenny Root
470750793b
am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
...
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
2011-01-12 15:06:51 -08:00
Kenny Root
e8c04db71e
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
2011-01-12 15:03:43 -08:00