Grace Kloba
f96a91abb6
am 5b745762: am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
...
Merge commit '5b74576218055f1c9d31d9559255e8cf504cd662'
* commit '5b74576218055f1c9d31d9559255e8cf504cd662':
ScaleGestureDetector needs to query the displaymetrics
2010-01-25 18:13:12 -08:00
Grace Kloba
8ad96ae820
am f8c7d06f: am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
...
Merge commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5'
* commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5':
Fix the sloppy detection in the ScaleGestureDetector.
2010-01-25 18:11:02 -08:00
Yang Li
a54bec599a
Added comments for GestureUtilities.
2010-01-25 17:59:15 -08:00
Eric Laurent
473bd77675
Merge "Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active."
2010-01-25 17:16:05 -08:00
Fred Quintana
307da1a46b
enhance the sync manager backoff logic and add support for retry-after
...
moved SyncQueue and SyncOperation into their own top-level classes
to ease maintainability and testing6
removed some dead code
2010-01-25 16:41:58 -08:00
Yang Li
c7f930f5a9
Made GestureUtilities's several methods public; Changed GestureStroke's smoothening threshold.
2010-01-25 15:15:55 -08:00
Eric Laurent
23f25cda0c
Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.
...
Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream
type is playing.
Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
2010-01-25 14:00:10 -08:00
Owen Lin
d6cc0343c9
Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions
...
in preference manager.
Change-Id: I910ccd3794771da9ec1eb4809b3d1a2a6633f4b1
2010-01-25 13:45:52 -08:00
Mike LeBeau
882652bf0d
Merge "Add RecognizerIntent.ACTION_VOICE_SEARCH_SETTINGS, which we'll trigger from system settings. For now it'll just be triggered from within the voice search app if you choose the settings menu item."
2010-01-25 12:06:48 -08:00
Mike LeBeau
9c58935c1b
Add RecognizerIntent.ACTION_VOICE_SEARCH_SETTINGS, which we'll trigger
...
from system settings. For now it'll just be triggered from within the
voice search app if you choose the settings menu item.
Need to unhide this before we can be fully unbundled for voice search.
2010-01-25 15:04:57 -05:00
Chris Tate
da77d0a6e7
Merge "Make sure to downgrade to app permissions when invoking callbacks"
2010-01-25 11:35:08 -08:00
David 'Digit' Turner
1edab2b551
Make PackageManager unpack gdbserver binaries at installation time.
...
Native-debuggable packages contain a lib/<abi>/gdbserver executable.
This patch ensures that the package manager will copy it to the
proper location (/data/data/<appname>/lib) at installation time.
Note that such packages are marked with a new ApplicationInfo flag
named FLAG_NATIVE_DEBUGGABLE, to be used later by the Activity
Manager.
2010-01-25 11:27:08 -08:00
Ken Shirriff
1790c13ed6
Change calendar authority to com.android.calendar.
...
bug 2388178
2010-01-25 10:53:43 -08:00
Ken Shirriff
8fdd45e1aa
Merge "Add SyncState class for calendar provider."
2010-01-25 10:50:47 -08:00
Grace Kloba
96949efc54
We were blocking updating display tree during drag.
...
Now we only lower the WebViewCore thread priority.
So rename the functions to reflect the new meaning.
2010-01-25 09:53:01 -08:00
Grace Kloba
733687d47a
Merge "Manual merge pinch zoom from Eclair to Master."
2010-01-25 09:31:20 -08:00
Mike Reed
b22446901c
am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
...
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp
* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
disable high-quality filtering during scrolling, until I can cached the scaled images.
2010-01-25 06:24:35 -08:00
Mike Reed
f904be1659
Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
2010-01-25 06:19:17 -08:00
Mike Reed
729d8369b5
disable high-quality filtering during scrolling, until I can cached the scaled images.
2010-01-25 08:30:35 -05:00
Grace Kloba
3a0def280f
Manual merge pinch zoom from Eclair to Master.
...
Too many conflicts which prevent me to use git cherry-pick.
Merge based on the source diff.
WebSettings.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commitdiff;h=5f01d7e268167c5cfb3366ce08e20a66d9b6fa6f
WebView.java (excl. drag tracker changes)
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebView.java;h=ab1841e140d72c22885512722cf1b75925bb8747;hp=ed1a98ae2d9321a483f6f8fa97b29b78121e94a7;hb=eclair;hpb=db08d5cd441424e4f9621aae7c2414934f781400
WebViewCore.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebViewCore.java;h=8ac915c556e3461f3c572c3a68d191ca1fecfee7;hp=a5a48527a389609e40da14ecad8c12dd8377cfaf;hb=eclair;hpb=dafc19a1406bdd554fb4629d79c8aa4d75aca363
2010-01-23 21:11:54 -08:00
Romain Guy
ff65c8c559
Make vertical LinearLayouts behave like horizontal LLs do.
...
A bug fix in the horizontal handling of "useLargestChild" was not fixed in the vertical code.
2010-01-23 10:21:12 -08:00
San Mehat
45f6104082
MountService: Add support for renaming secure containers
...
Signed-off-by: San Mehat <san@google.com>
2010-01-23 08:12:43 -08:00
Bai Tao
4256586663
Modify the interface of HanziToPinyin class to make it generic and add test class
2010-01-23 12:57:21 +08:00
Jim Miller
33ca1f3218
am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
...
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp
* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
2010-01-22 20:23:37 -08:00
Jim Miller
af1b980ef1
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
...
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100 .
2010-01-22 19:09:50 -08:00
Kenny Root
d1ab01682b
Add extra resources field for ApplicationInfo
...
Allow ApplicationInfo to track multiple files it wants to use as
resources by adding a string array to its public definition.
Change-Id: Ieffc4b1755270520b59c4e5a3c084e86aef02346
2010-01-22 17:05:50 -08:00
Kenny Root
92da0b4453
Merge "Unhide resource-related API calls in Context"
2010-01-22 16:57:57 -08:00
Kenny Root
3214839482
Unhide resource-related API calls in Context
...
Context hides methods related to the underlying functioning of
resources which are readily available from the ApplicationInfo
object. This change allows getting access to information
without having to make PackageManager calls for it.
Change-Id: Icf6a9da652dad8175bd11b5cd81a924181070373
2010-01-22 16:56:26 -08:00
Christopher Tate
1902492420
Make sure to downgrade to app permissions when invoking callbacks
...
The [private] binder interface is called from the system process, so make sure
we downgrade to the app's proper identity & permissions before allowing
execution to continue into app code.
2010-01-22 16:39:53 -08:00
San Mehat
4d02d001ef
NetworkManagementService: Introduce INetworkManagementEventObserver
...
Introduce a callback event observer which can be registered on the
INetworkManagementService instance to receive events from the service.
Signed-off-by: San Mehat <san@google.com>
2010-01-22 16:10:29 -08:00
Kenny Root
55434a7999
Merge "Multiple asset adding in one shot for AssetManager"
2010-01-22 15:54:11 -08:00
Romain Guy
7baf952c73
Merge "Make dialogs look better when their content is small."
2010-01-22 15:33:07 -08:00
San Mehat
63454ebcc9
Merge "NetworkManagementService: Introduce API methods for configuring interfaces"
2010-01-22 15:20:18 -08:00
San Mehat
bf81cacc96
Merge "android.net: Introduce @hidden parcelable InterfaceConfiguration class"
2010-01-22 15:20:10 -08:00
Romain Guy
5e5e6ccc37
Make dialogs look better when their content is small.
2010-01-22 15:11:12 -08:00
Nick Pelly
21bf222446
Fix leak of DBus match rule.
...
We were registering a match for 'AudioSink', but unregistering 'audio.sink'.
This does not immediately cause an error, but stress testing of BT off/on found
that the leak causes a DBus Limits Error after ~300 iterations. It then becomes
impossible to turn BT on again until a reboot.
2010-01-22 14:12:12 -08:00
Grace Kloba
4f01c92750
am 5ff24d5d: DO NOT MERGE
...
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp
* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
DO NOT MERGE
2010-01-22 13:17:52 -08:00
Grace Kloba
5ff24d5da4
DO NOT MERGE
...
This reverts commit 52cb3cbd6fe06e3706be1a7c2939f027106aaaf7.
2010-01-22 12:45:54 -08:00
San Mehat
ed4fc8acc5
NetworkManagementService: Introduce API methods for configuring interfaces
...
Signed-off-by: San Mehat <san@google.com>
2010-01-22 12:28:36 -08:00
Ken Shirriff
ead4f9cef5
Add SyncState class for calendar provider.
...
This parallels the SyncState on ContactsContract.
2010-01-22 12:26:50 -08:00
San Mehat
353ced79b4
android.net: Introduce @hidden parcelable InterfaceConfiguration class
...
This class is used to get/set interface configuration via the
new NetworkManagementService API
Signed-off-by: San Mehat <san@google.com>
2010-01-22 12:22:54 -08:00
Adam Powell
a948f4787b
am 97b10853: am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
...
Merge commit '97b108532f04f72af035e372be7b827f77888650'
* commit '97b108532f04f72af035e372be7b827f77888650':
Edge of screen slop detection for ScaleGestureDetector.
2010-01-22 12:00:24 -08:00
Andy McFadden
a93e459149
Merge "Move VM feature strings (used by DDMS) into VM."
2010-01-22 11:32:52 -08:00
Romain Guy
2e61d7ca64
Merge "Bring back buttons in dialogs. Bug #2390537 "
2010-01-22 11:01:42 -08:00
Romain Guy
cf635ae7c6
Bring back buttons in dialogs.
...
Bug #2390537
2010-01-22 11:00:29 -08:00
Amith Yamasani
bd6f964da1
am 658dc0d4: am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
...
Merge commit '658dc0d4b03015eb4a692968b82b664e24aa605a'
* commit '658dc0d4b03015eb4a692968b82b664e24aa605a':
Security fix in accessibility - don't read out password. # 2371557
2010-01-22 09:44:16 -08:00
Andy McFadden
e577232406
Move VM feature strings (used by DDMS) into VM.
...
Until now, we used a place-holder in frameworks/base.
Disable a test that shouldn't have been on.
2010-01-22 09:36:03 -08:00
Ken Shirriff
a69a23b2a5
Use AUTHORITY constant for calendar.
...
This will allow the calendar authority to be changed later.
bug 2388178
2010-01-21 21:46:31 -08:00
Grace Kloba
77dc179baa
As embedded and full screen shares the same view,
...
we have to replace the AbsoluteLayout with
ViewGroup.Layout before setting it to the dialog
as dialog's FrameLayout doesn't accept AbsoluteLayout.
This should fix the crash when changing orientation.
2010-01-21 19:13:34 -08:00
Romain Guy
177b580f56
Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138 "
2010-01-21 19:11:20 -08:00