Irfan Sheriff
39aad005c6
am d2bfa3bd: Merge "Fix copy constructor" into jb-mr2-dev
...
* commit 'd2bfa3bdc0a5d3c06cde2711d8572a8141e45fe2':
Fix copy constructor
2013-03-04 18:38:22 +00:00
Irfan Sheriff
d2bfa3bdc0
Merge "Fix copy constructor" into jb-mr2-dev
2013-03-04 18:32:49 +00:00
Irfan Sheriff
90082124aa
Fix copy constructor
...
Bug: 8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
2013-03-04 10:28:42 -08:00
Derek Sollenberger
6eeb41cf21
am cdac4972: Deprecate read/write Pictures to streams.
...
* commit 'cdac497289fd2c39a352f6167dae3f77cc608cb8':
Deprecate read/write Pictures to streams.
2013-03-04 15:24:42 +00:00
Derek Sollenberger
cdac497289
Deprecate read/write Pictures to streams.
...
bug: 8241089
Change-Id: I435a534f5110cb2b8aba87c047b509020a22fd67
2013-03-04 10:10:15 -05:00
Michael Jurka
f43d20e70d
am 7ac02bfb: Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev
...
* commit '7ac02bfb862aec324b00f3919ff00a95ff1effa6':
Fix RTL layout in Recent Apps, landscape mode
2013-03-04 11:00:53 +00:00
Michael Jurka
7ac02bfb86
Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev
2013-03-04 10:56:58 +00: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
Romain Guy
999871bc82
am 151b71cb: Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev
...
* commit '151b71cb5259eabf9bdcdc9248ba5100ad4c5bcf':
Fix math issue when transforming text in perspective
2013-03-02 02:12:38 +00:00
Romain Guy
151b71cb52
Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev
2013-03-02 02:08:18 +00:00
Romain Guy
874f5c6e4a
Fix math issue when transforming text in perspective
...
Change-Id: Iad6b4e477c11bd1ef5f0ceab2fabcd440030154d
2013-03-01 18:07:35 -08:00
Jim Miller
2b0ce3f014
Merge "Re-enable USER_PRESENT broadcast in keyguard."
2013-03-02 00:41:54 +00: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
Romain Guy
49195f8b04
am 28459117: Merge "Precache glyphs at final raster size" into jb-mr2-dev
...
* commit '28459117a797bbf09ac589af4c8083a98fdbfb90':
Precache glyphs at final raster size
2013-03-02 00:19:18 +00:00
Romain Guy
28459117a7
Merge "Precache glyphs at final raster size" into jb-mr2-dev
2013-03-02 00:13:17 +00:00
Romain Guy
0f6675332c
Precache glyphs at final raster size
...
The deferred display lists model now allows us to precache glyphs
at their exact size on screen.
This change also removes debug markers when the renderer defers
and reorders display lists. It also adds a flush event marker.
Change-Id: I66ec5216dc12b93ecfdad52a7146b1cfb31fbeb4
2013-03-01 16:04:53 -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
Michael Wright
7ca095f095
am 32440aa2: Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
...
* commit '32440aa25d958c8b82e7c17f784defc0a5860c0a':
Unify inputDispatchingTimedOut with keyDispatchingTimedOut
2013-03-01 22:25:50 +00:00
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
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
Dmitry Shmidt
076d90298a
am a7f9b4e9: Merge "wifi: Add checking for scan results EOB" into jb-mr2-dev
...
* commit 'a7f9b4e909b359ae94e88ebc402156f88931088b':
wifi: Add checking for scan results EOB
2013-03-01 20:49:15 +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
95d6cbfcc6
am 1da8a6a3: Merge "Add shader program selection shortcut" into jb-mr2-dev
...
* commit '1da8a6a36df0389dd4c213a8f9698874c484c839':
Add shader program selection shortcut
2013-03-01 19:47:35 +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
94e1dcf463
am 624de685: am 44e087bd: am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
...
* commit '624de6854f42feb9d2761db857c6f36a47fabb25':
docs: add bdc's security doc as training article
2013-03-01 19:18:09 +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
63f4eadd5d
am b237b9e0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'b237b9e081d612e9e32308474d8fa028764524fe':
Import translations. DO NOT MERGE
2013-03-01 18:26:46 +00: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
03845a5973
am 2ce5173a: Merge commit \'199f9655\' into manualmerge
...
* commit '2ce5173afbb4536f3bf2e6ebcfb86e3a7fd14bf2':
installd: use correct header file.
2013-03-01 18:08:42 +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
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
Dmitry Shmidt
5dbde7af9f
am 14b628a3: wifi: Add delimiter flag into bss scan results request
...
* commit '14b628a3400b6c36e0604f403dd72553c6fe63c2':
wifi: Add delimiter flag into bss scan results request
2013-03-01 17:42:48 +00:00