25914 Commits

Author SHA1 Message Date
Fred Quintana
8257e9e851 Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" 2011-10-12 14:53:34 -07:00
Fred Quintana
0c65ba4cd9 reworked the flow in the account chooser
- resilient to the chooser activity being killed due to memory pressure
 - back now goes back to the main chooser screen rather than canceling
   it completely

Bug: 5358896
Bug: 5381201
Bug: 5387749

Change-Id: I10e76013b2cceffc37ea891746533d6a08f279b7
2011-10-12 14:52:09 -07:00
Jeff Brown
2b5b83bda8 Merge "Improve screenshot chord debouncing. Bug: 5011907" 2011-10-12 14:49:57 -07:00
Jeff Brown
905805ad7c Improve screenshot chord debouncing.
Bug: 5011907

Introduce a 150ms delay in handling volume down keys
while waiting to see if a power key will follow.

Don't trigger the screenshot chord if both volume up and
volume down are pressed together.

Don't trigger the long-press power menu if volume keys are
also pressed.

Require the user to press both keys in the chord within
the debounce time and continue long-pressing them in order
to trigger the screenshot action.

Change-Id: I248968d37b73c09d6d08e7f62667c443eba32da0
2011-10-12 14:34:23 -07:00
RoboErik
dc8f43294a Merge "Fix immenent build breakage." 2011-10-12 13:45:12 -07:00
RoboErik
fced9521be Fix immenent build breakage.
Change-Id: Iad7b68f1e16d4ba781fa45f467cb59c73a6ff26d
2011-10-12 13:43:56 -07:00
RoboErik
3db295cd7e Merge "Add hidden API to prepare for increasing calendar support" 2011-10-12 13:29:34 -07:00
RoboErik
f8143c5d07 Add hidden API to prepare for increasing calendar support
This adds hidden APIs for supporting settng allowed availabilities and
attendee types, adding the tentative availability and resource
attendee type, color indexes for calendars and events, and a colors
table.

b/5317399 b/5309787 b/5207781 b/5347210

Change-Id: I8dec4d0ebb0523b34bd420a0ab62bf5d0650996f
2011-10-12 13:27:44 -07:00
Daniel Sandler
3c07f7f0d6 am fd8f6f2f: Merge "Fix obsolete Honeycomb platlogo." into ics-mr0
* commit 'fd8f6f2f7557c414466f7634391821e59c1ce040':
  Fix obsolete Honeycomb platlogo.
2011-10-12 13:12:37 -07:00
Daniel Sandler
fd8f6f2f75 Merge "Fix obsolete Honeycomb platlogo." into ics-mr0 2011-10-12 13:11:13 -07:00
Fabrice Di Meglio
cee057ed2d am 87228cd7: Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0
* commit '87228cd7bb9a39e2bb33a767d214c8d834f840df':
  Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned
2011-10-12 12:42:12 -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
Adam Powell
75c00531ec am f2894659: Fix bug 5449931 - Wrong theme for icon menus
* commit 'f2894659e8df625783afcd3fa17462ab23d29145':
  Fix bug 5449931 - Wrong theme for icon menus
2011-10-12 12:26:42 -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
Eino-Ville Talvala
ca2640b2ab am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
* commit '0a2735928030229b3340074eb11c2423342fda93':
  Add video stabilization control to Camera parameters.
2011-10-12 10:40:11 -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
Steve Block
ca731c5c6b am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
* commit 'c0c394ee053c1b62da58247c431c20d5939c4ada':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
2011-10-12 10:00:48 -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
Gilles Debunne
b10d396f2e Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan" 2011-10-12 09:51:17 -07:00
Gilles Debunne
ba25c01335 Merge "Bug 5237623: word no longer underlined after replacement" 2011-10-12 09:50:45 -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
Amith Yamasani
50f9924322 Merge "Backup owner info as part of settings backup." 2011-10-12 09:45:22 -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
Adam Powell
4d9adfe6ae am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0
* commit '35af3639a169b1b8e5f4d96579795e5480080b52':
  Fix bug 5173029 - make fast scroller aware of scrolling containers
2011-10-11 19:33:29 -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
Romain Guy
0bbd8d8273 Revert "Check whether an AsyncTask is created/executed on a looper thread."
This reverts commit 7498ccb6b9a1e61281d998fc81adc9a4a5e87e56.
2011-10-11 18:13:37 -07:00
Romain Guy
5e7f2d0b22 Revert "Fix the build"
This reverts commit 4db2504adab21e4439c123d2675db555e0143afa.
2011-10-11 18:13:05 -07:00
Adam Powell
cecf202189 am acf7d982: Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0
* commit 'acf7d982ae981c039ec8445a30da91be0a4fbbc5':
  Fix bug 5434403 - invalidation problem with seek bars at edges
2011-10-11 16:16:09 -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
Gilles Debunne
c08ec615d2 Bug 5385279: IOOB in createMisspelledSuggestionSpan
Race condition: when spell check result come back, the spell check span may no longer
be in the text, although it should have been removed by removeSpellCheckSpan.

This is possible because onGetSuggestions is called from an other thread
and it can see the text in an inconsistent state where the span may have been removed
from the text, but the listener that calls removeSpellCheckSpan has not yet been called.
As a result, onGetSuggestions still lists the span but getSpanStart returns -1.

Change-Id: Ia40f7ed2b46fc94888fce5a6b209fb0d0d529bbe
2011-10-11 16:12:23 -07:00
Svetoslav Ganov
f42d34bdd1 Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API" 2011-10-11 16:00:54 -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
Michael Kolb
1eb08f0acb am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0
* commit 'f0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d':
  Support spellcheck attribute in WebTextView
2011-10-11 15:33:37 -07:00
Adam Powell
b24f45d542 am 1a4c4334: Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0
* commit '1a4c4334f02152c96cfc71136dc31085826c6894':
  Fix bug 5396097 - menu theme consistency
2011-10-11 15:33:33 -07:00
Jeff Brown
241fe477ed am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
* commit '58bf986c3e3948242e89654e6d59b97a21345582':
  Use ashmem for CursorWindows. Bug: 5332296
2011-10-11 15:33:28 -07:00
Michael Kolb
f0f7a9139b Merge "Support spellcheck attribute in WebTextView" into ics-mr0 2011-10-11 15:25:22 -07:00
Adam Powell
1a4c4334f0 Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0 2011-10-11 15:07:36 -07:00
Gilles Debunne
5915c885de Bug 5237623: word no longer underlined after replacement
When replacing a word, we need to remove *all* misspelled
suggestion spans, not just the one which triggered that popup.

Change-Id: I7be17ac626b26123b029f5e10c1e2eaa5f94d67c
2011-10-11 14:54:26 -07:00
Romain Guy
f751210b4b Merge "Fix the build" 2011-10-11 14:51:18 -07:00
Romain Guy
4db2504ada Fix the build
Change-Id: I3071feab62abee7393557ceb920786b476fb0b02
2011-10-11 14:48:56 -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
Svetoslav Ganov
8b6c7dd2fe Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API
The methods were hidden for the previoud release since they were added
too close to the SDK final date.

bug:5424373

Change-Id: I812b9809223db75636b04549500f023820b6eb5a
2011-10-11 14:16:41 -07:00
Romain Guy
df61887feb Merge "Check whether an AsyncTask is created/executed on a looper thread." 2011-10-11 14:10:10 -07:00
Romain Guy
7498ccb6b9 Check whether an AsyncTask is created/executed on a looper thread.
Change-Id: I181b253c50a6579f35e61cd4b0c500379462e035
2011-10-11 14:09:27 -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