59569 Commits

Author SHA1 Message Date
Joe Fernandez
99b70f3f5d DO NOT MERGE
cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29

Change-Id: Ia5150288ce6fe57460159dd7555c6786023b1d9e
2011-10-12 14:27:53 -07:00
Andreas Huber
8c7951afa2 Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0 2011-10-12 13:51:05 -07:00
Daniel Sandler
fd8f6f2f75 Merge "Fix obsolete Honeycomb platlogo." into ics-mr0 2011-10-12 13:11:13 -07:00
Jamie Gennis
075e4c3d2e Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0 2011-10-12 13:03:11 -07:00
Fabrice Di Meglio
87228cd7bb Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0 2011-10-12 12:39:55 -07:00
Andreas Huber
33d94067ad Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1
related-to-bug: 5450187
2011-10-12 12:14:23 -07:00
Adam Powell
f2894659e8 Fix bug 5449931 - Wrong theme for icon menus
IconMenuPresenter should always use its own theme for the system
inflater.

Change-Id: Iacadce37d62a60cdf6220d82f1178098ed92d51e
2011-10-12 12:13:45 -07:00
Fabrice Di Meglio
9f51384720 Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned
- this was a regression introduced when dealing with getLayoutAlignment()

Change-Id: I9571a7976789b768c7cb41560d88b35d67ae3895
2011-10-12 11:43:27 -07:00
Scott Main
c291653539 Merge "docs: add Fujitsu USB info bug 5427262" into ics-mr0 2011-10-12 11:19:17 -07:00
Eino-Ville Talvala
0a27359280 Merge "Add video stabilization control to Camera parameters." into ics-mr0 2011-10-12 10:37:57 -07:00
Eino-Ville Talvala
037abb8bb0 Add video stabilization control to Camera parameters.
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.

Convenience accessor methods hidden for now.

Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
2011-10-12 10:34:10 -07:00
Amith Yamasani
421648ed06 Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 2011-10-12 09:59:11 -07:00
Steve Block
c0c394ee05 Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 2011-10-12 09:58:25 -07:00
Amith Yamasani
aee2687e61 Backup owner info as part of settings backup. DO NOT MERGE.
[Cherry pick from master]

Added these settings to the whitelist:
Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED
Settings.Secure.LOCK_SCREEN_OWNER_INFO

Bug: 5342797
Change-Id: I1bd4d04b5651b61919efd8c1b25c04acc5806f4a
2011-10-12 09:46:43 -07:00
Jean-Michel Trivi
49f61439db Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0 2011-10-12 09:40:17 -07:00
Scott Main
5beb7a5a7c docs: add Fujitsu USB info
bug 5427262

Change-Id: Ia3694c8cf94cc1bba140379eb1745daa9f66ec2c
2011-10-12 09:35:18 -07:00
Daniel Sandler
5f839f8ee4 Fix obsolete Honeycomb platlogo.
Bug: 5438131
Change-Id: I848bcc8e4d6cdd28c1ffaa08b7fcceb87242932a
2011-10-12 10:48:05 -04:00
Steve Block
8eb83b96ac Modify BrowserFrame.requestClientCert() to take the host and port as a String
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.

Requires https://android-git.corp.google.com/g/141234
in external/webkit.

Bug: 5442710

Change-Id: I5480471a841c24481ef09d836a8b0c778251b119
2011-10-12 09:51:22 +01:00
Jake Hamby
34877877bb Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0 2011-10-12 01:10:28 -07:00
Adam Powell
35af3639a1 Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 2011-10-11 19:30:08 -07:00
Jake Hamby
929ca5e497 Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
CDMA WDP datagram handling was refactored to use the same method
that handles concatenated SMS messages. WDP datagram sequence numbers
start at 0, but GSM/CDMA concatenated sequence numbers start at 1.
Changed SMSDispatcher.processMessagePart() to count from 0 when
handling WDP datagrams.

Also changed CdmaSMSDispatcher.processCdmaWapPdu() to correctly
decode segment numbers > 127 (signed byte conversion bug)
and to reject PDUs with an out-of-range segment number (invalid
ranges are already rejected for regular concatenated messages).

Bug: 5433331
Change-Id: I25c9567769de8edca789c0d1707d4916a4c46885
2011-10-11 19:15:32 -07:00
Adam Powell
af5280cc71 Fix bug 5173029 - make fast scroller aware of scrolling containers
When a ListView with a FastScroller is located in a scrolling
container, defer the start of the drag operation for a short time or
until a touch slop is crossed. This allows these lists to be placed in
containers like ViewPagers without immediately stealing touch events.

Change-Id: I9b10b6993b24113c5e95c485bf57206747c73a84
2011-10-11 19:06:13 -07:00
Jean-Michel Trivi
09b4d99822 DO NOT MERGE Fix 5389442 RemoteControlClient javadoc
Extend RemoteControlClient class description with an example
 of instance creation showing how the PendingIntent is created
 and how it uses the same ComponentName as the one used
 in AudioManager.registerMediaButtonEventReceiver()

Change-Id: I1af61ddbf5cfb9160ea5b814bed7b881d51b7eff
2011-10-11 18:59:34 -07:00
Svetoslav Ganov
5276373430 Merge "Dragging in touch explore mode should not become exploring." into ics-mr0 2011-10-11 18:39:36 -07:00
Svetoslav Ganov
2e1c66bd53 Dragging in touch explore mode should not become exploring.
In touch exploration two fingers in the same direction drag and if one of them
goes up the other starts to touch explore. This however causes inadvertent touch
exploring to happen on almost every scroll causing confusion. Now two finger
drag and they should both go up to allow exploring. This way the inadvertent
exploring is gone and user experience is much better.

bug:5440411

Change-Id: Id8aaece92e5dea1fc740400d2adc9dd63a1674e4
2011-10-11 18:22:16 -07:00
Jake Hamby
c5b28bd00d Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0 2011-10-11 17:23:04 -07:00
Adam Powell
acf7d982ae Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0 2011-10-11 16:14:31 -07:00
Adam Powell
aa4f5c95c3 Fix bug 5434403 - invalidation problem with seek bars at edges
Explicitly invalidate the seek bar thumb area when we change drawable
states for touch down. This prevents the thumb from only being
half-invalidated at the edges since it extends into the view's padding
region.

Change-Id: Icc4e608aca044b2d05f3a9378eced839c03947e6
2011-10-11 15:38:30 -07:00
sj0110.kim@samsung.com(sophia kim)
df0c2a94b5 Change DCS of MO SMS to the correct value for UCS-2 encoding.
An incorrect value for TP-Data-Coding-Scheme was used for MO SMS with
UCS-2 encoding. According to 3GPP TS 23.038 section 4, when bit 4 is
set to 0, bits 0 and 1 are reserved and have no message class meaning.
We were setting those bits to 1, when they should be set to 0.

This change is required to pass a GCF test case.

Change-Id: If47361f95b0e14accc6220854783dcff3d82abf6
2011-10-11 15:29:20 -07:00
Michael Kolb
f0f7a9139b Merge "Support spellcheck attribute in WebTextView" into ics-mr0 2011-10-11 15:25:22 -07:00
Michael Jurka
78bbcd31aa Merge "Refactoring loading of recent apps" into ics-mr0 2011-10-11 15:23:08 -07:00
Adam Powell
1a4c4334f0 Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0 2011-10-11 15:07:36 -07:00
Michael Jurka
ab48b68140 Refactoring loading of recent apps
- fix bugs 5278690 and 5432097
- no longer forcing a reload when screen is rotated
- moving recents loading code into a seaprate class
- changing variable names to use "Task" rather than "Activity" in Recent Apps

Change-Id: Ib0c8c5d537cf9d46d65b2ccb790015b601bb1bf1
2011-10-11 15:02:48 -07:00
Michael Kolb
64b4f16adf Support spellcheck attribute in WebTextView
Bug: 5267547

    set no suggestions for WebTextView when spellcheck attribute is
    false
    depends on CL: https://android-git.corp.google.com/g/#/c/141326/2

Change-Id: I4ad476270607e9d600567bbb4d9fd321893707b1
2011-10-11 14:19:53 -07:00
Jeff Brown
58bf986c3e Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0 2011-10-11 13:54:45 -07:00
Svetoslav Ganov
a72a80632b Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0 2011-10-11 13:54:28 -07:00
Svetoslav Ganov
52f7fcf844 Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0 2011-10-11 13:54:23 -07:00
Adam Powell
538e565c06 Fix bug 5396097 - menu theme consistency
Fix a bug where action bar menus were using the wrong context to
inflate stock views. This was causing them to use the action bar's
themed widget context instead of the current theme's specific action
bar items.

Note that action views in the menu will still be inflated using the
themed widget context. This can produce some weird side effects if
the action views use theme attributes relating to these action bar
item attributes.

Change-Id: Ied3614d1fedb10a0f5366bbe7b90cd5f2f1ff969
2011-10-11 13:49:28 -07:00
Jamie Gennis
e2909e121c SurfaceFlinger: update orientation via transactions
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState.  It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.

Bug: 5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
2011-10-11 13:34:01 -07:00
Scott Main
c351ab4734 cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5
docs: add docs for new hardware feature constants

Change-Id: I1b5b7b37a85856d28db8ecf08b070f24312ccca2
2011-10-11 12:03:10 -07:00
Svetoslav Ganov
eb0c52e491 DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
Cherry picking since branching caught us in the middle of review.

bug:5439637

Change-Id: I67d080abb4c14cad88b952e2f91d65e181b2029b
2011-10-11 11:58:13 -07:00
Svetoslav Ganov
98348517fd DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
Cherry picking since branching caught us in the middle of review.

1. If an AdapterView has no adapter and the view tries to fire an
   accessibility event we get a null pointer exception.

bug:5439321

Change-Id: Ia3d7a5ad852ef42422d10d8a62c4d3af6792313b
2011-10-11 11:54:22 -07:00
Jeff Brown
0cde89f5f0 Use ashmem for CursorWindows.
Bug: 5332296

The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized.  Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.

The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.

Improved the encapsulation of CursorWindow.  Callers shouldn't
need to care about details like how string fields are allocated.

Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.

Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
2011-10-11 11:03:19 -07:00
The Android Open Source Project
99f36683a4 Reconcile with ics-factoryrom-release
Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3
2011-10-11 04:29:27 -07:00
Mathias Agopian
5c3bea7022 Merge "fix an issue where the screen could stay off" 2011-10-10 22:21:57 -07:00
Mathias Agopian
919139247c fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).

Bug: 5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
2011-10-10 22:18:55 -07:00
Jim Miller
12b6fa1da8 Merge "Fix 5386408: Fix battery state information propagation in Lock Screen" 2011-10-10 22:06:07 -07:00
Jim Miller
baa2812b37 Fix 5386408: Fix battery state information propagation in Lock Screen
This fixes a bug where Lock Screen would sometimes inappropriately show
"charged" if it took a while for Lock Screen to get an update on the
battery state.  It now starts with the state set to BATTERY_STATUS_UNKNOWN
so we properly update listeners when we finally get battery information
in handleBatteryUpdate().

Change-Id: I71018a233f38b2f897ff2e6592d7e310550fa016
2011-10-10 22:02:54 -07:00
The Android Automerger
10ff393a52 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-10 20:38:59 -07:00
Jim Miller
66360acc12 Merge "Fix 5249234: Add contentDescription to buttons on transport control on lock screen." 2011-10-10 20:06:29 -07:00