61952 Commits

Author SHA1 Message Date
Jean-Michel Trivi
21e188fd6f Merge "Fix 5389442 RemoteControlClient javadoc" 2011-10-11 15:24:15 -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
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
Jeff Sharkey
69f364ae87 Merge "Update internal state when iface is removed." 2011-10-11 14:54:08 -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
Jean-Michel Trivi
ad87f5b40f 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: If8f050f94b112f9680ba6bf32ba622bc648fb1d0
2011-10-11 14:09:23 -07:00
Romain Guy
bd3f526eab Merge "Correctly apply transforms when getting a TextureView's bitmap Bug #5439406" 2011-10-11 14:07:15 -07:00
Romain Guy
a9dc86b21d Correctly apply transforms when getting a TextureView's bitmap
Bug #5439406

Change-Id: I271a9a2e38f5b3600dc158f8f442a6b0893f472b
2011-10-11 14:06:21 -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
Amith Yamasani
fce776c21e Backup owner info as part of settings backup.
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-11 13:53:30 -07:00
John Reck
952f8a8792 am baf87116: Merge branch \'master\' of ssh://android-git:29418/platform/frameworks/base
* commit 'baf8711684885fdc242c44903200ca6904fa5c46':
2011-10-11 13:52:17 -07:00
Scott Main
bec41d9ab5 am c351ab47: cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5 docs: add docs for new hardware feature constants
* commit 'c351ab473400ff15e53c33ab57cf8286c4bfad7a':
  cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5 docs: add docs for new hardware feature constants
2011-10-11 13:52:14 -07:00
Nick Pelly
24d7b5f22a Send ACTION_USER_PRESENT when provisioning is completed.
This is needed for application to know when the keyguard becomes
unlocked, because isKeyguardLocked() is typically true while
provisioning (setup wizard), but ACTION_USER_PRSENT was
not sent when it transitions to false after provisioning.

Bug: 5436867
Bug: 5430833
Change-Id: Icae13ff9cab84774a002a426eb9cb353fa1dc530
2011-10-11 13:50:33 -07:00
John Reck
baf8711684 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-11 13:49:59 -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
Nick Pelly
5eba4d6713 am 79425fd6: Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API\'s."
* commit '79425fd600e521f1eb4947c26ef631d3e1d29920':
  Remove deprecated (and hidden) enableForegroundNdefPush callback API's.
2011-10-11 12:41:32 -07:00
Nick Pelly
79425fd600 Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's." 2011-10-11 12:39:46 -07:00
Jeff Brown
24285a1ad3 am e69eaf5c: Merge "Don\'t log BlockGuard violations on ENG builds."
* commit 'e69eaf5c6de95a0db7d5cddf079169a925bac85f':
  Don't log BlockGuard violations on ENG builds.
2011-10-11 12:36:25 -07:00
Jeff Brown
e69eaf5c6d Merge "Don't log BlockGuard violations on ENG builds." 2011-10-11 12:35:05 -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
Daniel Sandler
fe1d0ace8d am b545851d: Merge "Stop enabling all disabled status bar features from GlobalActions."
* commit 'b545851dd59766f5e9471a08fdd7b60318492eb9':
  Stop enabling all disabled status bar features from GlobalActions.
2011-10-11 12:02:40 -07:00
Daniel Sandler
b545851dd5 Merge "Stop enabling all disabled status bar features from GlobalActions." 2011-10-11 12:01:15 -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
Jeff Sharkey
89b8a2161a Update internal state when iface is removed.
Bug: 5433432
Change-Id: I7eb0ffe3ae07f42d5c47fe4082f490478c5099bf
2011-10-11 11:58:11 -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
be7c29c9f7 Don't log BlockGuard violations on ENG builds.
We want to see CloseGuard violations in the log in ENG builds
because they indicate serious problems, but BlockGuard is
too noisy and is best viewed in the aggregate from the
drop box based tools.

Change-Id: I77d4d0a561a4299355c111d0ccb5a2147646245b
2011-10-11 11:35:23 -07:00
Svetoslav Ganov
9e2660be00 am 0c9698ac: Merge changes I67d080ab,Ia3d7a5ad
* commit '0c9698aca534f123414e4c5a9419f210473ba11b':
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-11 11:32:20 -07:00
Svetoslav Ganov
0c9698aca5 Merge changes I67d080ab,Ia3d7a5ad
* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-11 11:30:45 -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
Ying Wang
70e7e6283b am 384bf04a: Merge "Remove non-module names from PRODUCT_PACKAGES"
* commit '384bf04a38b79877be7cc03c2e67f706d84598e7':
  Remove non-module names from PRODUCT_PACKAGES
2011-10-11 10:04:38 -07:00
Ying Wang
384bf04a38 Merge "Remove non-module names from PRODUCT_PACKAGES" 2011-10-11 10:01:39 -07:00
The Android Open Source Project
adffd2a8f6 am 99f36683: Reconcile with ics-factoryrom-release
* commit '99f36683a4f2c218d52922ae7c2a0c0b3f2890ed':
2011-10-11 04:35:02 -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
7031b8e67e am 5c3bea70: Merge "fix an issue where the screen could stay off"
* commit '5c3bea702276bed21234715b497d683ef1b1f012':
  fix an issue where the screen could stay off
2011-10-10 22:24:06 -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
81ff5596ee am 12b6fa1d: Merge "Fix 5386408: Fix battery state information propagation in Lock Screen"
* commit '12b6fa1da82567b9a36664b759d10464f4970e6f':
  Fix 5386408: Fix battery state information propagation in Lock Screen
2011-10-10 22:07:58 -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