OSDN Git Service
Andreas Huber [Wed, 28 Sep 2011 23:08:59 +0000 (16:08 -0700)]
Merge "Support multiple NAL fragments per .mkv payload"
Roman Nurik [Wed, 28 Sep 2011 23:04:30 +0000 (16:04 -0700)]
Merge "Update Widget Design guidelines for ICS"
Adam Powell [Wed, 28 Sep 2011 23:02:13 +0000 (16:02 -0700)]
Merge "Fix bug
5386180 - Wire up action bar home/up for dialogs"
Adam Powell [Wed, 28 Sep 2011 22:52:57 +0000 (15:52 -0700)]
Fix bug
5386180 - Wire up action bar home/up for dialogs
Action bars in dialogs are largely an undocumented "feature" but they
do work - with the exception of this since it previously relied on the
host being an Activity. Make it work.
Change-Id: I52ae24c3bfdd9766e4c0f035183e7f148a4e0162
Roman Nurik [Wed, 28 Sep 2011 01:28:46 +0000 (18:28 -0700)]
Update Widget Design guidelines for ICS
Change-Id: I1b7b8f9c091d38ec1400ce3d8b06e644803544de
Justin Ho [Wed, 28 Sep 2011 22:25:49 +0000 (15:25 -0700)]
am
24664c00: Merge "Updated menu icon Bug:
5388009" into ics-factoryrom
* commit '
24664c0003f964ffe9f4fc98d69c802cddd0d7b0':
Updated menu icon Bug:
5388009
Justin Ho [Wed, 28 Sep 2011 22:25:48 +0000 (15:25 -0700)]
am
3b5a379d: Merge "Updated overflow menu icon Bug:
5388009" into ics-factoryrom
* commit '
3b5a379dda952faa6266c8fa794c6f0d3a192c13':
Updated overflow menu icon Bug:
5388009
Justin Ho [Wed, 28 Sep 2011 22:24:09 +0000 (15:24 -0700)]
Merge "Updated menu icon Bug:
5388009" into ics-factoryrom
Justin Ho [Wed, 28 Sep 2011 22:23:57 +0000 (15:23 -0700)]
Merge "Updated overflow menu icon Bug:
5388009" into ics-factoryrom
Justin Ho [Wed, 28 Sep 2011 22:08:24 +0000 (15:08 -0700)]
Merge "Downscaling circular assets with bilinear to fix jagged edges"
Andreas Huber [Wed, 28 Sep 2011 22:06:46 +0000 (15:06 -0700)]
Support multiple NAL fragments per .mkv payload
Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.
Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug:
5337218
Justin Ho [Wed, 28 Sep 2011 21:56:47 +0000 (14:56 -0700)]
Updated menu icon
Bug:
5388009
Change-Id: I3bc43a707f4fdb38021cf0cf9f76784f5e1192d9
Justin Ho [Wed, 28 Sep 2011 21:55:01 +0000 (14:55 -0700)]
Updated overflow menu icon
Bug:
5388009
Change-Id: I667d6ecf0e897c073c669b2b88ffe06a71ca704d
Michael Chan [Wed, 28 Sep 2011 21:44:39 +0000 (14:44 -0700)]
Merge "Changed translation for the day of the week zh-rTW"
Michael Chan [Wed, 28 Sep 2011 21:31:54 +0000 (14:31 -0700)]
Changed translation for the day of the week zh-rTW
Specifically replace 周 with 週
BUG:
5383038
Change-Id: If3589d0390f04d391487f545b79d4d7bfd567e97
Jesse Wilson [Wed, 28 Sep 2011 21:19:02 +0000 (14:19 -0700)]
Merge "Format NaN and Infinity as Doclava expects."
Jesse Wilson [Wed, 28 Sep 2011 21:04:52 +0000 (17:04 -0400)]
Format NaN and Infinity as Doclava expects.
Change-Id: I500e049132b3254e3b78e08c1875e0dc451b70b6
James Dong [Wed, 28 Sep 2011 20:46:49 +0000 (13:46 -0700)]
Merge "Flush resets the count of played audio frames"
Andreas Huber [Wed, 28 Sep 2011 20:13:33 +0000 (13:13 -0700)]
Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."
Xia Wang [Wed, 28 Sep 2011 19:40:07 +0000 (12:40 -0700)]
am
b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
* commit '
b2d17234b77cda555905e0da997f543708374246':
Reorganize media framework functional tests. Group tests into sub-packages
Xia Wang [Wed, 28 Sep 2011 19:38:15 +0000 (12:38 -0700)]
Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
Andreas Huber [Wed, 28 Sep 2011 19:37:36 +0000 (12:37 -0700)]
Support AMR, G.711 and vorbis audio in ACodec and friends.
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
Fred Quintana [Wed, 28 Sep 2011 18:47:46 +0000 (11:47 -0700)]
am
272101b3: Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom
* commit '
272101b308c7eb0a4639bed0106830a8d6b0f2a1':
Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen.
Fred Quintana [Wed, 28 Sep 2011 18:45:52 +0000 (11:45 -0700)]
Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom
John Reck [Wed, 28 Sep 2011 18:11:57 +0000 (11:11 -0700)]
Merge "Support for correctly scaling text selection handles"
Steve Block [Wed, 28 Sep 2011 17:11:55 +0000 (10:11 -0700)]
Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set"
Elliott Hughes [Wed, 28 Sep 2011 16:56:11 +0000 (09:56 -0700)]
Merge "Add ICS-specific notes to the JNI tips documentation."
Marco Nelissen [Wed, 28 Sep 2011 16:41:12 +0000 (09:41 -0700)]
Merge "Log a warning when a MediaPlayer is finalized without having being released. b/
5382634"
Marco Nelissen [Wed, 28 Sep 2011 16:21:11 +0000 (09:21 -0700)]
Log a warning when a MediaPlayer is finalized without having being released.
b/
5382634
Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
Brian Colonna [Wed, 28 Sep 2011 13:13:53 +0000 (06:13 -0700)]
Merge "Added landscape views for Face Unlock"
Brian Colonna [Wed, 28 Sep 2011 13:13:44 +0000 (06:13 -0700)]
Merge "Fix
5323545 - FaceLock no longer appears when taking a call"
Chih-Chung Chang [Wed, 28 Sep 2011 11:48:06 +0000 (04:48 -0700)]
Merge "Fix
5158468: Update floating window size when the anchor view size changes."
Flavio Lerda [Wed, 28 Sep 2011 11:38:00 +0000 (04:38 -0700)]
Merge "Do not format numbers starting with hash or star."
Chih-Chung Chang [Wed, 28 Sep 2011 09:57:10 +0000 (17:57 +0800)]
Fix
5158468: Update floating window size when the anchor view size changes.
Originally when surfaceChanged() happens, we remove the old window and
create a new window. This causes flickering. Now we just update the window
layout according to the size of the anchor view.
Change-Id: Id741dac07872e473f2c9829b626c5c9568e7e22d
Steve Block [Wed, 28 Sep 2011 09:45:28 +0000 (02:45 -0700)]
Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack"
Steve Block [Tue, 27 Sep 2011 21:39:45 +0000 (22:39 +0100)]
Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set
This makes sure that the page's SSL certificate is cleared when the page load
starts.
Follows on from https://android-git.corp.google.com/g/#/c/138147.
Bug:
5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
Kristian Monsen [Wed, 14 Sep 2011 15:29:23 +0000 (16:29 +0100)]
Hook up WebView.clearSslPreferences() for the Chromium HTTP stack
Note that this is an incomplete fix, as we do not clear the responses for
connections currently in use, as they maintain their own cache. See
http:/b/
5324235.
Bug:
5287216
Change-Id: I18f6638efeff0bee1e7ffed606be1444d683bebd
Mathew Inwood [Wed, 28 Sep 2011 08:20:04 +0000 (01:20 -0700)]
Merge "Document thrown IllegalArgumentException."
James Dong [Wed, 28 Sep 2011 05:47:25 +0000 (22:47 -0700)]
Flush resets the count of played audio frames
Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug:
5331470
John Reck [Wed, 28 Sep 2011 03:14:39 +0000 (20:14 -0700)]
Support for correctly scaling text selection handles
Bug:
5367280
Change-Id: If32fdc9cd82d1a66bc96446a123c44d9edd9d340
Fabrice Di Meglio [Wed, 28 Sep 2011 01:45:57 +0000 (18:45 -0700)]
Merge "Fix bug #
5376028 Arabic text is kinda broken - disappearing glyphs"
Guang Zhu [Wed, 28 Sep 2011 01:27:36 +0000 (18:27 -0700)]
Merge "Use CPU upload path in DRT"
Guang Zhu [Wed, 28 Sep 2011 01:20:45 +0000 (18:20 -0700)]
Use CPU upload path in DRT
This makes it the same as default browser settings (for now). Otherwise
the test may crash due to GPU OOM.
This is to be a workaround only, and should be reverted after the bug is
fixed.
Bug:
5382134
Change-Id: I82a8dd83b69c8fceb657af9e32a2c5fa66ead2ce
Romain Guy [Wed, 28 Sep 2011 00:45:46 +0000 (17:45 -0700)]
Merge "Add a bit more doc to TextureView"
Romain Guy [Wed, 28 Sep 2011 00:42:10 +0000 (17:42 -0700)]
Add a bit more doc to TextureView
Change-Id: Ib76c80d8f70ede1bb63db319bca1e93c489def4d
Fred Quintana [Wed, 28 Sep 2011 00:24:32 +0000 (17:24 -0700)]
Fix a bug in the account chooser where relaunching an in-progress flow
results in a blank screen.
The fix involves making the first activity just call the account
type chooser to get the account type to add, rather than having
the account type chooser also kick off the AccountManager.addAccount()
request itself. Instead the first activity will get the type
back and then call AccountManager.addAccount()
Bug:
5346810
Change-Id: I4a0cf2370971b98f8ee0910f5401d97e999e546b
Peter Ng [Tue, 27 Sep 2011 23:10:17 +0000 (16:10 -0700)]
Downscaling circular assets with bilinear to fix jagged edges
Bug:
5349016
Change-Id: I4960bf1eb0c65211682573c8d80840b41e103894
Romain Guy [Tue, 27 Sep 2011 23:44:28 +0000 (16:44 -0700)]
am
0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge.
* commit '
0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde':
CherryPick 043a6b from master: do not merge.
Jesse Wilson [Tue, 27 Sep 2011 23:31:10 +0000 (16:31 -0700)]
Merge "Test to demonstrate NPE in DefaultRequestDirector"
Jesse Wilson [Tue, 27 Sep 2011 23:23:13 +0000 (19:23 -0400)]
Test to demonstrate NPE in DefaultRequestDirector
When the HTTP client encountered a server failure while
talking through a proxy, it fails with an NullPointerException
and not an IOException.
Change-Id: I4b287105bf78b832d034557e37e74ce576c7894d
Bug: http://b/
5372438
Elliott Hughes [Tue, 27 Sep 2011 23:27:31 +0000 (16:27 -0700)]
Add ICS-specific notes to the JNI tips documentation.
Change-Id: I9be8f2452063363d9f2b6c28b5a2eacac09308a1
Xia Wang [Tue, 27 Sep 2011 23:00:20 +0000 (16:00 -0700)]
Reorganize media framework functional tests.
Group tests into sub-packages
Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
Romain Guy [Tue, 27 Sep 2011 22:37:54 +0000 (15:37 -0700)]
CherryPick 043a6b from master: do not merge.
Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.
Bug #
5352896
The emulator doesn't support OpenGL ES 2.0.
Change-Id: I3d60f8e4b5c5431e9e21471c576f4a9382f4693f
Xavier Ducrohet [Tue, 27 Sep 2011 22:47:55 +0000 (15:47 -0700)]
Merge "Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #
5352896"
Romain Guy [Tue, 27 Sep 2011 22:37:54 +0000 (15:37 -0700)]
Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.
Bug #
5352896
The emulator doesn't support OpenGL ES 2.0.
Change-Id: I7f647d78d4d8ad87d12a5f009d5d37f6aeaecf72
Andreas Huber [Tue, 27 Sep 2011 22:26:43 +0000 (15:26 -0700)]
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
Peter Ng [Tue, 27 Sep 2011 22:07:39 +0000 (15:07 -0700)]
Merge "Lockscreen handle is now a locked icon and not an unlocked"
Andreas Huber [Tue, 27 Sep 2011 22:05:40 +0000 (15:05 -0700)]
Cut down on AwesomePlayer and OMXCodec's verbosity.
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug:
5382014
Peter Ng [Tue, 27 Sep 2011 00:00:33 +0000 (17:00 -0700)]
Lockscreen handle is now a locked icon and not an unlocked
Bug:
5231211
Change-Id: I4ee84d142d972c42ec5f28ed921a2edadf11adf7
Eric Fischer [Tue, 27 Sep 2011 21:55:44 +0000 (14:55 -0700)]
am
ce9756d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
ce9756d06dd8aebb7b92879ab3b02bbe8f290992':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 27 Sep 2011 21:54:12 +0000 (14:54 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Scott Main [Tue, 27 Sep 2011 21:49:12 +0000 (14:49 -0700)]
Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links"
Brian Colonna [Tue, 27 Sep 2011 21:38:22 +0000 (17:38 -0400)]
Added landscape views for Face Unlock
- Uses grid view to cover PIN/pattern area in the same way it does
for potrait layouts
Change-Id: I64672f3052c136901850baf73c8242930df7a64f
Eric Fischer [Tue, 27 Sep 2011 21:29:36 +0000 (14:29 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ifb1966956dcc9fe4e082708bb3fb30d5224308e7
Jamie Gennis [Tue, 27 Sep 2011 21:24:09 +0000 (14:24 -0700)]
Merge changes Ib302d79e,Ib4ee085f
* changes:
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
Eric Laurent [Tue, 27 Sep 2011 21:07:45 +0000 (14:07 -0700)]
Merge "Fix issue
5373658: memory leak in AudioFlinger."
Scott Main [Tue, 27 Sep 2011 05:59:38 +0000 (22:59 -0700)]
docs: mix of BT and NFC javadoc updates
Add Health profile to various discussions about profiles
Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links
Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
Andreas Huber [Tue, 27 Sep 2011 20:36:22 +0000 (13:36 -0700)]
Merge "Signal an appropriate error even if there are no active streams yet."
Alon Albert [Tue, 27 Sep 2011 20:29:11 +0000 (13:29 -0700)]
Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:"
Alon Albert [Thu, 22 Sep 2011 21:26:16 +0000 (14:26 -0700)]
Add Detailed Sync Stats Section
Also improve history formatting
Here's a smaple of what it looks like:
Detailed Statistics (Recent history): 20 40s
-------------------------------------------------------------------------------------
com.android.contacts : 9/45% 11/27%
aagmtest1@gmail.com/com.google : 3/15% 4/11%
aagmtest2@gmail.com/com.google : 3/15% 3/9%
aalbert@google.com/com.google : 3/15% 2/6%
-------------------------------------------------------------------------------------
gmail-ls : 6/30% 22/56%
-------------------------------------------------------------------------------------
com.android.calendar : 3/15% 5/14%
aagmtest1@gmail.com/com.google : 1/5% 4/12%
aagmtest2@gmail.com/com.google : 1/5% 0/0%
aalbert@google.com/com.google : 1/5% 0/0%
-------------------------------------------------------------------------------------
com.google.android.apps.plus.content.EsGooglePhotoProvider : 2/10% 0/1%
aagmtest1@gmail.com/com.google : 1/5% 0/1%
aagmtest2@gmail.com/com.google : 1/5% 0/0%
-------------------------------------------------------------------------------------
Recent Sync History
#1 : 2011-09-23 15:18:35 SERVER 0.8s aalbert@google.com/com.google gmail-ls
#2 : 2011-09-23 15:17:56 SERVER 1.3s 00:38
#3 : 2011-09-23 15:17:52 SERVER 4.6s 00:04
#4 : 2011-09-23 15:17:45 SERVER 1.7s 00:06
#5 : 2011-09-23 15:16:51 LOCAL 0.8s aagmtest2@gmail.com/com.google com.android.contacts
#6 : 2011-09-23 15:16:51 LOCAL 0.7s aalbert@google.com/com.google com.android.contacts
#7 : 2011-09-23 15:16:50 LOCAL 0.7s aagmtest1@gmail.com/com.google com.android.contacts
#8 : 2011-09-23 15:15:35 LOCAL 0.7s aalbert@google.com/com.google com.android.contacts
#9 : 2011-09-23 15:15:34 LOCAL 0.8s aagmtest2@gmail.com/com.google com.android.contacts
#10 : 2011-09-23 15:15:33 LOCAL 1.9s aagmtest1@gmail.com/com.google com.android.contacts
#11 : 2011-09-23 15:14:37 LOCAL 1.3s aalbert@google.com/com.google com.android.contacts
#12 : 2011-09-23 15:14:35 LOCAL 2.0s aagmtest1@gmail.com/com.google com.android.contacts
#13 : 2011-09-23 15:14:32 LOCAL 2.2s aagmtest2@gmail.com/com.google com.android.contacts
#14 : 2011-09-23 15:13:41 SERVER 1.3s aalbert@google.com/com.google gmail-ls
#15 : 2011-09-23 15:13:34 LOCAL 0.3s aalbert@google.com/com.google com.android.calendar
#16 : 2011-09-23 15:13:34 LOCAL 0.4s aagmtest2@gmail.com/com.google com.android.calendar
#17 : 2011-09-23 15:13:33 SERVER 0.1s aagmtest2@gmail.com/com.google com.google.android.apps.plus.content.EsGooglePhotoProvider
#18 : 2011-09-23 15:13:33 SERVER 0.5s aagmtest1@gmail.com/com.google com.google.android.apps.plus.content.EsGooglePhotoProvider
#19 : 2011-09-23 15:13:29 LOCAL 4.9s aagmtest1@gmail.com/com.google com.android.calendar
#20 : 2011-09-23 15:13:28 SERVER 13.1s aalbert@google.com/com.google gmail-ls
Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
Daniel Sandler [Tue, 27 Sep 2011 20:08:54 +0000 (13:08 -0700)]
am
25bb73eb: Merge "Remove "excessive sync" icon." into ics-factoryrom
* commit '
25bb73eb1bc16921cc013b9b150c2d440d650c39':
Remove "excessive sync" icon.
Daniel Sandler [Tue, 27 Sep 2011 20:06:01 +0000 (13:06 -0700)]
Merge "Remove "excessive sync" icon." into ics-factoryrom
David 'Digit' Turner [Tue, 27 Sep 2011 19:36:15 +0000 (12:36 -0700)]
am
45c65741: am
be49703e: am
d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it.
* commit '
45c657411774f900c79f6cb611bc1dc7887a1865':
opengl: Ensure we only load the GLES emulation library when the emulator supports it.
Jamie Gennis [Tue, 27 Sep 2011 19:32:17 +0000 (12:32 -0700)]
am
da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
* commit '
da42e0faaa95c796dc49f3b38023562dab6584a7':
SurfaceFlinger: fix setting default buffer size
Jamie Gennis [Tue, 27 Sep 2011 19:28:59 +0000 (12:28 -0700)]
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
Andreas Huber [Tue, 27 Sep 2011 19:12:25 +0000 (12:12 -0700)]
Signal an appropriate error even if there are no active streams yet.
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug:
5372901
Eric Laurent [Tue, 27 Sep 2011 19:07:15 +0000 (12:07 -0700)]
Fix issue
5373658: memory leak in AudioFlinger.
Unlink PowerManagerService binder interface death recipient
in ThreadBase destructor.
Change-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5
Adam Powell [Tue, 27 Sep 2011 19:06:33 +0000 (12:06 -0700)]
Merge "Improve docs in BaseAdapter."
Adam Powell [Tue, 27 Sep 2011 18:32:59 +0000 (11:32 -0700)]
Improve docs in BaseAdapter.
Change-Id: Idbe19f9b01132c28b4960515c23bd28e3729fd5d
Tsu Chiang Chuang [Tue, 27 Sep 2011 18:18:13 +0000 (11:18 -0700)]
Merge "adding packet count and removing extra uid stats that were used for debugging."
Steve Block [Tue, 27 Sep 2011 17:52:50 +0000 (10:52 -0700)]
Merge changes If97c4d76,I1cd975b1
* changes:
Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
Eric Laurent [Tue, 27 Sep 2011 17:32:17 +0000 (10:32 -0700)]
Merge "Fix issue
5373048: AudioCache decode errors"
Peter Ng [Tue, 27 Sep 2011 17:24:54 +0000 (10:24 -0700)]
Merge "Fixed jaggy circles in pattern unlock"
Eric Laurent [Tue, 27 Sep 2011 16:48:56 +0000 (09:48 -0700)]
Fix issue
5373048: AudioCache decode errors
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.
Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
The Android Open Source Project [Tue, 27 Sep 2011 17:10:44 +0000 (10:10 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I9c75782f72a7da6e1e9de183146841f8f4bebc6b
Justin Ho [Tue, 27 Sep 2011 16:56:25 +0000 (09:56 -0700)]
am
5fd141c2: Merge "Updated stat_sys icons" into ics-factoryrom
* commit '
5fd141c245051f2fa84bf2559a417577391e40df':
Updated stat_sys icons
Justin Ho [Tue, 27 Sep 2011 16:54:40 +0000 (09:54 -0700)]
Merge "Updated stat_sys icons" into ics-factoryrom
Brian Colonna [Mon, 26 Sep 2011 17:52:25 +0000 (13:52 -0400)]
Fix
5323545 - FaceLock no longer appears when taking a call
Prior to this fix if the screen was off and a call was received, the
onScreenTurnedOn() callback would bring up the FaceLock service,
which would cover the phone interface. It now requires the call state
to be CALL_STATE_IDLE to start FaceLock. When the phone interface
closes, the user is left at the backup lock screen. Bringing FaceLock
up after a call ends does not seem like the correct thing to do.
While working near the FaceLock callback code, the sleepDevice()
callback was removed because it is no longer used (Fix
5327896).
Some cleanup was also done with regards to KeyguardViewManager.
FaceLock calls were being made from the KeyguardViewManager in
onScreenTurnedOn() and onScreenTurnedOff() via an interface to
LockPatternKeyguardView. This level of indirection was removed
because it can just be handled inside of the corresponding calls
in LockPatternKeyguardView. Likewise the FaceLock functionality
inside of hide() in KeyguardViewManager is now in
onDetachedFromWindow() in LockPatternKeyguardView. Overall this
is much cleaner, especially considering interfacing through
KeyguardViewBase was a bit of a hack.
Patch Set 2:
- Now using KeyguardUpdateMonitor to get phone state
- Removed unnecessary wrapper functions for hiding / viewing
FaceLock area
- These were really only there because at one point I was calling
them from KeyguardViewManager and the naming was confusing
- Removed if(DEBUG) from a couple of log messages that are actually
warnings that shouldn't show up and I want to know if they happen
even if I don't have DEBUG set to true
Change-Id: Id7befc47dd421156ff6cdb3aaf62fc76fe9cfad2
Daniel Sandler [Tue, 27 Sep 2011 16:23:05 +0000 (09:23 -0700)]
am
abff032e: Draw smaller system status icons without scaling.
* commit '
abff032e783398be7a1c6b7e1e25a73a8467adcf':
Draw smaller system status icons without scaling.
Teng-Hui Zhu [Tue, 27 Sep 2011 16:07:13 +0000 (09:07 -0700)]
Merge "Double check the permission before setting the Wake Lock"
Steve Block [Tue, 27 Sep 2011 12:22:17 +0000 (13:22 +0100)]
Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
This looks like a copy-paste error from other CallbackProxy methods which call
back to the WebViewClient or WebChromeClient, rather than the WebView.
Also remove '@hide' annotations. These are superfluous as the class is not
public.
Bug:
5287216
Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
Steve Block [Tue, 27 Sep 2011 11:51:18 +0000 (12:51 +0100)]
Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError().
Bug:
5287216
Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
Daniel Sandler [Tue, 27 Sep 2011 15:19:34 +0000 (11:19 -0400)]
Draw smaller system status icons without scaling.
Bug:
5297795
Change-Id: I11dc3a21b2e1111963b1cd9621434747f1757a67
Flavio Lerda [Mon, 26 Sep 2011 17:40:37 +0000 (18:40 +0100)]
Do not format numbers starting with hash or star.
If the user asks to format a number that starts with either a hash or a
star symbol, do not further format the phone number since we are not
actually able to parse such a number correctly and current this results
in the star or hash being dropped.
Bug:
5362177
Change-Id: Iff8d317c087d0ca07f2b107459ce8c47882ef367
The Android Automerger [Tue, 27 Sep 2011 10:52:49 +0000 (03:52 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Irfan Sheriff [Tue, 27 Sep 2011 05:11:03 +0000 (22:11 -0700)]
Merge "Switch to cfg based signal_poll command"
Scott Main [Tue, 27 Sep 2011 04:55:24 +0000 (21:55 -0700)]
Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5"
Scott Main [Tue, 27 Sep 2011 04:52:05 +0000 (21:52 -0700)]
docs: fix markup in javadocs
Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5
Jim Miller [Tue, 27 Sep 2011 03:40:59 +0000 (20:40 -0700)]
am
b4f0a9f3: Merge "Fix
5326463: rework sim state handling in lockscreen" into ics-factoryrom
* commit '
b4f0a9f3894c1f039168ad672f4aa194999c7cdd':
Fix
5326463: rework sim state handling in lockscreen
Christopher Tate [Tue, 27 Sep 2011 03:40:56 +0000 (20:40 -0700)]
am
7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom
* commit '
7462251b0a3f2601236b599bcabf54451143b704':
Don't hang in restore if the transport reports failure