Wink Saville
30ed509234
am 9328aa84: am 215ccb32: am d660b610: am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev
...
* commit '9328aa84fa519b818d612d5dcd51b2c963a0ae93':
show 3G icon for CDMA/1xRTT
2012-08-14 10:50:35 -07:00
Wink Saville
9328aa84fa
am 215ccb32: am d660b610: am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev
...
* commit '215ccb32c74a41569ddcb203aa802201e40bb386':
show 3G icon for CDMA/1xRTT
2012-08-14 10:47:18 -07:00
Wink Saville
215ccb32c7
am d660b610: am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev
...
* commit 'd660b610c8b98d23263d3863ae8438a569597a16':
show 3G icon for CDMA/1xRTT
2012-08-14 10:44:50 -07:00
Chet Haase
6c53920187
am bd94e98f: am e8165ac5: Merge "Optimize interactions with glyph cache" into jb-mr1-dev
...
* commit 'bd94e98f6a430c504cc09844962c0ac8b664913b':
Optimize interactions with glyph cache
2012-08-14 10:43:47 -07:00
Wink Saville
d660b610c8
am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev
...
* commit '116748d0d16f8e747fdfdaf2326d9a58bb2317d5':
show 3G icon for CDMA/1xRTT
2012-08-14 10:42:50 -07:00
Chet Haase
bd94e98f6a
am e8165ac5: Merge "Optimize interactions with glyph cache" into jb-mr1-dev
...
* commit 'e8165ac5fdd95ddcf65309b4225f55074b12ccc4':
Optimize interactions with glyph cache
2012-08-14 10:41:31 -07:00
Wink Saville
116748d0d1
Merge "show 3G icon for CDMA/1xRTT" into jb-dev
2012-08-14 10:40:34 -07:00
Chet Haase
e8165ac5fd
Merge "Optimize interactions with glyph cache" into jb-mr1-dev
2012-08-14 10:38:45 -07:00
Chet Haase
e816baea65
Optimize interactions with glyph cache
...
There are two fixes here:
- precaching: instead of caching-then-drawing whenever there is a new
glyph, we cache at DisplayList record time. Then when we finally draw that
DisplayList, we just upload the affected texture(s) once, instead of once
per change. This is a huge savings in upload time, especially when there are
larger glyphs being used by the app.
- packing: Previously, glyphs would line up horizontally on each cache line, leaving
potentially tons of space vertically, especially when smaller glyphs got put into cache
lines intended for large glyphs (which can happen when an app uses lots of unique
glyphs, a common case with, for example, chinese/japanese/korean languages). The new
approach packs glyphs vertically as well as horizontally to use the space more efficiently
and provide space for more glyphs in these situations.
Change-Id: I84338aa25db208c7bf13f3f92b4d05ed40c33527
2012-08-14 10:33:30 -07:00
Madan Ankapura
5333400bd5
show 3G icon for CDMA/1xRTT
...
when config_showMin3G is enabled to true in a CDMA device
Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2012-08-14 10:17:54 -07:00
Narayan Kamath
13f8215179
am 31d68f42: am 9c3d7a88: Fixes to TextToSpeechService#synthesizeToFile
...
* commit '31d68f4268f190ca9c0e56cdc20e6e3800c37f35':
Fixes to TextToSpeechService#synthesizeToFile
2012-08-14 08:43:20 -07:00
Narayan Kamath
824c393b56
am 8df5472b: am ed4e541a: Fix bug in BlockingAudioTrack.
...
* commit '8df5472b64f542dbf3fbf5192312f3f1f239463f':
Fix bug in BlockingAudioTrack.
2012-08-14 08:41:38 -07:00
Narayan Kamath
31d68f4268
am 9c3d7a88: Fixes to TextToSpeechService#synthesizeToFile
...
* commit '9c3d7a888d0c5c09f0153e81018ff68aa6e91712':
Fixes to TextToSpeechService#synthesizeToFile
2012-08-14 08:41:23 -07:00
Narayan Kamath
8df5472b64
am ed4e541a: Fix bug in BlockingAudioTrack.
...
* commit 'ed4e541a20cc662b8399844684d18ad0060bd1cb':
Fix bug in BlockingAudioTrack.
2012-08-14 08:39:40 -07:00
Narayan Kamath
9c3d7a888d
Fixes to TextToSpeechService#synthesizeToFile
...
- Fixes a strict mode violation, defers file validity checks
to when the engine starts synthesizing audio.
- Fixes some log spam when done() is called twice.
bug:6215680
bug:5415258
Change-Id: I4001be848b5208422d4091b7398e94ed311c649f
2012-08-14 08:38:26 -07:00
Narayan Kamath
ed4e541a20
Fix bug in BlockingAudioTrack.
...
Will be seen when createStreamingAudioTrack() returns null,
which will happen if the audioflinger / audiomanager are unhealthy.
Also removes some confusing synchronization from this class.
bug:6636401
Change-Id: Iaf68a305665b7bc973898145e9cd1563e2569a2b
2012-08-14 08:36:27 -07:00
Daniel Sandler
da4ab9114a
am b7b6f820: am a6aef1bb: Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev
...
* commit 'b7b6f8200dca3e65fe84cf41342197fb29acecb6':
New status bar capable of multiple sliding panels.
2012-08-14 08:01:00 -07:00
Steve Block
9ccdb0461c
am 3d935621: am 27f3e32e: Clarify JavaDoc for WebView.loadData()
...
* commit '3d93562115237d8a893f3e686e44116ba506d57a':
Clarify JavaDoc for WebView.loadData()
2012-08-14 07:59:11 -07:00
Daniel Sandler
b7b6f8200d
am a6aef1bb: Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev
...
* commit 'a6aef1bbb4382fa5f89d0b7ad2cc46be4c6de1e7':
New status bar capable of multiple sliding panels.
2012-08-14 07:58:54 -07:00
Steve Block
3d93562115
am 27f3e32e: Clarify JavaDoc for WebView.loadData()
...
* commit '27f3e32ee181ccd809fbe74ec5f7fb43aea197f7':
Clarify JavaDoc for WebView.loadData()
2012-08-14 07:57:02 -07:00
Daniel Sandler
a6aef1bbb4
Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev
2012-08-14 07:56:44 -07:00
Steve Block
27f3e32ee1
Clarify JavaDoc for WebView.loadData()
...
Bug: 5461416
Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710
2012-08-14 15:54:35 +01:00
Matthew Xie
6e8f4d7820
am 3fe98084: am 58de1427: Merge "Implement enableNoAutoconnect()" into jb-mr1-dev
...
* commit '3fe98084e661f29c769664463f602a90a72c35c8':
Implement enableNoAutoconnect()
2012-08-14 00:42:09 -07:00
Matthew Xie
3fe98084e6
am 58de1427: Merge "Implement enableNoAutoconnect()" into jb-mr1-dev
...
* commit '58de1427c313e0debf2a929931e8c4065d4d46c5':
Implement enableNoAutoconnect()
2012-08-14 00:39:16 -07:00
Matthew Xie
58de1427c3
Merge "Implement enableNoAutoconnect()" into jb-mr1-dev
2012-08-14 00:37:01 -07:00
Ganesh Ganapathi Batta
fffa86ba83
Implement enableNoAutoconnect()
...
Adding enableNoAutoconnect() API support in Bluetooth service
to let BT enable in quiet mode
Change-Id: I546f3ceb298082a9c9a698f406379470e3cc0d4f
2012-08-14 00:18:07 -07:00
Jeff Brown
1d89d2b56d
am adeadda2: am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev
...
* commit 'adeadda2027ecc87399ce4504145a5bcc78e1bec':
Add a toString() method to Sensor for debugging purposes.
2012-08-13 23:19:44 -07:00
Jeff Brown
adeadda202
am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev
...
* commit 'caaeda955bd80df9d9ab310e7ab504865a2e32e9':
Add a toString() method to Sensor for debugging purposes.
2012-08-13 23:17:24 -07:00
Jeff Brown
caaeda955b
Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev
2012-08-13 23:14:56 -07:00
Mike Lockwood
6e5a4946dd
am c18184f1: am 510cff94: am f02354e2: am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
...
* commit 'c18184f14da6128db51b1343c6e466ac293a00e7':
Added missing USB_DEVICE_ATTACHED broadcast to running Activity
2012-08-13 20:48:17 -07:00
Mike Lockwood
c18184f14d
am 510cff94: am f02354e2: am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
...
* commit '510cff946874b8408664c86f9935d6a38f770e82':
Added missing USB_DEVICE_ATTACHED broadcast to running Activity
2012-08-13 20:46:32 -07:00
Mike Lockwood
510cff9468
am f02354e2: am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
...
* commit 'f02354e208ec7b7e0dee68e12c0b5cde86a0f20a':
Added missing USB_DEVICE_ATTACHED broadcast to running Activity
2012-08-13 20:45:04 -07:00
Mike Lockwood
f02354e208
am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
...
* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
Added missing USB_DEVICE_ATTACHED broadcast to running Activity
2012-08-13 20:42:42 -07:00
Mike Lockwood
9064a48365
Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
2012-08-13 19:59:38 -07:00
Joe Malin
929b7ef46a
am ad4abf7d: am 863b19bc: Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev
...
* commit 'ad4abf7dcae59f3b90929ba7080f4c1b012b1b1f':
Bug 6954576: Typos and errors in topic
2012-08-13 18:07:30 -07:00
Joe Malin
ad4abf7dca
am 863b19bc: Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev
...
* commit '863b19bc8fcfa436011781b67a237fcce3cb703a':
Bug 6954576: Typos and errors in topic
2012-08-13 18:05:02 -07:00
Nick Kralevich
cbb6011778
am f5fb3bdf: am ab7cd91a: Merge "Spelling." into jb-mr1-dev
...
* commit 'f5fb3bdf7c5554c5a2428d92add46bfef02cbd39':
Spelling.
2012-08-13 18:04:36 -07:00
Christopher Tate
4c02cca213
am f5c0cf90: am bf7d2220: Merge "Don\'t back up / restore non-primary users\' data" into jb-mr1-dev
...
* commit 'f5c0cf90838ecb95893c9679fb5e352343fac12a':
Don't back up / restore non-primary users' data
2012-08-13 18:02:52 -07:00
Nick Kralevich
f5fb3bdf7c
am ab7cd91a: Merge "Spelling." into jb-mr1-dev
...
* commit 'ab7cd91a799bb1eb3410045f1449642179a4a76e':
Spelling.
2012-08-13 18:02:19 -07:00
Joe Malin
863b19bc8f
Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev
2012-08-13 18:02:16 -07:00
Christopher Tate
f5c0cf9083
am bf7d2220: Merge "Don\'t back up / restore non-primary users\' data" into jb-mr1-dev
...
* commit 'bf7d222011bcb417a2d6ab0f086b25e1608445cb':
Don't back up / restore non-primary users' data
2012-08-13 18:00:42 -07:00
Nick Kralevich
ab7cd91a79
Merge "Spelling." into jb-mr1-dev
2012-08-13 17:59:55 -07:00
Christopher Tate
bf7d222011
Merge "Don't back up / restore non-primary users' data" into jb-mr1-dev
2012-08-13 17:58:40 -07:00
Nick Kralevich
13cd6420a0
Spelling.
...
Change-Id: Ie69d99139355b66e9bb62087cd5f6cd677a51cfa
2012-08-13 17:52:17 -07:00
Wink Saville
3016e47103
am f069c7f5: am ae5ac108: Merge "Fix build." into jb-mr1-dev
...
* commit 'f069c7f58d4f41c5da20222a3f31fc5ef8084dd9':
Fix build.
2012-08-13 17:36:24 -07:00
Christopher Tate
aac71ff465
Don't back up / restore non-primary users' data
...
For now only the device owner "user" gets cloud backups. Also, only the
device owner account has access to local backup/restore.
Bug 6956438
Change-Id: I87d7ba5969e606c23f4214469f9bf2fd47a6c61b
2012-08-13 17:36:14 -07:00
Wink Saville
f069c7f58d
am ae5ac108: Merge "Fix build." into jb-mr1-dev
...
* commit 'ae5ac108b03214e02781a92592f7913ada8ef2d4':
Fix build.
2012-08-13 17:34:07 -07:00
Wink Saville
ae5ac108b0
Merge "Fix build." into jb-mr1-dev
2012-08-13 17:30:57 -07:00
Dianne Hackborn
8920f1cc73
am fd96eb05: am 1866f68d: Merge "Modify how the background process LRU list is handled." into jb-mr1-dev
...
* commit 'fd96eb05babf404e07366d09f71849c1aa0d20da':
Modify how the background process LRU list is handled.
2012-08-13 17:19:27 -07:00
Dianne Hackborn
aa50ad3932
am dabd459f: am 87c42b99: Merge "Small service cleanup." into jb-mr1-dev
...
* commit 'dabd459f9083b4be22ae1f97517a5c2cb8010e5b':
Small service cleanup.
2012-08-13 17:19:24 -07:00