59400 Commits

Author SHA1 Message Date
Eric Fischer
03e9d8ae07 Import revised translations.
Change-Id: Id046f8008aef32a1b94b4fa5b57e2beb2f9f2e80
2011-10-07 16:09:10 -07:00
Andreas Huber
41c95f3642 Merge "Specifying -1 for both low and highwater marks would not actually do the right thing" 2011-10-07 10:08:48 -07:00
Andreas Huber
b987d875c6 Specifying -1 for both low and highwater marks would not actually do the right thing
before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.

Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
2011-10-07 10:00:38 -07:00
Iliyan Malchev
851a14eb94 Merge "Add initialize method to CameraHardwareInterface" 2011-10-07 09:57:26 -07:00
Steve Block
d8b505d50f Merge "Add WebViewClient.onProceededAfterSslError()" 2011-10-07 09:53:43 -07:00
Tyler Luu
7b6da3c7a2 Add initialize method to CameraHardwareInterface
Add intialize() method to CameraHardwareInterface so we can
return a proper error value to CameraService if open of camera
hardware module fails.

b/5405235

Change-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-07 09:24:05 -07:00
Andreas Huber
59797e6bec Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher" 2011-10-07 07:59:35 -07:00
Steve Block
fe33a75cc8 Add WebViewClient.onProceededAfterSslError()
This is used to notify the host application that an SSL error occurred while
loading a resource, but the WebView but chose to proceed anyway based on a
decision retained from a previous response to onReceivedSslError().

Bug: 5403366
Change-Id: I51a25b93d7824b7eb7b6d5a961cba948e37c85db
2011-10-07 15:14:23 +01:00
The Android Open Source Project
1370987733 Reconcile with ics-factoryrom-release
Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46
2011-10-07 05:35:36 -07:00
Chih-Chung Chang
17f254105b Merge "Allow shutter/recording sound to be adjusted unless it's forced." 2011-10-07 03:20:26 -07:00
Wu-cheng Li
3c02c12c73 Merge "Allow Camera.setDisplayOrientation to be called when preview is active." 2011-10-07 03:08:23 -07:00
Wu-cheng Li
d303362ac2 Allow Camera.setDisplayOrientation to be called when preview is active.
bug:5422679

Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
2011-10-07 18:01:09 +08:00
Scott Main
1d6f70c8de docs: Add api overview for ICS
Change-Id: Ia280d94e06762e0f2b524cbd262568c50e48a601
2011-10-07 00:47:07 -07:00
Dirk Dougherty
b89ebaa60e Doc change: revise API diffs.
Change-Id: I28d1aeb6e785a22b610dc0984210dd921ce42ffa
2011-10-06 23:28:02 -07:00
Scott Main
0eefb56afa Revert "Doc change: add diffs for API level 14." due to api change
This reverts commit d94931ab251da2f2bed00d4c2d0aa087920e3de2.
2011-10-06 22:58:33 -07:00
Chih-Chung Chang
9143aaafee Allow shutter/recording sound to be adjusted unless it's forced.
Change-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70
2011-10-07 13:39:18 +08:00
The Android Automerger
1233316955 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 20:52:50 -07:00
James Dong
f3c0056816 Merge "Fix an issue where we should allow negative values but did not" 2011-10-06 20:38:29 -07:00
Christopher Tate
2e12977ad6 am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore
* commit 'a0c39e28e56d642168ad18dccb86f5787b4e1592':
  DO NOT MERGE: fix wallpaper restore
2011-10-06 20:00:25 -07:00
Scott Main
5e3cdc7655 Merge "docs: deprecate thingy" 2011-10-06 18:41:48 -07:00
Scott Main
4cc5333539 docs: deprecate thingy
Change-Id: I579824680f3b5110d56981becaaf81f917989e7e
2011-10-06 18:32:43 -07:00
Nicolas Roard
98a5fcd895 Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations." 2011-10-06 18:29:20 -07:00
Ying Wang
45f966324c Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf" 2011-10-06 18:25:22 -07:00
Anirudh Dewani
74450d37cf Merge "Docs changes for WiFiDirect sample" 2011-10-06 17:57:55 -07:00
Svetoslav Ganov
31743d8cbb Merge "Accessibility test automation API not working." 2011-10-06 17:28:51 -07:00
Christopher Tate
a0c39e28e5 DO NOT MERGE: fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed.  However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.

This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.

Will not merge cleanly downstream; the parallel (small) change will
be made explicitly there.

Bug 5416839

Change-Id: I50b5d57fafd176529ac7a90cac8116bbc9f696fd
2011-10-06 17:24:54 -07:00
Philip Milne
3b88d87ef6 Merge "Move Activity1 and Activity2 to API Demos area in development/samples." 2011-10-06 17:21:08 -07:00
Nicolas Roard
dee7b1ba96 Trigger a full screen repaint when touching layers, as webkitDraw()
may not generate the correct invalidations.

counterpart java CL: https://android-git.corp.google.com/g/#/c/140427/

bug:5425608 bug:5218173
Change-Id: I4a958a6fac4054a1040cb077cdfa2aff076e3fad
2011-10-06 17:12:40 -07:00
Justin Ho
2eaa0d73fa Merge "Reference download asset through intermediate." 2011-10-06 16:28:57 -07:00
Jeff Brown
f0a9181d09 Merge "Clean up CursorWindow code. Bug: 5332296" 2011-10-06 16:28:15 -07:00
Philip Milne
e974f6384b Move Activity1 and Activity2 to API Demos area in development/samples.
Change-Id: Ib6521caca69b0a0d96c66d9df754d2af17cb6908
2011-10-06 16:11:35 -07:00
Ying Wang
8e359817da Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf
Bug: 5420351

Make the following symlinks:
/system/fonts/DroidSans.ttf -> Roboto-Regular.ttf
/system/fonts/DroidSans-Bold.ttf -> Roboto-Bold.ttf

Change-Id: If9a74ef4ac2386cdb46d125fed8ce5771e872310
2011-10-06 16:00:58 -07:00
Justin Ho
4b5bd847a2 am 65162b1e: Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
* commit '65162b1ee430cb8050109327a7fd958fa72d64ac':
  Adding 3 additional notification sounds Bug: 5416299
2011-10-06 15:57:38 -07:00
Justin Ho
65162b1ee4 Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom 2011-10-06 15:51:43 -07:00
Chia-chi Yeh
b74931559b Merge "VPN: temporarily disable the default proxy when VPN is active." 2011-10-06 15:29:50 -07:00
Chia-chi Yeh
893783ed87 Merge "ConnectivityService: detach the logic of global proxy." 2011-10-06 15:29:43 -07:00
Andreas Huber
594f0ba996 Allow a system property "media.stagefright.cache-params" to override cache/prefetcher
default parameters. To override specify a property

adb shell setprop media.stagefright.cache-params "4096/20480/15" to
set the low water threshold to 4096 KB, the high water threshold to 20 MB
and the keepalive interval to 15 secs.

if high and/or lowwater mark are negative, the default values are used for
the respective value.

if keep-alive interval is 0, keep-alives are disabled.

Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
2011-10-06 15:27:24 -07:00
Justin Ho
fe993cf132 Adding 3 additional notification sounds
Bug: 5416299

Change-Id: I69c6ddd1c4202f640ce14a2a7e4a233e1d93e53d
2011-10-06 15:23:23 -07:00
Dianne Hackborn
85b9edf2da Merge "Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately" 2011-10-06 15:15:32 -07:00
Svetoslav Ganov
7853c579fa Merge "Fixing errors in position information of scrollable views reported for accessibility." 2011-10-06 15:13:06 -07:00
Dianne Hackborn
9a230e01a1 Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately
This cleans up how ui flags are managed between the client and window manager.
It still reports the global UI mode state to the callback, but we now only clear
certain flags when the system goes out of a state (currently this just means the
hide nav bar mode), and don't corrupt other flags in the application when the
global state changes.

Also introduces a sequence number between the app and window manager, to avoid
using bad old data coming from the app during these transitions.

Change-Id: I40bbd12d9b7b69fc0ff1c7dc0cb58a933d4dfb23
2011-10-06 14:57:37 -07:00
Svetoslav Ganov
d9ee72fddb Fixing errors in position information of scrollable views reported for accessibility.
1. ScrollView/HorizontalScroll view were reporting only the scroll X and Y but
   failed to convey the max scroll along X and Y so the position can be determined.

2. WebView was not reporting correctly its scroll position for accessibility.

3. Some descendants of AdapterView were reporting incorrect position information.

4. Updated the accessibility docs with some details about the scroll information.

5. Cleaned up duplicated code.

bug:5412132
bug:5412265

Change-Id: I165e73ecde027dad811425b9f395a3f758c923ba
2011-10-06 14:42:58 -07:00
Jeff Brown
3bc6bbc92c Clean up CursorWindow code.
Bug: 5332296

The code is functionally equivalent, but a little more efficient
and much easier to maintain.

Change-Id: I90670a13799df05831843a5137ab234929281b7c
2011-10-06 14:40:13 -07:00
Chet Haase
e9121bc10a Merge "Fix issue #5367164: memory leak in LayoutTransition" 2011-10-06 14:35:53 -07:00
Svetoslav Ganov
b6eca6e669 Accessibility test automation API not working.
1. Due to a previous change that disabled accessibility if not enabled
   and installed serivces are present the automation APIs stopped working
   since they use fake automation service that is not installed.

2. Added clean up of death recipients when binders die.

bug:5374662
bug:5239044

Change-Id: I1f3c8cd1d1c79753a4a64e2b8b2963025abb2939
2011-10-06 14:16:03 -07:00
Jake Hamby
bece9cb794 Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone." 2011-10-06 14:05:58 -07:00
Robert Ly
3541521185 Merge "docs: tools and adt notes" 2011-10-06 13:54:42 -07:00
Christopher Tate
2461fef4c0 Merge "Disable db_sample logging" 2011-10-06 13:09:58 -07:00
Christopher Tate
0ded8c8a56 Merge "Prevent concurrent backup operations" 2011-10-06 13:09:52 -07:00
Robert Ly
6c81c30772 docs: tools and adt notes
Change-Id: I432148d53127443662e180942b95f21c6f199476
2011-10-06 12:57:26 -07:00