drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,355 Commits 1 Branch 0 Tags
Commit Graph

39532 Commits

Author SHA1 Message Date
Chet Haase
573596de3b Merge "ListView transient state fix" 2013-03-05 14:26:35 +00:00
Romain Guy
4001b31cba am 370929f4: am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 
* commit '370929f4bf6b9d7a196eae531f38cdec19140dfd':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
 2013-03-05 03:15:37 +00: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
c18fb64084 am e94fcd6c: am 188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 
* commit 'e94fcd6c494931afc1d7f70138db01de37cdb9fc':
  screenshots can now go into a Surface from java
 2013-03-05 02:37:43 +00: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
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
8df79da5d1 am 31167ffb: am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '31167ffb2def7461edbac9b8c35366bb6a0e5881':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 01:02:41 +00: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
Philip Milne
c2a6e194a6 Merge "Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value." 2013-03-05 00:00:12 +00:00
Philip Milne
f091b66246 Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value. 
This is an addendum to:

https://googleplex-android-review.googlesource.com/#/c/246507

Change-Id: Ia9d6fdfe7fdb76c1152466315ff3b1c42c077ee2
 2013-03-04 15:46:22 -08: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
Christopher Tate
e9accff210 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.

Bug 8298439

Change-Id: I665ba1d139e8aaa820f5f515186bc4ce8bcdb1ea
 2013-03-04 13:19:39 -08:00
Chet Haase
9e7c7d7b85 ListView transient state fix 
ListView child views with transientState (setHasTransientState(true)) are not
handled correctly when the data set changes, such as when an item is added
or removed. The problem is that the transient views are cached by their
position, but this position is out of sync between the ListView and the adapter
until the ListView layout process is complete.

A better way, which unfortunately only works on ListViews with stable IDs, is
to cache the views by their itemID instead, and to use that ID to determine when
and where to reuse/retrieve a transient view during the ListView layout.

Issue #8254775 View.setHasTransient state has side-effects when deleting content in ListView

Change-Id: Ic3b1669ed79dd6cf9e4c1c6c26f9d75ccf074b3e
 2013-03-04 12:51:21 -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
1be2b68204 am 62f16bfc: jni: net.TrafficStats: fix getIfaceStat, have it use the iface. 
* commit '62f16bfc5e90f0320ab68b66b5b5b125cada1867':
  jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
 2013-03-04 18:59:57 +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
4e6d19656e am 2e0da1ea: Merge "Improve performance of storage measurement." into jb-mr2-dev 
* commit '2e0da1ea5f2493d968b4b83d4a0dd54e2cc63849':
  Improve performance of storage measurement.
 2013-03-02 06:20:17 +00: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
Jim Miller
68da4dabfe Merge "Fix multi-user support in keyguard." 2013-03-02 00:20:08 +00:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes. 
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
 2013-03-01 16:17:09 -08:00
Justin Koh
e0c5569d92 am 76f065d2: Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev 
* commit '76f065d2e9d6354a59bb233b969c8417aff7223b':
  Add policy check to always show overflow menu button on TV devices.
 2013-03-02 00:01:26 +00:00
Jim Miller
78c48f6c17 Fix multi-user support in keyguard. 
This fixes a bug where user0's credentials were required of all users.

LockPatternUtils used to check for the system process of the caller
to determine which user id to use.  Now that keyguard is in its own
process, this can no longer be used.

The fix is to use the permission system to see if the calling process
is allowed to interact across users and if so, use the id of the current
user.

Change-Id: I2d7111938bb3bf381f72698c9fa4fb848d237153
 2013-03-01 15:58:16 -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
77a29b35c3 am 7be6d4c4: Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev 
* commit '7be6d4c421cfa6f93079517d3ee54024c8049ae5':
  Clarify the API documentation for WebSQL database.
 2013-03-01 21:53:18 +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
9ee59e5375 am 10010128: Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev 
* commit '10010128088bdbc7b03d38ff594428f8a0d52714':
  Remove obsolete target-densitydpi documentation
 2013-03-01 21:12:38 +00: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
fb10350bc9 Merge "Import translations. DO NOT MERGE" 2013-03-01 18:22:36 +00:00
Baligh Uddin
b237b9e081 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-01 18:20:24 +00:00
Nick Kralevich
a9ee4d2a9f am e6067579: am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files." 
* commit 'e606757966175e6f287e18ed2e458050f7da3731':
  ZygoteInit: use correct header files.
 2013-03-01 17:46:19 +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
Bjorn Bringert
8d628f0c69 am bc086862: Declare VOICE_ASSIST intent 
* commit 'bc086862e216bbe8ffc2dfb68f09a872505d9d48':
  Declare VOICE_ASSIST intent
 2013-03-01 17:21:32 +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
a6d6564187 Import translations. DO NOT MERGE 
Change-Id: I974b6c56bec344f2d4350e34b5e38ace9aaa2f31
Auto-generated-cl: translation import
 2013-03-01 09:03:55 -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
Bjorn Bringert
bc086862e2 Declare VOICE_ASSIST intent 
Bug: 8289964
Change-Id: I241b5166a98a7a462691f0169bf1b6f4fe7b2e0f
 2013-03-01 12:59:24 +00:00
Romain Guy
57b7725e9b am 84ea20d0: Merge "Restore the ability to track native Surface changes Bug #8230990" into jb-mr2-dev 
* commit '84ea20d0ba7611782c7aa364cd41744fca359e35':
  Restore the ability to track native Surface changes Bug #8230990
 2013-03-01 02:40:13 +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