Jeff Brown
1f85b46b3f
am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev
...
* commit 'dca5fb9e7e193d6aed233e0650691675a56022a3':
Enable SQLite configuration to be set with system properties.
2012-05-11 18:22:12 -07:00
Jeff Brown
dca5fb9e7e
Merge "Enable SQLite configuration to be set with system properties." into jb-dev
2012-05-11 18:19:39 -07:00
Jamie Gennis
131006b810
am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev
...
* commit 'd83fdd03a1daaf577d80c8abda86c7c01bf6d3bb':
Trace: add a tracing tag for video
2012-05-11 17:19:53 -07:00
Jamie Gennis
592cbb835a
am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev
...
* commit 'c9e27d4ba1f46eb29aa8a794685ecb7c492d5d83':
Surface: replace active rect with window crop
2012-05-11 17:19:50 -07:00
Jamie Gennis
d83fdd03a1
Merge "Trace: add a tracing tag for video" into jb-dev
2012-05-11 17:17:47 -07:00
Jamie Gennis
c9e27d4ba1
Merge "Surface: replace active rect with window crop" into jb-dev
2012-05-11 17:17:31 -07:00
Amith Yamasani
0df557289b
am 775da5fa: Merge "Update assets that didn\'t scale nicely from hdpi to tvdpi." into jb-dev
...
* commit '775da5fa03d7b905ccf8545520c759401c84440d':
Update assets that didn't scale nicely from hdpi to tvdpi.
2012-05-11 17:11:14 -07:00
Amith Yamasani
775da5fa03
Merge "Update assets that didn't scale nicely from hdpi to tvdpi." into jb-dev
2012-05-11 17:08:42 -07:00
Victoria Lease
a54e995377
am f1b0c4e5: Merge "Add fallback fonts for Malayalam, Kannada, and Telugu scripts" into jb-dev
...
* commit 'f1b0c4e5c810afb203e286eea0491a1f5670e5c3':
Add fallback fonts for Malayalam, Kannada, and Telugu scripts
2012-05-11 16:54:04 -07:00
Victoria Lease
f1b0c4e5c8
Merge "Add fallback fonts for Malayalam, Kannada, and Telugu scripts" into jb-dev
2012-05-11 16:52:00 -07:00
James Dong
f4513bb95b
am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
...
* commit '909c4b855a372dbc70ce6777df64d12ae93ad2d5':
Improve notifying TimedText by reducing marshall/unmarshalling.
2012-05-11 16:48:05 -07:00
James Dong
909c4b855a
Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
2012-05-11 16:45:19 -07:00
Jeff Brown
888da152ec
Enable SQLite configuration to be set with system properties.
...
This change does not alter the behavior of the system except to
enable the use of system properties to override SQLite configuration
options for debugging.
Bug: 6484633
Change-Id: I8908a3ba07910a1193396e2e45791e9faa7be349
2012-05-11 16:36:24 -07:00
Adam Powell
e48c70e4d9
am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev
...
* commit '7fc4fbccd6129e286a1f9c640eb3229b91792bce':
Automatic persistent text selection for ListViews
2012-05-11 16:36:11 -07:00
Adam Powell
7fc4fbccd6
Merge "Automatic persistent text selection for ListViews" into jb-dev
2012-05-11 16:34:15 -07:00
Gilles Debunne
b00ceecb96
am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev
...
* commit '0ae107ff34dd998dbe86736297e9325051ad5152':
Cut long text into multiple DL at start
2012-05-11 16:16:23 -07:00
Gilles Debunne
0ae107ff34
Merge "Cut long text into multiple DL at start" into jb-dev
2012-05-11 16:14:02 -07:00
Craig Mautner
ba523324f3
am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev
...
* commit 'ab1c5456b789205ef305b19e5a7682b6561aacac':
Keep launcher screen from flashing over lockscreen
2012-05-11 16:09:31 -07:00
Craig Mautner
ab1c5456b7
Merge "Keep launcher screen from flashing over lockscreen" into jb-dev
2012-05-11 16:07:10 -07:00
Fabrice Di Meglio
791044c2bf
am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev
...
* commit '6788e028c363583406d513d66d9a78576f984302':
Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly
2012-05-11 15:55:59 -07:00
Fabrice Di Meglio
6788e028c3
Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev
2012-05-11 15:54:06 -07:00
Kenny Root
0058ae9d7b
am c559e3b7: Merge "Add in constant for WPA supplication settings" into jb-dev
...
* commit 'c559e3b7f4be5d4ddde23443449f364b359432fe':
Add in constant for WPA supplication settings
2012-05-11 15:52:08 -07:00
Kenny Root
c559e3b7f4
Merge "Add in constant for WPA supplication settings" into jb-dev
2012-05-11 15:49:22 -07:00
Jeff Sharkey
f2fe4cb11b
am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
...
* commit 'cd5862586ab555b53ffd0a62488843838d1aa94d':
Enforce READ_EXTERNAL through Settings.Secure.
2012-05-11 15:49:00 -07:00
Jeff Sharkey
cd5862586a
Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
2012-05-11 15:47:01 -07:00
Fabrice Di Meglio
f8c1ce7a0d
Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly
...
- add missing ZWS (uni200B), ZWNJ (uni200C), ZWJ (uni200D)
Change-Id: I2e70bbaa855a75e0172c375cfcbc8544325030da
2012-05-11 15:46:27 -07:00
Jim Miller
07827454ef
am 2b5cebeb: Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
...
* commit '2b5cebebb60c33fe864bed71778253837cbddb54':
Fix 6040870: Update MultiWaveView for new device
2012-05-11 15:33:55 -07:00
Gilles Debunne
71afc39d68
Cut long text into multiple DL at start
...
Bug 5763685
To improve performance, preventively cut the the into display
list of 3-10 lines of text. Further updates to small parts of
the text (such as adding an underline on a word) will only
invalidate and redraw the affected sub display list.
DLs are aligned with paragraphs, just like they will be during
text edition.
Change-Id: I0d60debc7fdaea8b29080a6eacb2d60205e7d547
2012-05-11 15:32:43 -07:00
Jeff Sharkey
f53857716a
Enforce READ_EXTERNAL through Settings.Secure.
...
Always defers to user-defined setting, when present.
Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
2012-05-11 15:31:39 -07:00
Eric Fischer
9f382b093f
am 42097f5c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '42097f5c26551e81ca397f6ff787fdbe4046b59b':
Import translations. DO NOT MERGE
2012-05-11 15:30:32 -07:00
Jim Miller
2b5cebebb6
Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
2012-05-11 15:29:50 -07:00
Eric Fischer
42097f5c26
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-11 15:28:35 -07:00
Eric Fischer
a7faeb0c6b
am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '3fd57b5726bb968152457c1d5ba31a1a495146cb':
Import translations. DO NOT MERGE
2012-05-11 14:54:25 -07:00
Eric Fischer
3fd57b5726
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-11 14:52:11 -07:00
Irfan Sheriff
aa7b072dff
am ba1db8a5: Merge "Fix wifi direct issues" into jb-dev
...
* commit 'ba1db8a5912c989e493269b8751c7e9d312e0eae':
Fix wifi direct issues
2012-05-11 14:48:32 -07:00
Irfan Sheriff
ba1db8a591
Merge "Fix wifi direct issues" into jb-dev
2012-05-11 14:46:46 -07:00
Stephen Hines
8470381b0c
am dcc1996b: Merge "Test clamp (full and relaxed precision)." into jb-dev
...
* commit 'dcc1996b768ef36ed82f09dfd682914db1e9a2e9':
Test clamp (full and relaxed precision).
2012-05-11 14:29:00 -07:00
Adam Powell
057a585fba
Automatic persistent text selection for ListViews
...
Use View transient state tracking to allow selection to persist across
ListView-style item view recycling.
Fix some bugs with transient state tracking.
Bug 6110122
Change-Id: Ic084b8fc2289bff718b19478a37ce64459b3ed4c
2012-05-11 14:26:17 -07:00
Stephen Hines
dcc1996b76
Merge "Test clamp (full and relaxed precision)." into jb-dev
2012-05-11 14:25:56 -07:00
John Reck
51688c51c1
am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
...
* commit 'dee9d9ab9f8843bdbc1fc5d29e92c12a2d0407b2':
Prevent updateStateTrackers from being affected by preventDefault()
2012-05-11 14:25:55 -07:00
John Reck
dee9d9ab9f
Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
2012-05-11 14:23:18 -07:00
Eric Fischer
4de3538f2a
Import translations. DO NOT MERGE
...
Change-Id: Id093bff086183247032385b05d314ea0ef7d3b8b
2012-05-11 14:09:53 -07:00
Jeff Brown
47272c932a
am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
...
* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99':
Minor refactoring before starting on velocity tracker changes.
2012-05-11 14:06:30 -07:00
Jeff Brown
b12b6b5116
Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
2012-05-11 14:03:38 -07:00
Eric Fischer
9f6c655236
Import translations. DO NOT MERGE
...
Change-Id: Id65875321fa8c95e5909d901c080396f702bad02
2012-05-11 13:52:02 -07:00
John Reck
387c2e8d42
Prevent updateStateTrackers from being affected by preventDefault()
...
Bug: 6477996
Calling e.preventDefault() on a javascript touch handler is apparantly
not supposed to prevent the default gesture detector, who knew?
Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
2012-05-11 13:50:57 -07:00
Teng-Hui Zhu
08df9eac6e
am ef279363: Merge "Fix a crash." into jb-dev
...
* commit 'ef279363716706192b4da543fcae3e92cc14d27e':
Fix a crash.
2012-05-11 13:47:38 -07:00
Teng-Hui Zhu
ef27936371
Merge "Fix a crash." into jb-dev
2012-05-11 13:45:13 -07:00
Irfan Sheriff
10ca870d3b
Fix wifi direct issues
...
- BSS command is unreliable, use group owner information from p2p_find
- Fix the autonomousgroup settings
- Use group idle settings only on the p2p group interface to avoid group idle
resulting group formation failures
Bug: 6426991
Change-Id: I44fc204775580fb4fec6ce27070ddbde0751b495
2012-05-11 13:39:29 -07:00
Amith Yamasani
c3a3060db8
Update assets that didn't scale nicely from hdpi to tvdpi.
...
Bug: 6430949
Change-Id: I197043c3da0295e09abfbb4ae5582c2542ecbcd8
2012-05-11 13:31:11 -07:00