Nick Pelly
b04cce0eb5
Throw a nicer error message when using an invalid context to create Nfc
...
This can happen when using getContext() instead of getTargetContext()
in an InstrumentationTestCase.
Bug: 5644274
Change-Id: I020a637c271e25bcf25ae2927fd878001d5fea0a
2011-11-21 17:09:31 -08:00
Teng-Hui Zhu
f45aa7da2b
HTML5 Video runs into super full screen mode
...
bug:5569146
Browser change
https://android-git.corp.google.com/g/#/c/151035/
Change-Id: Ib8449a670caf4aa2b540a170ed5e9f6adea2b12e
2011-11-21 16:56:08 -08:00
satok
afb1a9e279
Merge "add sentence level spell checker hidden apis"
2011-11-21 16:30:07 -08:00
satok
0dc1f648a0
add sentence level spell checker hidden apis
...
Change-Id: If65c89044bed064fd01a554e33176f64f7c21c0f
2011-11-22 09:18:12 +09:00
Amith Yamasani
45f06460e9
Fix an NPE on overflow in BatteryStats history.
...
When the battery stats buffer hits 128KB, it hits a code path
that causes an NPE. This can happen depending on usage and charging
patterns and manifest in bad ways, such as failure to boot up
or random crashes, or refusing to go to sleep.
Bug: 5645407
Change-Id: I21d5d189431f776f25bcb7d598c86e598ad8cb17
2011-11-21 16:08:34 -08:00
Nick Pelly
7dffeeefbb
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
2011-11-21 16:05:33 -08:00
Nick Pelly
043a8b149d
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
2011-11-21 16:03:40 -08:00
Nick Pelly
a5cb9f4217
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
2011-11-21 14:55:29 -08:00
John Reck
ced6262e93
am 0507ac4d: Use isHighEndGfx to determine texture pool
...
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
Use isHighEndGfx to determine texture pool
2011-11-21 14:14:11 -08:00
Irfan Sheriff
b9c955664b
Add support for infinite dhcp lease time
...
Bug: 5649076
Change-Id: I29e3b41d8bd1173b155f3173e65a3b45ad17a45c
2011-11-21 14:03:00 -08:00
John Reck
0507ac4d94
Use isHighEndGfx to determine texture pool
...
Bug: 5639612
Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00
Romain Guy
31f2c2e946
Notify views when EGL resources are about to be destroyed
...
Bug #5639899
Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
2011-11-21 10:55:41 -08:00
Wu-cheng Li
0cac6aa993
Move Camera.Sound to a stand-alone class CameraSound.
...
bug:5640219
Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
2011-11-21 17:57:33 +08:00
Gilles Debunne
1a22db2927
IOOB in text selection.
...
Several issues here:
1. when selection has been set to size 0 (should not be possible, but see 2.),
moving any of the selection handles will create an IOOB because we add/substract 1
with no test. Added min/max.
2. the text change detection, which stop selection mode, was done in
handleTextChanged. We need to go deeper. Some methods (such as setText())
directly call the more atomic sendOnTextChange(). Moved the test down
to this method. As a result, pressing the 'x' button in the QuickSearchBox
correctly stops selection mode (it used to leave an empty selection).
This change may also solve some weird similar issues in extracted mode where
it is sometimes possible to end up with a 0-length selection.
It may also impact Bug 5555929 since spellCheckSpans will now be correctly
updated on ANY text change.
3. the before != after test is flawed. When this method is called, the text
has been changed and selection mode should be stopped even when the new text
happens to have the same size.
Change-Id: I869ef728662f4350f22ed6149dd42db193c333ed
2011-11-20 22:25:20 +01:00
Kristian Monsen
38bc731875
am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
...
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
Improving PictureListener deprecating comments
2011-11-20 07:31:41 -08:00
Kristian Monsen
98dbf35ff3
am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
...
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
Improving PictureListener deprecating comments
2011-11-20 07:28:35 -08:00
Kristian Monsen
7859c1842c
Merge "Improving PictureListener deprecating comments" into ics-mr1
2011-11-20 07:26:59 -08:00
Daniel Sandler
711683cd96
am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
...
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
Dreams (now Screen Candy) development.
2011-11-19 20:48:21 -08:00
Daniel Sandler
75d8eb2a81
am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
...
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
2011-11-19 20:44:36 -08:00
Daniel Sandler
9b5d7a59f3
Merge "Dreams (now Screen Candy) development." into ics-mr1
2011-11-19 20:42:19 -08:00
Svetoslav Ganov
e9dc7c9f03
am bdc2912d: am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
...
* commit 'bdc2912da64e5e6402c73997d637224d905ae825':
Text selection AccessibilityEvents are missing text.
2011-11-18 15:23:19 -08:00
Wei Huang
2e5f5c973f
am bcedde3c: am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
...
* commit 'bcedde3cd614e2a241f4c4dad626b840fd9c2424':
Unlock camera AWB lock only when white-balance is changed.
2011-11-18 15:23:17 -08:00
Bart Sears
3f6114164f
am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
...
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
Content and viewport rects set in one step.
2011-11-18 15:22:57 -08:00
Svetoslav Ganov
44e3a8a4ac
am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
...
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
2011-11-18 14:41:09 -08:00
Svetoslav Ganov
d8a3cabcb1
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
2011-11-18 14:39:05 -08:00
Daisuke Miyakawa
26650aef86
Merge "Introduce Callable URI as hidden API"
2011-11-18 14:02:28 -08:00
Wei Huang
2361032a4d
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.
2011-11-18 14:02:15 -08:00
Wei Huang
c2fff5ea39
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
2011-11-18 14:00:09 -08:00
satok
e30983e799
Do not merge. Fix a memory leak of a Binder in SpellCheckerService
...
Bug: 5499490
Bug: 5620722
Change-Id: Idfc686595ae8459fff009386332821762d03cbc8
2011-11-19 06:53:31 +09:00
Bart Sears
29df4a87a7
am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
...
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
Content and viewport rects set in one step.
2011-11-18 11:49:40 -08:00
Bart Sears
e6a96560ed
Merge "Content and viewport rects set in one step." into ics-mr1
2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394
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
2011-11-18 10:26:54 -08:00
Kristian Monsen
4aad1022eb
Improving PictureListener deprecating comments
...
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Daniel Sandler
2d54536d08
Dreams (now Screen Candy) development.
...
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"
Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
2011-11-18 08:00:04 -08:00
Wu-cheng Li
b838d8d4a2
Unlock camera AWB lock only when white-balance is changed.
...
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
2011-11-18 15:21:47 +08:00
Matthew Xie
a5ca41e9cc
am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit 'a4f5c425b822a46fc49bc87bba82688570584ff1':
Check the bluetooth state for getUuid call
2011-11-17 15:13:03 -08:00
Nick Pelly
f955d057dd
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
...
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
Fix NPE on devices that don't have NFC.
2011-11-17 15:12:56 -08:00
Michael Kolb
778f146cf4
am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
...
* commit '5397bb52fba04e8dc8496d731611210213847308':
Draw input field focus ring in WebTextView
2011-11-17 15:12:49 -08:00
John Reck
a93a7d6d15
am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1
...
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
Fix add single character check
2011-11-17 13:20:15 -08:00
John Reck
6810017f6a
am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
...
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
Undeprecate LayoutAlgorithm
2011-11-17 13:20:12 -08:00
Matthew Xie
430d36fef9
am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit '2b9af44e401d884469869a4ac0933bfa727d3135':
Check the bluetooth state for getUuid call
2011-11-17 13:12:39 -08:00
Matthew Xie
2b9af44e40
am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit '6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
2011-11-17 13:10:14 -08:00
Nick Pelly
480f50f483
am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
...
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
Fix NPE on devices that don't have NFC.
2011-11-17 12:50:39 -08:00
Nick Pelly
63b7360e9d
Merge "Fix NPE on devices that don't have NFC." into ics-mr1
2011-11-17 12:48:48 -08:00
Michael Kolb
7e0e2dc28d
am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
...
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
Draw input field focus ring in WebTextView
2011-11-17 12:24:43 -08:00
Michael Kolb
852585c034
Merge "Draw input field focus ring in WebTextView" into ics-mr1
2011-11-17 12:22:58 -08:00
Ben Murdoch
131ed03f30
am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
...
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 11:46:30 -08:00
Nicolas Roard
0ecd89bce3
am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
...
* commit 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
2011-11-17 11:46:09 -08:00
Michael Kolb
edb39ce5b4
Draw input field focus ring in WebTextView
...
Bug: 5628053
Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
2011-11-17 11:08:59 -08:00
Jesse Wilson
9ab5fa0aaa
Merge "Add a link from LruCache to the Android support package (compatibility library)."
2011-11-17 10:42:48 -08:00