101072 Commits

Author SHA1 Message Date
Michael Wright
32440aa25d Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev 2013-03-01 22:20:46 +00:00
Michael Wright
7dd5bb18d4 Unify inputDispatchingTimedOut with keyDispatchingTimedOut
Bug: 8194916
Change-Id: Iac40108d848bcca77f49a7a49c57a095b3dbe9c9
2013-03-01 14:14:35 -08:00
Selim Gurun
7be6d4c421 Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev 2013-03-01 21:46:42 +00:00
Selim Gurun
2bca22b2a5 Clarify the API documentation for WebSQL database.
Bug: 8231270

WebSQL database is disabled by default. And setting change to
enable it must precede the first url navigation. This change
is to clarify this behavior.

Change-Id: Ic0aab764821daece83f3482b30df4bebc7ff1f37
2013-03-01 13:35:12 -08:00
Jonathan Dixon
1001012808 Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev 2013-03-01 21:09:06 +00:00
Dmitry Shmidt
a7f9b4e909 Merge "wifi: Add checking for scan results EOB" into jb-mr2-dev 2013-03-01 20:12:53 +00:00
Chris Craik
1da8a6a36d Merge "Add shader program selection shortcut" into jb-mr2-dev 2013-03-01 19:42:38 +00:00
Scott Main
624de6854f am 44e087bd: am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit '44e087bdba93817f2031e20b0c189c548e1fef5d':
  docs: add bdc's security doc as training article
2013-03-01 19:13:37 +00:00
Scott Main
44e087bdba am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit 'a3279494a451bac0c906d518a2c5a51934727db9':
  docs: add bdc's security doc as training article
2013-03-01 11:11:52 -08:00
Chris Craik
096b8d96d5 Add shader program selection shortcut
Add a key manipulation that makes black text/paths use the standard
simple bitmap/patch shader, since they are the same. Previously we'd
create a separate shader for each because the keys differed, even
though the shaders were functionally equivalent.

Also fixes some issues around setting DEBUG_PROGRAM

Change-Id: I0c77c684d58da03501ee9ab8239c7d4a70fd6b5c
2013-03-01 11:11:31 -08:00
Scott Main
a3279494a4 am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit '8d5b88463b37cc254ed8333506fc47bb1ec193bb':
  docs: add bdc's security doc as training article
2013-03-01 11:09:14 -08:00
Scott Main
8d5b88463b am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit '16bdd13ec7e64c04e1a17b94ffcb2a08f3b47518':
  docs: add bdc's security doc as training article
2013-03-01 11:06:49 -08:00
Scott Main
16bdd13ec7 am 00158363: docs: add bdc\'s security doc as training article
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
2013-03-01 11:04:27 -08:00
Baligh Uddin
b237b9e081 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-01 18:20:24 +00:00
Nick Kralevich
2ce5173afb Merge commit '199f9655' into manualmerge
these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev
2013-03-01 10:01:29 -08:00
Dmitry Shmidt
bca462a2dc wifi: Add checking for scan results EOB
Change-Id: I969079b72fdffe1b84d88242caa6b6281d1f02b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-03-01 09:57:58 -08:00
Scott Main
00158363b4 docs: add bdc's security doc as training article
Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46
2013-03-01 09:49:41 -08:00
Nick Kralevich
e606757966 am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."
* commit 'edb95c3f3ca4e51ef0432af925b8f4330e6dae81':
  ZygoteInit: use correct header files.
2013-03-01 17:41:53 +00:00
Nick Kralevich
199f965552 am f5276c16: Merge "installd: use correct header file."
* commit 'f5276c16ad97d94f8773938012ae54f8c7ba450a':
  installd: use correct header file.
2013-03-01 09:39:45 -08:00
Nick Kralevich
edb95c3f3c am 937cfa77: Merge "ZygoteInit: use correct header files."
* commit '937cfa77c464f7dc13f686dc8f9f4667a17e80d6':
  ZygoteInit: use correct header files.
2013-03-01 09:39:42 -08:00
Dmitry Shmidt
14b628a340 wifi: Add delimiter flag into bss scan results request
Change-Id: I2989ef1ee884db6add0405f36b628701aa928f69
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-03-01 09:37:00 -08:00
Baligh Uddin
7c36114d7f Import translations. DO NOT MERGE
Change-Id: I66270509422beeed4de4d5c7e94c62be82365a44
Auto-generated-cl: translation import
2013-03-01 08:55:13 -08:00
Nick Kralevich
f5276c16ad Merge "installd: use correct header file." 2013-03-01 16:40:14 +00:00
Nick Kralevich
937cfa77c4 Merge "ZygoteInit: use correct header files." 2013-03-01 16:39:37 +00:00
Bjorn Bringert
bc086862e2 Declare VOICE_ASSIST intent
Bug: 8289964
Change-Id: I241b5166a98a7a462691f0169bf1b6f4fe7b2e0f
2013-03-01 12:59:24 +00:00
Romain Guy
84ea20d0ba Merge "Restore the ability to track native Surface changes Bug #8230990" into jb-mr2-dev 2013-03-01 02:33:50 +00:00
Romain Guy
8b5aa48469 Restore the ability to track native Surface changes
Bug #8230990

ViewRootImpl needs to know when the native Surface objects changes
to recreate the EGL surface. A recent refactoring in Surface broke
the behavior of getGenerationId(). This simply restores the old
behavior (every change increments the generation ID by 1.)

Change-Id: Ife1df1ffb2ee7a373b8ebf2431192702ba10f344
2013-02-28 18:16:31 -08:00
Chris Craik
cccd6c67db Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev 2013-03-01 01:16:44 +00:00
Chris Craik
f0e0678460 Avoid trying to draw invisible ShapeDrawables
This avoids work when a drawable is declared with @android:color/transparent

Change-Id: I1b6d3b22751e378be047a5538dfd4d4baab3c03a
2013-02-28 17:05:12 -08:00
Jeff Sharkey
7f61d0146e Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev 2013-03-01 00:58:32 +00:00
Jeff Sharkey
812085bc70 Allow loopback traffic in lockdown mode.
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa
2013-02-28 16:57:58 -08:00
Nick Kralevich
b3c4a0bb5c ZygoteInit: use correct header files.
Don't define capget / capset when we already have definitions
of it in our header files.

Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
2013-02-28 16:56:16 -08:00
Jeff Sharkey
f5e0471703 Merge "Tighten enforcement of file modes." into jb-mr2-dev 2013-03-01 00:44:41 +00:00
Nick Kralevich
848b4c9a97 installd: use correct header file.
Change-Id: I035524b857a04f8400e96468310d88abf247e582
2013-02-28 16:43:23 -08:00
Lorenzo Colitti
51019a0fc7 Merge "Expose clatd commands to NetworkManagementService." into jb-mr2-dev 2013-03-01 00:15:44 +00:00
Romain Guy
1361dff5eb Merge "Support 3D rotations when drawing text" into jb-mr2-dev 2013-03-01 00:05:51 +00:00
Romain Guy
a4adcf0239 Support 3D rotations when drawing text
If a perspective transform is set on the Canvas, drawText() should
not attempt to rasterize glyphs in screen space. This change uses
the old behavior instead (i.e. rasterize the glyphs at the native
font size and apply the transform on the resulting mesh.)

This change also adds an optimization: empty glyphs (spaces) do
not generate vertices anymore. This saves a lot of vertices in text
heavy applications such as Gmail.

Change-Id: Ib531384163f5165b5785501612a7b1474f3ff599
2013-02-28 16:04:48 -08:00
Chris Craik
f999879ce0 Merge "Account for text alignment in Op bounds calculation" into jb-mr2-dev 2013-03-01 00:01:15 +00:00
Jeff Sharkey
ba761979ee Tighten enforcement of file modes.
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-02-28 15:57:36 -08:00
Tim Murray
31a3ed4ed4 Merge "Add support and better exceptions for Bitmaps with a null config." into jb-mr2-dev 2013-02-28 23:52:37 +00:00
Jonathan Dixon
6877006646 Merge "Fix javadoc build" into jb-mr2-dev 2013-02-28 23:37:23 +00:00
Jonathan Dixon
98fac170b1 Fix javadoc build
Change-Id: I99eb6713fb221e1a3a8e54d621038104913dc03a
2013-02-28 15:32:10 -08:00
Tim Murray
abd5db9d37 Add support and better exceptions for Bitmaps with a null config.
Bug: 8263427
Change-Id: I4181402e4739c6a40591f1e1416fca98643ecc57
2013-02-28 14:33:01 -08:00
Stephen Hines
e70e8becf3 Merge "Fix docs bug." into jb-mr2-dev 2013-02-28 22:29:55 +00:00
Stephen Hines
41cf8f354f Fix docs bug.
Change-Id: I8c69963b339d703757bf1cd8f43161175783566d
2013-02-28 14:23:00 -08:00
Dianne Hackborn
d6a3e485b5 Merge "Unify normal and overlay action bar layouts." into jb-mr2-dev 2013-02-28 22:14:48 +00:00
Jonathan Dixon
0af1c59762 Merge "Deprecate various WebView related methods" into jb-mr2-dev 2013-02-28 22:11:36 +00:00
Romain Guy
aaa46155ec Merge "Reorganize OpenGL renderer tests" into jb-mr2-dev 2013-02-28 21:10:51 +00:00
Romain Guy
29ce8c98ff Reorganize OpenGL renderer tests
The new UI works just like ApiDemos. The label of the activities
declared in the manifest defines where they go in the UI.

For instance Draw/Circles will create an entry called Draw in the
first screen of the test app. Click the "Draw" item will launch
a new activity containing an item called "Circles".

Change-Id: I98a4442ee3d992598af440b2078ae1925214da20
2013-02-28 13:08:34 -08:00
Jonathan Dixon
835b1fcc31 Deprecate various WebView related methods
WebSettings:
PluginState - plugins depreacted and will not be supported in future.
setRenderPriotity - b/6335436
setLightTouchEnabled - b/7683972 it's s no-op.
setAppCacheMaxSize - has a sensible default and will  be obsolete in
                     future with HTML Quota Management API. b/6236763

WebStorage.setQuotaForOrigin - same as setAppCacheMaxSize

WebView:
clearView, showFindDialog - buggy, can be achieved otherways
savePassword - not useful/usable in practice; see b/5012826
             - stock browser used hidden APIs to achieve this feature

WebIconDatabase:
Other than the open() method, this does nothing useful. b/7331507

Change-Id: I01793f7b34978046eb54033477fca2da96e69c2e
2013-02-28 13:01:48 -08:00