OSDN Git Service
Victoria Lease [Mon, 9 Apr 2012 20:14:28 +0000 (13:14 -0700)]
Merge "Make WebView.findAllAsync() and WebView.setFindListener() public."
Daniel Sandler [Mon, 9 Apr 2012 19:00:52 +0000 (12:00 -0700)]
Merge "Fix notifications transitioning from small->big."
Victoria Lease [Mon, 26 Mar 2012 20:04:10 +0000 (13:04 -0700)]
Make WebView.findAllAsync() and WebView.setFindListener() public.
Deprecate WebView.findAll() while we're at it.
Bug:
6052412
Change-Id: I2f7116786109b4d6a01d24ac892c13b5d1f498f4
Scott Main [Mon, 9 Apr 2012 18:28:53 +0000 (11:28 -0700)]
am
3f23b713: am
5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1
* commit '
3f23b71364e7a0960c6a1269ec2467937bc13388':
docs: add 101 Training class "Building Your First App"
Jeff Sharkey [Mon, 9 Apr 2012 18:26:34 +0000 (11:26 -0700)]
Merge "Migrate to @Override to remove warnings."
Jeff Brown [Mon, 9 Apr 2012 18:25:02 +0000 (11:25 -0700)]
Merge "Fix lid switch interpretation."
Jeff Brown [Mon, 9 Apr 2012 18:24:16 +0000 (11:24 -0700)]
Merge "Use new EVIOCSCLOCKID ioctl if supported."
Jeff Brown [Mon, 9 Apr 2012 18:05:16 +0000 (11:05 -0700)]
Fix lid switch interpretation.
Also remove unnecessary permission check for method that is
only called internally.
Change-Id: I32f63fc3e96b06709d18b046ee2d3c8f310de70d
Daniel Sandler [Mon, 9 Apr 2012 17:15:42 +0000 (13:15 -0400)]
Fix notifications transitioning from small->big.
We'll have to go back and tweak this when we add a more
sophisticated switch from contentView to bigContentView, but
for now, this ought to detect that the notification has
gotten bigger (or smaller).
Change-Id: I3816fe8ed321569d1ce07d8a62cb08a434e55c2d
Jeff Brown [Sat, 7 Apr 2012 02:31:36 +0000 (19:31 -0700)]
Use new EVIOCSCLOCKID ioctl if supported.
Bug:
6292993
Change-Id: I718f167c2cd41298ed54847dbc5de872cd4c7e4a
Jeff Sharkey [Mon, 9 Apr 2012 17:49:19 +0000 (10:49 -0700)]
Migrate to @Override to remove warnings.
Bug:
6303344
Change-Id: I0d33b2ed448467379d576ccd71fb5ae20c878852
Adam Powell [Mon, 9 Apr 2012 17:52:26 +0000 (10:52 -0700)]
Merge "Tweaks to Activity up navigation"
Jeff Sharkey [Mon, 9 Apr 2012 17:31:20 +0000 (10:31 -0700)]
Merge "Splice operations before collapsing ifaces."
Adam Powell [Mon, 9 Apr 2012 17:22:12 +0000 (10:22 -0700)]
Tweaks to Activity up navigation
Be more explicit in docs about getParentActivityIntent and guard against
calls when a parent has not been declared in the manifest.
Move automatic up navigation to happen after dispatch of the menu
selection event of id android.R.id.home to fragments. (Last.)
Fixes bug
6305357
Change-Id: I944e5c40774121f9a28250d8d98da6aa646f9357
Jeff Sharkey [Mon, 9 Apr 2012 17:27:55 +0000 (10:27 -0700)]
Splice operations before collapsing ifaces.
Bug:
6241038
Change-Id: Ide9058703f7305df8fb070af149ddce0653a0abf
Scott Main [Mon, 9 Apr 2012 17:15:59 +0000 (10:15 -0700)]
am
5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1
* commit '
5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
docs: add 101 Training class "Building Your First App"
Scott Main [Mon, 9 Apr 2012 17:13:58 +0000 (10:13 -0700)]
Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1
Scott Main [Sat, 3 Mar 2012 02:02:43 +0000 (18:02 -0800)]
docs: add 101 Training class "Building Your First App"
Change-Id: I9a1f27dc2b44fac8b0e9fbeb9326b5c62a93bc41
Eric Laurent [Mon, 9 Apr 2012 15:39:05 +0000 (08:39 -0700)]
Merge "Added support for USB audio devices"
Daniel Sandler [Mon, 9 Apr 2012 15:35:00 +0000 (08:35 -0700)]
Merge "Remove Chronometer logspew."
Daniel Sandler [Mon, 9 Apr 2012 14:28:59 +0000 (07:28 -0700)]
Merge "Fix alignment of notification action buttons."
Daniel Sandler [Mon, 9 Apr 2012 14:18:28 +0000 (10:18 -0400)]
Remove Chronometer logspew.
Change-Id: Ie9ea1ac9fb0b8053b00ce162c191dfa44c1ff6ab
Daniel Lehmann [Sat, 7 Apr 2012 03:22:57 +0000 (20:22 -0700)]
Merge "Expose NORMALIZED_NUMBER in the API"
Jeff Brown [Sat, 7 Apr 2012 01:26:48 +0000 (18:26 -0700)]
Merge "Ensure that apps crash if they throw exceptions."
Jeff Brown [Sat, 7 Apr 2012 00:39:41 +0000 (17:39 -0700)]
Ensure that apps crash if they throw exceptions.
Previously, if an app threw an uncaught exception in an input,
vsync or native activity callback, it would log the exception then
continue limping merrily along. In the case of input, it
could result in an ANR occurring because we had not drained
all of the pending input events and marked them as finished
(we only marked the most recent one finished).
Bug:
6304124
Change-Id: I87d76f7fd605e1a8af1237c66d8d62973080277e
Eric Laurent [Fri, 6 Apr 2012 02:42:21 +0000 (19:42 -0700)]
Added support for USB audio devices
Two types of USB audio devices are defined:
- USB audio device: the audio device in USB device mode while
the Android device is in USB host mode.
- USB audio accessory: the audio device in USB host mode while
the Android device is in USB device mode.
Renamed intents for analog and digital docks to avoid confusion:
- ACTION_USB_ANLG_HEADSET_PLUG to ACTION_ANALOG_AUDIO_DOCK_PLUG
- ACTION_USB_DGTL_HEADSET_PLUG to ACTION_DIGITAL_AUDIO_DOCK_PLUG
Factorized code in AudioService broadcast receiver.
Change-Id: I1b6d0257a9d68ecb9495c78c98bac8c67fec7891
Craig Mautner [Sat, 7 Apr 2012 01:14:15 +0000 (18:14 -0700)]
Merge "Fix endless looping in layout."
Craig Mautner [Sat, 7 Apr 2012 01:04:13 +0000 (18:04 -0700)]
Fix endless looping in layout.
An odd alignment of the stars can end up with all of mAppToken.allDrawn
animating and mAppToken.startingDisplayed all false, and animation not
null. In such a case we can continue returning false but still pass
the test in WindowAnimator.updateWindowsAndRotation setting
wasAnimating to true. The combination continually sets the
FINISH_LAYOUT_REDO_WALLPAPER bit in mPendingLayoutChanges.
Fixes bug
6304838.
Change-Id: Ie7a7b39ea218213f51dc3df3eefe4ff03f1d885d
Dianne Hackborn [Sat, 7 Apr 2012 00:53:59 +0000 (17:53 -0700)]
Merge "Fix issue #
6242583: ResolverActivity is considered as home activity"
Adam Powell [Fri, 6 Apr 2012 23:41:17 +0000 (16:41 -0700)]
Merge "Add contentDescription for compact action_mode_close_item"
Adam Powell [Fri, 6 Apr 2012 23:39:11 +0000 (16:39 -0700)]
Add contentDescription for compact action_mode_close_item
Fix bug
6219630
Change-Id: I551624466d02f5d31be7030518b0d47b3b7f03b5
Eric Fischer [Fri, 6 Apr 2012 23:38:33 +0000 (16:38 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Fri, 6 Apr 2012 23:33:11 +0000 (16:33 -0700)]
You don't need LOCAL_STATIC_LIBRARIES when building static library.
and there is no target static library with name libutils.
Change-Id: Ifec34e1b484d749d3fcd11abe610f192a3213767
Dianne Hackborn [Fri, 6 Apr 2012 23:24:14 +0000 (16:24 -0700)]
Fix issue #
6242583: ResolverActivity is considered as home activity
Change-Id: Ib29908cdfcbbff769d12df1770264ad13ec5337b
Joe Fernandez [Fri, 6 Apr 2012 22:58:10 +0000 (15:58 -0700)]
am
e03ca3b5: am
1c23169e: am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
e03ca3b565d74a86afa72f7edbd102f213a2ccd3':
Joe Fernandez [Fri, 6 Apr 2012 22:54:28 +0000 (15:54 -0700)]
am
8c5eb364: am
b7df1f4e: am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
8c5eb364f38aa0a3944f003e9b1bbb67f6527da3':
Joe Fernandez [Fri, 6 Apr 2012 22:51:47 +0000 (15:51 -0700)]
am
1c23169e: am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
1c23169eb114a1f254330b40385726c92786b47f':
Joe Fernandez [Fri, 6 Apr 2012 22:51:34 +0000 (15:51 -0700)]
am
014ac37a: am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
014ac37a992a2c94eff765ed38cbdc4a064d263d':
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:50:34 +0000 (15:50 -0700)]
am
b7df1f4e: am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
b7df1f4e92e4fbff373e46ea54477af34b5a44a4':
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:47:21 +0000 (15:47 -0700)]
am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
1bf704bd1878fa372cfa50e7166d6ddcb1ba1369':
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:47:21 +0000 (15:47 -0700)]
am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
1bf704bd1878fa372cfa50e7166d6ddcb1ba1369':
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:46:55 +0000 (15:46 -0700)]
am
1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '
1bf704bd1878fa372cfa50e7166d6ddcb1ba1369':
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:29:36 +0000 (15:29 -0700)]
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Change-Id: I561e805b2d48910ddf66432f6df40086fe59c597
Jeff Brown [Fri, 6 Apr 2012 22:04:53 +0000 (15:04 -0700)]
Merge "Add a unique input device descriptor."
Jeff Brown [Fri, 6 Apr 2012 21:51:01 +0000 (14:51 -0700)]
Add a unique input device descriptor.
The purpose of the input device descriptor is to make it possible
to associate persistent settings for each input device, such as the
keyboard layout.
The descriptor is a hash of the information we have about the
device, such as its vendor id, product id, unique id, name,
or location.
Bug:
6110399
Change-Id: Idb80f946819b3f0dbf4e661bb0a753dbc2b60981
Gilles Debunne [Fri, 6 Apr 2012 21:46:24 +0000 (14:46 -0700)]
Merge "Revert "Faster and simpler replace in SSB""
Gilles Debunne [Fri, 6 Apr 2012 21:37:46 +0000 (14:37 -0700)]
Revert "Faster and simpler replace in SSB"
Bug
6300658
This change reveals a weird race condition where sometimes the
text is entered twice. Adding a debugger slows down everything,
and the problem is no longer reproducable. Reverting for now.
This reverts commit
ebd9a23817052c4d2aaa1058efa2b80b08003d4a.
Christopher Tate [Fri, 6 Apr 2012 21:35:16 +0000 (14:35 -0700)]
Merge "Attribute alarm broadcast wakelocks to the sender"
Jean-Baptiste Queru [Fri, 6 Apr 2012 21:25:20 +0000 (14:25 -0700)]
Merge "Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex"
Christopher Tate [Fri, 6 Apr 2012 21:19:13 +0000 (14:19 -0700)]
Attribute alarm broadcast wakelocks to the sender
Wakelock usage for the purpose of sending an alarm broadcast is now
attributed to the application which posted the alarm, not to the OS.
Bug
5911317
Change-Id: I8cb79c3bd5db467388716ab68285f4ab0bfe468b
Amith Yamasani [Fri, 6 Apr 2012 21:14:45 +0000 (14:14 -0700)]
Merge "Fixes a bug in migration of lock settings to LockSettingsService."
Craig Mautner [Fri, 6 Apr 2012 21:12:46 +0000 (14:12 -0700)]
Merge "Animate from local list of WindowStateAnimators."
Wei Zhong [Fri, 6 Apr 2012 17:55:56 +0000 (10:55 -0700)]
Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex
"Copyright (c) 2008-2009, Motorola, Inc"
Bug:
6299628
Change-Id: Ia64d7341a8466ee9213ecabe6315c64b8643574e
Signed-off-by: Wei Zhong <wzhong@google.com>
(cherry picked from commit
559841702b8a8760e057af29d14d1a31ce75ff18)
Craig Mautner [Thu, 5 Apr 2012 18:49:05 +0000 (11:49 -0700)]
Animate from local list of WindowStateAnimators.
Stop animate() from using the mWindows maintained by
WindowManagerService. Animating WindowStateAnimators are now drawn from
a HashSet maintained by WindowAnimator and containing just those
WindowStateAnimators that have Surfaces.
When starting a move animation do not place parameters directly into
the WindowStateAnimator, instead pass them through the Handler.
Also removed synchronization points from mWindows/mAppTokens
add/remove.
Jeff Sharkey [Fri, 6 Apr 2012 20:40:41 +0000 (13:40 -0700)]
Merge "INetworkStatsSession with lifecycle for caching."
Jeff Sharkey [Fri, 6 Apr 2012 18:12:08 +0000 (11:12 -0700)]
INetworkStatsSession with lifecycle for caching.
Users outside system_server now explicitly communicate their
lifecycle, which keeps a strong-reference chain to any fully loaded
NetworkStatsCollection histories.
Bug:
6236498
Change-Id: I8e22739b6e89a626b676967a736d7117fd000778
Andreas Huber [Fri, 6 Apr 2012 20:34:42 +0000 (13:34 -0700)]
Merge "New JAVA API to support submitting encrypted buffers of input data."
Dianne Hackborn [Fri, 6 Apr 2012 20:22:35 +0000 (13:22 -0700)]
Merge "Fix dumb bug."
Eric Fischer [Fri, 6 Apr 2012 20:04:40 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5899fbec882970afd4840aded5ef0eab32b40e54
Dianne Hackborn [Fri, 6 Apr 2012 19:55:53 +0000 (12:55 -0700)]
Fix dumb bug.
Change-Id: I5e0dfc0f03677888c22d938013299a8ec4597c69
Chris Craik [Fri, 6 Apr 2012 19:51:36 +0000 (12:51 -0700)]
Merge "fix functor flag parsing, tweak process delay"
Andreas Huber [Fri, 6 Apr 2012 19:14:47 +0000 (12:14 -0700)]
New JAVA API to support submitting encrypted buffers of input data.
Change-Id: Ib0df9a9427b4580946179860495b26f743558597
related-to-bug:
6275919
Mike Lockwood [Fri, 6 Apr 2012 18:29:25 +0000 (11:29 -0700)]
Merge "Add Intents to notify when USB audio devices or accessories are attached"
Dianne Hackborn [Fri, 6 Apr 2012 18:11:32 +0000 (11:11 -0700)]
Merge "Implement call log permission compatibility."
Mike Lockwood [Fri, 6 Apr 2012 16:41:32 +0000 (09:41 -0700)]
Add Intents to notify when USB audio devices or accessories are attached
In this change, only the USB audio accessory support is implemented.
Change-Id: Id9b411319b07a96dc56649ca74cc5f3f89a55a7c
Signed-off-by: Mike Lockwood <lockwood@google.com>
Scott Main [Fri, 6 Apr 2012 17:31:48 +0000 (10:31 -0700)]
am
34599640: am
e6c56712: am
2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '
345996400b664b34541c68535ca2f31424dcbc56':
Alexander Lucas [Fri, 6 Apr 2012 17:31:46 +0000 (10:31 -0700)]
am
00d44e5f: am
3d7c8404: am
ad606697: Removed HTML artifact from index page
* commit '
00d44e5fa2d067b342659b25ec203e089fc137fb':
Scott Main [Fri, 6 Apr 2012 17:31:45 +0000 (10:31 -0700)]
am
4317bfed: am
6ff75ab5: am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
4317bfedea82a3ebcb55c64168e781b2da92d71f':
Trevor Johns [Fri, 6 Apr 2012 17:31:43 +0000 (10:31 -0700)]
am
cbbdd734: am
ac5ae52d: am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
cbbdd7340cd530679a085db512f7bcc8b4761b7b':
Stephen Hines [Fri, 6 Apr 2012 17:30:49 +0000 (10:30 -0700)]
Merge "Build /system/bin/asan/app_process."
Scott Main [Fri, 6 Apr 2012 17:15:00 +0000 (10:15 -0700)]
am
e6c56712: am
2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '
e6c567122b76ae4282aba706092af88be43e30af':
Alexander Lucas [Fri, 6 Apr 2012 17:14:51 +0000 (10:14 -0700)]
am
3d7c8404: am
ad606697: Removed HTML artifact from index page
* commit '
3d7c8404da5ffa5a5e9cca2f7c16507df463e6f0':
Scott Main [Fri, 6 Apr 2012 17:14:45 +0000 (10:14 -0700)]
am
6ff75ab5: am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
6ff75ab5d7d0426bc3bbb73884b21a42af88d2df':
Trevor Johns [Fri, 6 Apr 2012 17:14:41 +0000 (10:14 -0700)]
am
ac5ae52d: am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
ac5ae52d13ef6c603ca8971579e8a981c6749e94':
Scott Main [Fri, 6 Apr 2012 16:54:01 +0000 (09:54 -0700)]
am
74405274: am
cde2feb2: am
2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '
74405274a58dcb98b782b58e8a7d0129a3ea1f22':
Alexander Lucas [Fri, 6 Apr 2012 16:53:59 +0000 (09:53 -0700)]
am
fccf7f55: am
5801ead9: am
ad606697: Removed HTML artifact from index page
* commit '
fccf7f55e514ae07522794982dc39f356a0c1274':
Scott Main [Fri, 6 Apr 2012 16:53:58 +0000 (09:53 -0700)]
am
d579953f: am
5756da24: am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
d579953f6530ab4dec87ccd60a31d99ab2006fc5':
Trevor Johns [Fri, 6 Apr 2012 16:53:56 +0000 (09:53 -0700)]
am
fbff4f6b: am
ae6323dd: am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
fbff4f6b0ebf556ac825e34a587ba0f416b3db14':
yoonsung.nam [Fri, 6 Apr 2012 16:53:54 +0000 (09:53 -0700)]
am
6be4fe37: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
6be4fe371a6c24916789c66bf39d73cada779079':
Fred Chung [Fri, 6 Apr 2012 16:53:52 +0000 (09:53 -0700)]
am
7b5f48f4: am
624e02d6: am
f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '
7b5f48f48aad69cb94af30cebdf062f7710a9125':
Scott Main [Fri, 6 Apr 2012 16:49:50 +0000 (09:49 -0700)]
am
cde2feb2: am
2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '
cde2feb2c3628b90cada1e6e552c40aabbad2baa':
docs: Deprecate the old UI guidelines about Activity/Task and Menus
Alexander Lucas [Fri, 6 Apr 2012 16:49:48 +0000 (09:49 -0700)]
am
5801ead9: am
ad606697: Removed HTML artifact from index page
* commit '
5801ead919d18f72a0538592c6c7d961e5767019':
Removed HTML artifact from index page
Scott Main [Fri, 6 Apr 2012 16:49:46 +0000 (09:49 -0700)]
am
5756da24: am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
5756da24ad478383630e9aedc2b7b696bf844571':
docs: Android U: Displaying Bitmaps Efficiently
Trevor Johns [Fri, 6 Apr 2012 16:49:43 +0000 (09:49 -0700)]
am
ae6323dd: am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
ae6323dd1ea0e06f987b8fc097378ee3bb060f47':
Docs: Fixing typo in "Testing from Other IDEs" article
yoonsung.nam [Fri, 6 Apr 2012 16:49:43 +0000 (09:49 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Scott Main [Fri, 6 Apr 2012 16:43:14 +0000 (09:43 -0700)]
am
2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '
2b0267dc3671282a1498a92da7b38fd2ef5c018f':
docs: Deprecate the old UI guidelines about Activity/Task and Menus
Alexander Lucas [Fri, 6 Apr 2012 16:43:06 +0000 (09:43 -0700)]
am
ad606697: Removed HTML artifact from index page
* commit '
ad6066970ae8f5979942178bcbbe90f72a348440':
Removed HTML artifact from index page
Scott Main [Fri, 6 Apr 2012 16:42:57 +0000 (09:42 -0700)]
am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
153f8fe420506a7e1b7a8f6b4d07db798867746e':
docs: Android U: Displaying Bitmaps Efficiently
Trevor Johns [Fri, 6 Apr 2012 16:42:55 +0000 (09:42 -0700)]
am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
e07b58506579085b62fde0771b74111b24aa27a0':
Docs: Fixing typo in "Testing from Other IDEs" article
Amith Yamasani [Fri, 6 Apr 2012 16:27:12 +0000 (09:27 -0700)]
Fixes a bug in migration of lock settings to LockSettingsService.
Due to the code to handle backward compatibility, the migration
ended up being recursive.
Change-Id: I1c2cf4a81fbdee6a4b74cafb624625716c88cad3
Jamie Gennis [Fri, 6 Apr 2012 16:06:28 +0000 (09:06 -0700)]
Merge changes Iac9cc917,I8eed4b0d
* changes:
TextureView: add setSurfaceTexture method
SurfaceTexture: add GL context attach & detach
Daniel Sandler [Fri, 6 Apr 2012 15:46:52 +0000 (08:46 -0700)]
Merge "Fix boot on sw600dp devices."
Craig Mautner [Fri, 6 Apr 2012 15:00:47 +0000 (08:00 -0700)]
Merge "Fix so that windows again animate when moving."
Daniel Sandler [Thu, 5 Apr 2012 03:46:14 +0000 (23:46 -0400)]
Fix alignment of notification action buttons.
Change-Id: Ibfb8f54b6aa59f1c7a56a5e3e8b0c762e48dd496
satok [Fri, 6 Apr 2012 05:12:36 +0000 (22:12 -0700)]
Merge "Fix a bug with IME blinking just after leaving the lock screen"
satok [Fri, 30 Mar 2012 09:31:36 +0000 (18:31 +0900)]
Supplement for I772164d9c67e95876c228efcce2
This should be merged with I1519258dd3ce95ad01
Change-Id: I48c5f86ff43f51913eb69d697bb1d75714b67aa3
Daniel Sandler [Fri, 6 Apr 2012 03:56:05 +0000 (23:56 -0400)]
Fix boot on sw600dp devices.
Soon we'll switch this threshold to 720dp, once the
PhoneStatusBar is ready to support 600dp wide devices. For
now, however, restore the previous behavior.
Bug:
6300512
Change-Id: Ibedb8ffc1b677e3bbe9af230598adb7db278635b
Dianne Hackborn [Fri, 6 Apr 2012 02:33:30 +0000 (19:33 -0700)]
Implement call log permission compatibility.
If a pre-JellyBean application requests read/write contacts, it
will implicitly be given read/write call log.
Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f
Jeff Brown [Fri, 6 Apr 2012 01:57:33 +0000 (18:57 -0700)]
Move some APIs from window manager to input manager.
Simplified input injection API down to just one call.
Removed all input state reading API. It was only used by the
window manager policy and required a permission that applications
could not obtain. READ_INPUT_STATE is now unused and deprecated.
Change-Id: I41278141586ddee9468cae0fb59ff0dced6cbc00
Craig Mautner [Fri, 6 Apr 2012 02:29:19 +0000 (19:29 -0700)]
Merge "Fix looping to turn off dimming."