OSDN Git Service
Daniel Sandler [Tue, 22 Nov 2011 15:17:19 +0000 (07:17 -0800)]
am
63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '
631885746868cbf03f89e655a6f4fac96449e8a4':
Dismiss system windows when screen savers start.
Daniel Sandler [Tue, 22 Nov 2011 15:15:29 +0000 (07:15 -0800)]
Merge "Dismiss system windows when screen savers start." into ics-mr1
Mangesh Ghiware [Tue, 22 Nov 2011 07:16:14 +0000 (23:16 -0800)]
am
8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '
8d03007f80d74abadfc96926e7cca40d38380bc0':
Update zoom (aka display) density from WebView thread.
Mangesh Ghiware [Tue, 22 Nov 2011 07:14:05 +0000 (23:14 -0800)]
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
Romain Guy [Tue, 22 Nov 2011 05:20:16 +0000 (21:20 -0800)]
am
723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit '
723218b4f428944bdb11b25d0b30ece56283f696':
Hide ManagedEGLContext until we are sure this is the correct API.
Romain Guy [Tue, 22 Nov 2011 05:18:51 +0000 (21:18 -0800)]
Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
James Dong [Tue, 22 Nov 2011 04:30:14 +0000 (20:30 -0800)]
am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
James Dong [Tue, 22 Nov 2011 04:28:27 +0000 (20:28 -0800)]
Merge "Fix log spamming during time lapse video recording" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 02:31:35 +0000 (18:31 -0800)]
Romain Guy [Tue, 22 Nov 2011 02:28:49 +0000 (18:28 -0800)]
Fix the build
Change-Id: I3814c6c39eda2a4b56902e2044fbb121b4885e5d
Romain Guy [Tue, 22 Nov 2011 02:24:23 +0000 (18:24 -0800)]
Hide ManagedEGLContext until we are sure this is the correct API.
Change-Id: If54942d342ca8ea348e10231b2aed3e5d3bd701b
Wu-cheng Li [Tue, 22 Nov 2011 02:13:16 +0000 (18:13 -0800)]
am
e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
* commit '
e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
Move Camera.Sound to a stand-alone class CameraSound.
Wu-cheng Li [Tue, 22 Nov 2011 02:10:52 +0000 (18:10 -0800)]
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
Mathias Agopian [Tue, 22 Nov 2011 02:00:53 +0000 (18:00 -0800)]
am
07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
* commit '
07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
don't report an error when disconnecting from an abandoned surfacetexture
Mathias Agopian [Tue, 22 Nov 2011 01:58:42 +0000 (17:58 -0800)]
am
8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
8646cd42df5edc5f5b9c52d6ab5309821e875656':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Romain Guy [Tue, 22 Nov 2011 01:58:40 +0000 (17:58 -0800)]
am
8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #
5639899" into ics-mr1
* commit '
8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
Notify views when EGL resources are about to be destroyed Bug #
5639899
Mathias Agopian [Tue, 22 Nov 2011 01:57:31 +0000 (17:57 -0800)]
Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
Mathias Agopian [Tue, 22 Nov 2011 01:57:20 +0000 (17:57 -0800)]
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 01:57:05 +0000 (17:57 -0800)]
Merge "Notify views when EGL resources are about to be destroyed Bug #
5639899" into ics-mr1
Adam Powell [Tue, 22 Nov 2011 01:37:08 +0000 (17:37 -0800)]
am
fb0784da: Merge "Fix bug
5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
* commit '
fb0784da5f602bf6410ef914d625c3cedfa11e9f':
Fix bug
5521467 - Monkeys and ActionBar custom tab views
Adam Powell [Tue, 22 Nov 2011 01:34:57 +0000 (17:34 -0800)]
Merge "Fix bug
5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
Mangesh Ghiware [Tue, 22 Nov 2011 00:54:20 +0000 (16:54 -0800)]
Update zoom (aka display) density from WebView thread.
Fixes bug
5639675.
Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
Adam Powell [Tue, 22 Nov 2011 01:14:56 +0000 (17:14 -0800)]
Fix bug
5521467 - Monkeys and ActionBar custom tab views
Remove custom tab views from old parents if applicable.
Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
Nick Pelly [Tue, 22 Nov 2011 00:05:33 +0000 (16:05 -0800)]
am
043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '
043a8b149dc31d3e3242ccf0cadc580702c99552':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Nick Pelly [Tue, 22 Nov 2011 00:03:40 +0000 (16:03 -0800)]
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
Jamie Gennis [Mon, 21 Nov 2011 23:56:17 +0000 (15:56 -0800)]
am
b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
* commit '
b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
EGL: Use cache sizes defined in the BoardConfig
Jamie Gennis [Mon, 21 Nov 2011 23:56:15 +0000 (15:56 -0800)]
am
53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* commit '
53cf20202a3848a6c61b5229814268180a3d2f16':
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
Jamie Gennis [Mon, 21 Nov 2011 23:54:54 +0000 (15:54 -0800)]
Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
Jamie Gennis [Mon, 21 Nov 2011 23:54:40 +0000 (15:54 -0800)]
Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* changes:
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
Eric Fischer [Mon, 21 Nov 2011 23:31:32 +0000 (15:31 -0800)]
am
68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
68f0d47e8ee045dffb5f59c67cc77f38598472c5':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:29:06 +0000 (15:29 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 22:29:12 +0000 (14:29 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I4313e0fffeb72b5a78b49770932ad983cfb05f8b
Chia-chi Yeh [Mon, 21 Nov 2011 23:21:49 +0000 (15:21 -0800)]
am
bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1
* commit '
bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
SIP: turn off verbose logs.
Chia-chi Yeh [Mon, 21 Nov 2011 23:19:35 +0000 (15:19 -0800)]
Merge "SIP: turn off verbose logs." into ics-mr1
Nick Pelly [Mon, 21 Nov 2011 22:54:46 +0000 (14:54 -0800)]
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.
The package name is also reverted from com.android.nfc3 to com.android.nfc
The NFC uid needs to get bumped (25 to 27) to allow the cert change.
Bug:
5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
Jamie Gennis [Sun, 20 Nov 2011 05:20:17 +0000 (21:20 -0800)]
SurfaceTexture: fix a couple tests
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests. The tests previously
depended upon GL implementation details that should not have been relied
upon.
Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
Jamie Gennis [Sun, 20 Nov 2011 02:04:43 +0000 (18:04 -0800)]
EGL: default to swap interval 1
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.
Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
John Reck [Mon, 21 Nov 2011 22:14:11 +0000 (14:14 -0800)]
am
0507ac4d: Use isHighEndGfx to determine texture pool
* commit '
0507ac4d94fc0ecb775391a7e80c921614f88a58':
Use isHighEndGfx to determine texture pool
John Reck [Mon, 21 Nov 2011 21:30:32 +0000 (13:30 -0800)]
Use isHighEndGfx to determine texture pool
Bug:
5639612
Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
James Dong [Sun, 20 Nov 2011 17:45:44 +0000 (09:45 -0800)]
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug:
5626569
Jamie Gennis [Sun, 20 Nov 2011 01:49:21 +0000 (17:49 -0800)]
SurfaceTexture: clean up some tests
This change cleans a few things up in the SurfaceTexture tests:
- Wraps a few long lines.
- Refactors the multithreading portions of SurfaceTextureGLToGLTest into
a new test fixture called SurfaceTextureGLThreadToGLTest.
- Changes some of the tests that were creating their own EGLSurface to
use the SurfaceTextureGLToGLTest fixture.
- Reorders the test functions so that they are immediately below to the
test fixture that they use.
Change-Id: I0491ce3528a7ff2b4f1e83602ba290269c087297
Jamie Gennis [Sun, 20 Nov 2011 00:25:24 +0000 (16:25 -0800)]
EGL: Use cache sizes defined in the BoardConfig
This change introduces two new BoardConfig variables to control the size
limits of the EGL blob cache. MAX_EGL_CACHE_ENTRY_SIZE is the size
limit for values inserted into the cache, and MAX_EGL_CACHE_SIZE is the
size limit for all entries in the entire cache (including both keys and
values). If either of these BoardConfig variables are not defined then
a default size limit is used instead.
Change-Id: I6703d93f966b6389c6499f23d841e42339f9c9d7
Romain Guy [Mon, 21 Nov 2011 18:55:41 +0000 (10:55 -0800)]
Notify views when EGL resources are about to be destroyed
Bug #
5639899
Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
Wu-cheng Li [Fri, 18 Nov 2011 10:39:46 +0000 (18:39 +0800)]
Move Camera.Sound to a stand-alone class CameraSound.
bug:
5640219
Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
Kristian Monsen [Sun, 20 Nov 2011 15:28:35 +0000 (07:28 -0800)]
am
7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
* commit '
7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
Improving PictureListener deprecating comments
Kristian Monsen [Sun, 20 Nov 2011 15:26:59 +0000 (07:26 -0800)]
Merge "Improving PictureListener deprecating comments" into ics-mr1
Daniel Sandler [Sun, 20 Nov 2011 04:44:36 +0000 (20:44 -0800)]
am
9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '
9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
Daniel Sandler [Sun, 20 Nov 2011 04:42:19 +0000 (20:42 -0800)]
Merge "Dreams (now Screen Candy) development." into ics-mr1
Chia-chi Yeh [Sat, 19 Nov 2011 00:57:21 +0000 (16:57 -0800)]
SIP: turn off verbose logs.
Bug:
5616713
Change-Id: Iaf2e6878731d10d7f4f2a7cd8af71f4517780642
The Android Open Source Project [Fri, 18 Nov 2011 23:53:14 +0000 (15:53 -0800)]
am
0e2c2f39: Reconcile with ics-mr0-release
* commit '
0e2c2f3971eb4b246a5c1b198370e003668f53ee':
The Android Open Source Project [Fri, 18 Nov 2011 23:49:39 +0000 (15:49 -0800)]
Reconcile with ics-mr0-release
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
The Android Automerger [Fri, 18 Nov 2011 23:37:45 +0000 (15:37 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Marco Nelissen [Fri, 18 Nov 2011 23:10:38 +0000 (15:10 -0800)]
am
7ff7821a: am
d4b22ab4: status_t != bool
* commit '
7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Svetoslav Ganov [Fri, 18 Nov 2011 22:41:09 +0000 (14:41 -0800)]
am
d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
* commit '
d8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
Svetoslav Ganov [Fri, 18 Nov 2011 22:39:05 +0000 (14:39 -0800)]
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
Mathias Agopian [Fri, 18 Nov 2011 22:30:20 +0000 (14:30 -0800)]
don't report an error when disconnecting from an abandoned surfacetexture
this happens often with CPU Surfaces, which disconnect long
after their surfacetexture has been abandoned.
Change-Id: If49da03b72f99130e01b2b9bcbd444bb38f7ed4e
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Wei Huang [Fri, 18 Nov 2011 22:02:15 +0000 (14:02 -0800)]
am
c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
* commit '
c2fff5ea39027d017dc15ce285961afa17a7b4a7':
Unlock camera AWB lock only when white-balance is changed.
Wei Huang [Fri, 18 Nov 2011 22:00:09 +0000 (14:00 -0800)]
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
Mathias Agopian [Tue, 15 Nov 2011 03:17:37 +0000 (19:17 -0800)]
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
this flag should be enabled for all targets, but currently
some have issues with it, so we're turning it on only for
tested targets.
this will hopefully resolve some performance issues.
Bug:
5553562,
5631630
Change-Id: I54c7a9e2068586898ab13e405d95534669260537
The Android Open Source Project [Fri, 18 Nov 2011 21:16:16 +0000 (13:16 -0800)]
am
d5280e51: Reconcile with ics-mr0-release
* commit '
d5280e51aa4578ff47bffc166f74d79c17358589':
The Android Open Source Project [Fri, 18 Nov 2011 21:12:32 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
Mathias Agopian [Fri, 18 Nov 2011 20:13:55 +0000 (12:13 -0800)]
am
4d71053b: Merge "attempt to fix bug
5313580" into ics-mr1
* commit '
4d71053b0728b248d80d7d5a098df459722e2be0':
attempt to fix bug
5313580
Mathias Agopian [Fri, 18 Nov 2011 20:11:15 +0000 (12:11 -0800)]
Merge "attempt to fix bug
5313580" into ics-mr1
Bart Sears [Fri, 18 Nov 2011 19:49:40 +0000 (11:49 -0800)]
am
e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit '
e6a96560ed96e5121db2e22168698f14338c8f1d':
Content and viewport rects set in one step.
Bart Sears [Fri, 18 Nov 2011 19:46:26 +0000 (11:46 -0800)]
Merge "Content and viewport rects set in one step." into ics-mr1
Svetoslav Ganov [Fri, 18 Nov 2011 18:24:00 +0000 (10:24 -0800)]
Text selection AccessibilityEvents are missing text.
The text selection change event was not added to the text
populating accessibility events in View.
bug:
5638709
Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
Svetoslav Ganov [Fri, 18 Nov 2011 18:13:57 +0000 (10:13 -0800)]
am
0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '
0358787f68c48fb10f2d8067fd53f0471481320a':
Add the support libraries to the platform documentation (build).
Svetoslav Ganov [Fri, 18 Nov 2011 18:11:35 +0000 (10:11 -0800)]
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
Daniel Sandler [Fri, 18 Nov 2011 17:30:08 +0000 (09:30 -0800)]
Dismiss system windows when screen savers start.
Also add a couple more flags to the intent:
- NO_HISTORY (finish activity on suspend)
- FLAG_FROM_BACKGROUND
Bug:
5578434
Change-Id: I97b965175a27760b819dc29ddb57865c5f4754d6
Kristian Monsen [Thu, 17 Nov 2011 13:28:02 +0000 (13:28 +0000)]
Improving PictureListener deprecating comments
Change-Id: If189823962c49db9681845996e97eec31fedcca6
Daniel Sandler [Thu, 17 Nov 2011 18:38:37 +0000 (10:38 -0800)]
Dreams (now Screen Candy) development.
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"
Bug:
5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
Joe Fernandez [Fri, 18 Nov 2011 14:16:30 +0000 (06:16 -0800)]
am
dea90a0e: am
366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '
dea90a0e1c9c1d15657024893b6793dc21bc27ef':
docs: Camera Features for developers
Joe Fernandez [Fri, 18 Nov 2011 14:14:01 +0000 (06:14 -0800)]
am
366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '
366113fa1bea5ef39cf6557f18ff00310eb6e458':
docs: Camera Features for developers
Scott Main [Fri, 18 Nov 2011 10:53:08 +0000 (02:53 -0800)]
am
d353df8d: am
48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '
d353df8db4f51868e1e09463b2c25e3637ad8e95':
docs: update caption for action bar figure to match new screenshot
Scott Main [Fri, 18 Nov 2011 10:49:49 +0000 (02:49 -0800)]
am
48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '
48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
docs: update caption for action bar figure to match new screenshot
Wu-cheng Li [Thu, 17 Nov 2011 12:12:23 +0000 (20:12 +0800)]
Unlock camera AWB lock only when white-balance is changed.
bug:
5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
Daniel Sandler [Fri, 18 Nov 2011 05:04:35 +0000 (21:04 -0800)]
am
da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '
da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
Tie screen saver to the screen off timeout.
Daniel Sandler [Fri, 18 Nov 2011 05:02:40 +0000 (21:02 -0800)]
Merge "Tie screen saver to the screen off timeout." into ics-mr1
Adam Powell [Fri, 18 Nov 2011 03:45:50 +0000 (19:45 -0800)]
am
8c54182f: Merge "Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '
8c54182f0b6c706adc6247d6f1da7147b357920d':
Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Adam Powell [Fri, 18 Nov 2011 03:44:14 +0000 (19:44 -0800)]
Merge "Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
Jim Miller [Fri, 18 Nov 2011 02:59:40 +0000 (18:59 -0800)]
am
70bded0a: Merge "Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
* commit '
70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels
Jim Miller [Fri, 18 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
Mathias Agopian [Fri, 18 Nov 2011 02:46:09 +0000 (18:46 -0800)]
attempt to fix bug
5313580
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.
To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.
Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
Guang Zhu [Fri, 18 Nov 2011 02:07:25 +0000 (18:07 -0800)]
am
3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '
3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
add a self instrumentation into framework perf app
satok [Fri, 18 Nov 2011 02:04:28 +0000 (18:04 -0800)]
am
1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '
1a3c051bcc787363d9154da4a8e8e562dda32926':
Hide/show ime switch icon properly
Guang Zhu [Fri, 18 Nov 2011 02:04:23 +0000 (18:04 -0800)]
Merge "add a self instrumentation into framework perf app" into ics-mr1
satok [Fri, 18 Nov 2011 02:02:09 +0000 (18:02 -0800)]
Merge "Hide/show ime switch icon properly" into ics-mr1
Adam Powell [Fri, 18 Nov 2011 01:59:43 +0000 (17:59 -0800)]
Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Disable the window-level progress spinner; another is already shown while
connecting.
Use the correct Settings icon for SystemUI.
Specify the activity title for the USB mass storage screen in the
manifest to avoid title flashing during startup.
Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
Jim Miller [Fri, 18 Nov 2011 01:58:40 +0000 (17:58 -0800)]
Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels
This bug is the result of onPause()/onResume() not being called properly
when we have both lock and unlock screens present, which is true for the SIM
and PUK unlock cases.
The fix is to invoke onPause() and onResume() on both of them if they exist.
Verified the rest of the code correctly handles having both.
Also, when the user cancels, we now clear the fields.
Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
The Android Automerger [Fri, 18 Nov 2011 01:49:17 +0000 (17:49 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Fri, 18 Nov 2011 01:45:19 +0000 (17:45 -0800)]
am
398f80ea: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
398f80eacb8e59d868f287bf273a1253fe219ce4':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jim Miller [Fri, 18 Nov 2011 01:41:50 +0000 (17:41 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Joe Fernandez [Fri, 18 Nov 2011 01:34:33 +0000 (17:34 -0800)]
Merge "docs: Camera Features for developers" into ics-mr0
Jamie Gennis [Fri, 18 Nov 2011 01:12:45 +0000 (17:12 -0800)]
am
2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '
2ba13186b268de3527af6da1933a4b65877548d9':
SurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 01:12:43 +0000 (17:12 -0800)]
am
c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit '
c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
EGL: fix blob cache extension detection
Jamie Gennis [Fri, 18 Nov 2011 01:10:47 +0000 (17:10 -0800)]
Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 01:10:32 +0000 (17:10 -0800)]
Merge "EGL: fix blob cache extension detection" into ics-mr1
Joe Fernandez [Tue, 25 Oct 2011 18:52:10 +0000 (11:52 -0700)]
docs: Camera Features for developers
Change-Id: Ie85f9a5c6808a921b0f80a30749442369740a9c6
OSDN Git Service
