39475 Commits

Author SHA1 Message Date
Scott Main
892b979478 am 47c59b48: am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '47c59b48357d875a6a0278e945e4c08700886b37':
  docs: clarify startActivity
2013-03-05 21:16:45 +00:00
Scott Main
47c59b4835 am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '01798b0553ffd504b0012a8f3ffb7a8d3c1be641':
  docs: clarify startActivity
2013-03-05 13:13:48 -08:00
Scott Main
01798b0553 am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '76d857639efa3e5fd01553a26b6742a6895d189f':
  docs: clarify startActivity
2013-03-05 13:09:44 -08:00
Scott Main
0f1259ccb7 am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
2013-03-05 13:03:25 -08:00
Andy McFadden
0c361e9d3c Add eglPresentationTimeANDROID
Added EGL extension to set a timestamp on a surface.

Bug 8191230

Change-Id: Ie73bd7d1217348c9c64b8c68da38d671d48355f7
2013-03-05 11:16:10 -08:00
Dianne Hackborn
a55136169e Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev 2013-03-05 17:37:43 +00:00
Dianne Hackborn
9c9aec721a Merge "Fix issue #8311263: Corrupted UI across all tabs in People app" into jb-mr2-dev 2013-03-05 17:34:40 +00:00
Dianne Hackborn
e3f23a36d8 Add new WindowId for cross-process monitoring of focus.
This is a class representing a window and providing limited
interaction with it, which can be handed across processes.

Change-Id: I22885f2064a9cc8c68d690a5858c2e28bbb6a0f3
2013-03-05 09:33:48 -08:00
Romain Guy
d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 2013-03-05 03:11:11 +00:00
Romain Guy
e78b8003a5 Finish current Canvas operations then resume previous Canvas
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
2013-03-04 19:08:02 -08:00
Mathias Agopian
188f8c5e4b Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 2013-03-05 02:31:15 +00:00
Dianne Hackborn
1dc5f92716 Fix issue #8311263: Corrupted UI across all tabs in People app
The problem is that there are other configurations that the
action bar can be in that ActionBarOverlayLayout didn't account
for -- such as here, the nav part visible but the rest hidden.

Fixing this was non-trivial because it means that to correctly
implement fitSystemWindows() we need to in these cases take the
actual measured height of the action bar for positioning the
content view...  but that is not yet available, since
fitSystemWindows() must run before layout.

To solve this, ActionBarOverlayLayout now inherits directly from
ViewGroup and implements its own custom layout.  In its measure
pass it does all of the fitSystemWindows() work that is dependent
on the measured sizes of the action bar child views after those
are measured and applies them to the content view before it is
measured.

Change-Id: Ie327075d502e9c348aa80b0968c6b0403478301e
2013-03-04 18:17:50 -08:00
Mathias Agopian
0449a40586 screenshots can now go into a Surface from java
A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.

Bug: 6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
2013-03-04 17:45:26 -08:00
Brian Carlstrom
42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-05 00:56:05 +00:00
Christopher Tate
267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
2013-03-04 14:02:29 -08:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
JP Abgrall
62f16bfc5e jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
Missing iface8 in call to parseIfaceStats().

Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
2013-03-04 18:53:07 +00:00
Brian Carlstrom
6f2adcf9ab am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-04 10:52:49 -08:00
Jeff Sharkey
2e0da1ea5f Merge "Improve performance of storage measurement." into jb-mr2-dev 2013-03-02 06:14:51 +00:00
Jeff Sharkey
237940a092 am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit '2048fbb1106a639c6b66298b94ab98eb4c650542':
  Tighten enforcement of file modes.
2013-03-01 17:31:54 -08:00
Jeff Sharkey
2048fbb110 am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
  Tighten enforcement of file modes.
2013-03-01 17:30:45 -08:00
Jeff Sharkey
1e5e3748d4 am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
2013-03-01 17:26:07 -08:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes.
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
2013-03-01 17:20:51 -08:00
Jeff Sharkey
63d0a06799 Improve performance of storage measurement.
When calculating directory sizes of data living on emulated external
storage, translate the path to use the internal backing data, which
avoids going through the emulation layer.  It carefully retreats to
the original path when it runs into trouble.

Testing with a hierarchy of 10 directories deep and 2 directories
and 10 files wide at each level, this change improves performance
from 5900ms before to 250ms after; over 20 times faster (!).

Bug: 8172425
Change-Id: Ia7365416f091e102bf7345a49f7d7209a22580a9
2013-03-01 16:36:52 -08:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes.
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-03-01 16:17:09 -08:00
Justin Koh
76f065d2e9 Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev 2013-03-01 23:57:26 +00: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
Justin Koh
4207fda51b Add policy check to always show overflow menu button on TV devices.
Add policy check to always show overflow menu button on TV devices.
Bug: 8236681

Change-Id: I4f92eef7a6d530feb698f83b0720b36115f7a04a
2013-03-01 13:03:20 -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
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
Brian Carlstrom
6bae82a2ae Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
2013-03-01 09:13:26 -08:00
Ben Murdoch
95afb3b11a Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
Trivial cherry pick from master, see
Id1182537e073a9dd7746e23eec20accacedd9fc8

historyURL must be a valid URL.

Bug: 7907196
Change-Id: I1f32a9bda4ae627f242b2533eca18aef3ba25411
2013-03-01 17:12:16 +00: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
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
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
Lorenzo Colitti
51019a0fc7 Merge "Expose clatd commands to NetworkManagementService." into jb-mr2-dev 2013-03-01 00:15:44 +00:00
Jeff Sharkey
ba761979ee Tighten enforcement of file modes.
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-02-28 15:57:36 -08: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
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
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