Amith Yamasani
658dc0d4b0
am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
...
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp
* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
Security fix in accessibility - don't read out password. # 2371557
2010-01-19 11:53:59 -08:00
Amith Yamasani
b35b8c1334
Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair
2010-01-19 11:50:39 -08:00
San Mehat
f078d058ab
Merge "framework: Introduce INetworkManagementService for communicating with netd"
2010-01-19 11:21:44 -08:00
San Mehat
873f214594
framework: Introduce INetworkManagementService for communicating with netd
...
This is the framework-exposed interface for the (future) management of
all Android network management functions. Initial support is for providing
tethering.
Updated: Integrate feedback from review; clean up naming
Updated: Switch from add/remove/list to get/set for DNS forwarders
- allows prioritization / ordering of DNS servers
Updated: Refactor NAT api
Updated: Refactor NAT api (last time sorry)
Signed-off-by: San Mehat <san@google.com >
2010-01-19 10:47:52 -08:00
Bjorn Bringert
cf3b73569b
Fix WEB_SEARCH handler whitelist
...
Change-Id: I9450ac1554ed062cc3f833b0986157e54165e8f1
2010-01-19 18:45:14 +00:00
Bjorn Bringert
97d1195832
Merge "Make SearchManager.getGlobalSearchActivity() public but hidden"
2010-01-19 00:58:39 -08:00
Adam Powell
3e22d199a0
am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair
...
Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee'
* commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee':
TransformGestureDetector is now ScaleGestureDetector - scope reduced.
2010-01-19 00:02:00 -08:00
Grace Kloba
76c29e633f
am f167c4bf: DO NOT MERGE
...
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp
* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
DO NOT MERGE
2010-01-18 23:43:37 -08:00
Grace Kloba
b869c59446
am 17b14bd3: DO NOT MERGE
...
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp
* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
DO NOT MERGE
2010-01-18 23:43:32 -08:00
Grace Kloba
55d791e74e
am 5a0bf1f0: DO NOT MERGE
...
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp
* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
DO NOT MERGE
2010-01-18 23:43:27 -08:00
Grace Kloba
8d4baa7893
am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
...
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp
* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
If ZoomButttonsController detects more than one pointer,
2010-01-18 23:43:20 -08:00
Grace Kloba
3648f949ef
am f080a5ad: Merge "DO NOT MERGE" into eclair
...
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp
* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
DO NOT MERGE
2010-01-18 23:43:14 -08:00
Jim Miller
84928fa93c
am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
...
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp
* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-18 23:43:01 -08:00
Grace Kloba
f167c4bfca
DO NOT MERGE
...
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
2010-01-18 15:30:59 -08:00
Grace Kloba
17b14bd36a
DO NOT MERGE
...
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.
This should fix the weird state Bart got in with
m.wikipedia.org.
2010-01-18 15:29:46 -08:00
Grace Kloba
5a0bf1f03e
DO NOT MERGE
...
Remove testing (enable plugin) code.
No reflow when zoom in, auto reflow when zoom out.
Fix http://b/issue?id=2375955
2010-01-18 15:29:46 -08:00
Grace Kloba
d79d1c7299
Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
2010-01-18 15:21:38 -08:00
Grace Kloba
f080a5adf6
Merge "DO NOT MERGE" into eclair
2010-01-18 15:21:31 -08:00
Grace Kloba
d4d1d6eca0
If ZoomButttonsController detects more than one pointer,
...
give up the control. This should enable the View behind
it, like WebView, will always get the multi-pointer
events even when ZoomButtonsController is up.
2010-01-18 10:43:59 -08:00
San Mehat
2b7ff1c471
Merge "MountService: Add new 'unmountSecureContainer' API call"
2010-01-18 07:14:02 -08:00
NoraBora
8ca2f47e0d
ViewAnimator.setAnimateFirstView() doesn't work for out-animation.
2010-01-18 23:54:06 +09:00
San Mehat
9dba709d44
MountService: Add new 'unmountSecureContainer' API call
...
Signed-off-by: San Mehat <san@google.com >
2010-01-18 06:49:19 -08:00
Daisuke Miyakawa
308596eda1
Merge "Make vCard importer support lower case params."
2010-01-17 15:32:02 -08:00
Daisuke Miyakawa
50c6668a27
Make vCard importer support lower case params.
...
Bug: 2339066
2010-01-18 08:30:39 +09:00
Dianne Hackborn
d68478467e
First pass at new device policy and administration APIs.
...
This adds new DevicAdmin, DevicePolicyManager, and DeviceAdminInfo classes.
See the java docs for each on documentation on them. Basically: a DeviceAdmin
is what you derive from to administer a device; DevicePolicyManager is what you
use to apply and check your policy requirements and perform other administration
tasks.
2010-01-17 15:10:24 -08:00
Jim Miller
813d2d8678
Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
2010-01-15 17:20:29 -08:00
Grace Kloba
19c9df3c1d
DO NOT MERGE
...
Bring back +/- when panning. Dismiss it when pinching.
2010-01-15 16:35:40 -08:00
Jim Miller
2cd1e6eda9
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
...
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent.
Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.
Instead, we'll handle this separately in lockscreen.
2010-01-15 16:20:36 -08:00
Tom O'Neill
093a870005
Find out whether we should mention behavior specific to our own provider
...
Change-Id: Ia5d90969d72e99c8fb7f12f1c536f5e1856c59d2
2010-01-15 16:20:34 -08:00
Yang Li
ec837187df
Added a method for spatial sampling.
2010-01-15 16:14:25 -08:00
Jean-Baptiste Queru
e99f41f193
@hide the individual members instead of the whole class
...
Bug: 2245521
Change-Id: I8dad1e8d4e1b55dbb9d33b6990c1bd420e914be5
2010-01-15 15:02:53 -08:00
Romain Guy
fe86b04531
Merge "Added clone to these three classes and added more comments."
2010-01-15 14:40:48 -08:00
Yang Li
6fc1f15134
Added clone to these three classes and added more comments.
2010-01-15 14:35:27 -08:00
Romain Guy
dded6447b5
Merge "Added non-uniform scaling for spatial sampling."
2010-01-15 14:31:34 -08:00
Yang Li
55732c52ee
Added non-uniform scaling for spatial sampling.
2010-01-15 12:15:40 -08:00
Andrei Popescu
f5dba888c6
Detect if the current network is wifi or not and update webkit.
...
This info is passed to youtube.com via navigator.networkType
Fixes Bug: 2368650
2010-01-15 20:04:08 +00:00
Jean-Baptiste Queru
843e89757a
Remove the BaseColumns inheritance
...
This is done so that it doesn't bleed into a public API
Bug: 2245521
Change-Id: I2e5f728553f074f0dc2e8a3dfdf90b1c1f189bad
2010-01-15 11:44:35 -08:00
Ficus Kirkpatrick
130a8b71bb
Add Dialog.setOnShowListener() to the public API.
2010-01-15 11:35:06 -08:00
Fred Quintana
3084a6f801
rename testHasFeatures to hasFeatures
2010-01-15 11:05:44 -08:00
Vasu Nori
013b9c249d
Merge "Change Log.wtf() call to Log.w()"
2010-01-15 10:51:25 -08:00
Vasu Nori
bee5b9d7cb
Change Log.wtf() call to Log.w()
...
messages from Log.wtf() sound pretty bad and engineers seem to think
something terrible has gone wrong.
2010-01-15 10:49:06 -08:00
Nicolas Catania
b8a2aafdef
New method to return the last dialed number
...
Bug:2227429
2010-01-15 10:41:56 -08:00
Nicolas Catania
c5dfa70410
Revert "New method to return the last dialed number"
...
This reverts commit ac835c94b8 .
2010-01-15 09:52:54 -08:00
Niko Catania
633feacf17
Merge "New method to return the last dialed number Bug:2227429"
2010-01-15 09:18:05 -08:00
Tom O'Neill
7d92d5af18
Revert a couple of deprecations to fix broken build
...
Will re-deprecate in a subsequent CL
Change-Id: Ibc246e2e26a68880f3fba3aff3407404f5a57ce3
2010-01-15 08:42:31 -08:00
Nicolas Catania
ac835c94b8
New method to return the last dialed number
...
Bug:2227429
2010-01-15 08:19:45 -08:00
Tom O'Neill
0f26ec1aa1
Merge "Improve ContractsContract.RawContacts documentation"
2010-01-15 08:15:20 -08:00
Grace Kloba
88196464e9
am 4d69ac66: Merge "DO NOT MERGE" into eclair
...
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp
* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
DO NOT MERGE
2010-01-14 19:32:45 -08:00
Grace Kloba
c8cab72521
am d1019a99: Merge "DO NOT MERGE" into eclair
...
Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp
* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
DO NOT MERGE
2010-01-14 19:32:39 -08:00
Grace Kloba
4d69ac6695
Merge "DO NOT MERGE" into eclair
2010-01-14 19:29:09 -08:00