Alan Viverette
fde7865c16
Merge "Remove unnecessary namespace from XML styles/themes"
2014-02-15 01:54:49 +00:00
Zhijun He
2df3b5f153
am b35badac: Merge "Camera2: Unhide some capture request templates"
...
* commit 'b35badac43f742456c4111d1d7369a216409c6f0':
Camera2: Unhide some capture request templates
2014-02-14 17:54:37 -08:00
Alan Viverette
54cf0dbd02
am 22c5abff: Merge "More Quantum theme boilerplate styles"
...
* commit '22c5abff5fad7c70ab1751d56e030fc6e15a59f8':
More Quantum theme boilerplate styles
2014-02-14 17:54:35 -08:00
John Reck
eb5c2a465c
am 41342971: Merge "Refcounting is hard"
...
* commit '41342971c28726522c760aebf26db96f53756cf5':
Refcounting is hard
2014-02-14 17:54:32 -08:00
Tim Murray
11cc6899cc
am 12623f65: am afb4f8f1: am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
...
* commit '12623f65275475a13109986f9f993a0887caef9b':
Fix destruction issues relating to AllocationAdapter.
2014-02-14 17:54:26 -08:00
Christopher Tate
8ab4ab20e6
am dd615b3c: Merge "Clarify permission semantics"
...
* commit 'dd615b3c14f9d98d50de0ae5888a4863b6ee2015':
Clarify permission semantics
2014-02-14 17:54:23 -08:00
Alan Viverette
d180ff2b1c
Remove unnecessary namespace from XML styles/themes
...
Change-Id: If706175f9164f9dcf7e3f9d6bdc7e1f74dba88cf
2014-02-14 17:50:45 -08:00
Zhijun He
b35badac43
Merge "Camera2: Unhide some capture request templates"
2014-02-15 01:34:57 +00:00
Alan Viverette
22c5abff5f
Merge "More Quantum theme boilerplate styles"
2014-02-15 01:13:56 +00:00
Alan Viverette
6148a8f569
More Quantum theme boilerplate styles
...
Change-Id: I3411e19cae11e487203420e051b2cf8f4d5ebc65
2014-02-14 17:05:11 -08:00
John Reck
41342971c2
Merge "Refcounting is hard"
2014-02-15 01:03:02 +00:00
John Reck
a39dd59579
Refcounting is hard
...
Bug: 12994941
Change-Id: I6285ff818fc696dbe504174b98a54cb1d00b445c
2014-02-14 16:59:37 -08:00
Tim Murray
12623f6527
am afb4f8f1: am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
...
* commit 'afb4f8f144ef70360b70770e17e7d81571e7b296':
Fix destruction issues relating to AllocationAdapter.
2014-02-15 00:03:23 +00:00
Christopher Tate
dd615b3c14
Merge "Clarify permission semantics"
2014-02-15 00:01:19 +00:00
Tim Murray
afb4f8f144
am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
...
* commit '8e30d53b6575a08ec0579fb08c8c4f055598d78b':
Fix destruction issues relating to AllocationAdapter.
2014-02-15 00:00:07 +00:00
Tim Murray
8e30d53b65
am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
...
* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
Fix destruction issues relating to AllocationAdapter.
2014-02-14 23:56:57 +00:00
Tim Murray
4870c813fe
am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
...
* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
Fix destruction issues relating to AllocationAdapter.
2014-02-14 15:53:59 -08:00
Ben Gruver
f68ad20703
am e8ea0d55: am d6739e0f: am 4f416144: am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
...
* commit 'e8ea0d55be47f6d663007b4cb15fcc3d1a91465b':
Check the return value of listFiles on the ifw directory
2014-02-14 15:53:20 -08:00
Tim Murray
f055fcb89f
am b542e8e1: am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
...
* commit 'b542e8e128178560b7e36d476890e66b4e5a69ff':
Add hidden minor version ID for support lib workarounds.
2014-02-14 15:53:17 -08:00
Tim Murray
7d1a6c5cac
Merge "Fix destruction issues relating to AllocationAdapter."
2014-02-14 23:50:08 +00:00
Tim Murray
6d63c84f44
Fix destruction issues relating to AllocationAdapter.
...
bug 12971201
Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
2014-02-14 15:48:03 -08:00
Christopher Tate
4ba92fc04b
Clarify permission semantics
...
Bug 12919011
Change-Id: I43a72801ddec04245ac6352eeda4cd0f14aea658
2014-02-14 15:45:27 -08:00
Ben Gruver
e8ea0d55be
am d6739e0f: am 4f416144: am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
...
* commit 'd6739e0f9dd0a5c633ed3cf484f8c0f723168757':
Check the return value of listFiles on the ifw directory
2014-02-14 23:41:30 +00:00
Tim Murray
b542e8e128
am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
...
* commit 'bdb04f025ce34b0240f01961c43d8156a78e27a2':
Add hidden minor version ID for support lib workarounds.
2014-02-14 23:41:24 +00:00
Ben Gruver
d6739e0f9d
am 4f416144: am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
...
* commit '4f4161442d1ac6c1a519a06df0e4efeab3072195':
Check the return value of listFiles on the ifw directory
2014-02-14 23:22:13 +00:00
Tim Murray
bdb04f025c
am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
...
* commit '17b7ff4af762cd5e9921e9ee360e139956f220a5':
Add hidden minor version ID for support lib workarounds.
2014-02-14 23:22:10 +00:00
Dan Stoza
16ec12ae77
Allow disabling layer rotation during screenshots
...
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.
Bug: 11805195
Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
2014-02-14 23:10:29 +00:00
Ben Gruver
4f4161442d
am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
...
* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
Check the return value of listFiles on the ifw directory
2014-02-14 23:08:10 +00:00
Tim Murray
17b7ff4af7
am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
...
* commit 'b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
Add hidden minor version ID for support lib workarounds.
2014-02-14 23:08:01 +00:00
Michael Wright
155a8eb851
am d35ceee7: Merge "Remove Japanese button swap"
...
* commit 'd35ceee732ad7172e1f7a4261c361591da260120':
Remove Japanese button swap
2014-02-14 14:46:57 -08:00
Michael Wright
d35ceee732
Merge "Remove Japanese button swap"
2014-02-14 22:38:06 +00:00
Andy McFadden
9aab91d090
am 9ef58a47: Merge "Update createInputSurface() doc"
...
* commit '9ef58a47cd76282d32e1e8b10fee2aa7461ea003':
Update createInputSurface() doc
2014-02-14 13:57:50 -08:00
Ben Gruver
da37944785
am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
...
* commit '509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
Check the return value of listFiles on the ifw directory
2014-02-14 13:57:24 -08:00
Andy McFadden
9ef58a47cd
Merge "Update createInputSurface() doc"
2014-02-14 21:45:21 +00:00
Michael Wright
8a5dbac349
Remove Japanese button swap
...
Bug: 12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
2014-02-14 13:20:58 -08:00
Ben Gruver
509a243c2c
Merge "Check the return value of listFiles on the ifw directory"
2014-02-14 21:15:50 +00:00
Ben Gruver
26c6b783d2
Check the return value of listFiles on the ifw directory
...
listFiles can return null if the directory doesn't exist
Bug: 10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
2014-02-14 13:07:11 -08:00
Alan Viverette
1697ecae21
am fd367734: Merge "Fix gradient radius type"
...
* commit 'fd367734795793e2054aae07905c61ebaefcd56a':
Fix gradient radius type
2014-02-14 12:58:56 -08:00
Alan Viverette
fd36773479
Merge "Fix gradient radius type"
2014-02-14 20:55:53 +00:00
Alan Viverette
b32b8a52a3
Fix gradient radius type
...
BUG: 13029355
Change-Id: I5139d5da592b8bbf420a31895ae50c365538b9cf
2014-02-14 12:54:33 -08:00
Andy McFadden
cdf1d1895a
Update createInputSurface() doc
...
The Surface returned by MediaCodec#createInputSurface() is configured
for HW_VIDEO_ENCODER by the consumer. Accessing the Surface through
Surface#lockCanvas() sets SW_READ_OFTEN | SW_WRITE_OFTEN, and some
devices choke on the combination.
Bug 11418094
Change-Id: Ic182802386146d19b1bdecdb894c5130c563a3ed
2014-02-14 20:54:18 +00:00
Tim Murray
b25a6936a1
am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
...
* commit 'd7043f0084237200b6aab5d101c8ab6d3ab495c6':
Add hidden minor version ID for support lib workarounds.
2014-02-14 12:51:32 -08:00
Tim Murray
d7043f0084
Merge "Add hidden minor version ID for support lib workarounds."
2014-02-14 20:47:34 +00:00
Kenny Guy
f748e40bc1
am 008b08ae: Merge "Extend pm create-user to handle related and managed users."
...
* commit '008b08ae87afe924bded673762a0393eed1c95d7':
Extend pm create-user to handle related and managed users.
2014-02-14 11:54:42 -08:00
rich cannings
999908efee
am 5a92fec6: Merge "Make FORCE_STOP_PACKAGES "signature|system""
...
* commit '5a92fec650447baddff3c85aaa83c6fc805880bf':
Make FORCE_STOP_PACKAGES "signature|system"
2014-02-14 11:54:37 -08:00
Kenny Guy
008b08ae87
Merge "Extend pm create-user to handle related and managed users."
2014-02-14 19:30:26 +00:00
Kenny Guy
31d6776a92
Extend pm create-user to handle related and managed users.
...
Change-Id: I0a290b9debdc8ddf23b72a84bf98908ab7fa7c0d
2014-02-14 19:12:03 +00:00
Zhijun He
fa8cc5f680
Camera2: Unhide some capture request templates
...
Change-Id: I13a45b51c129ba562cce0374ae3c63e853144c10
2014-02-14 10:48:38 -08:00
rich cannings
5a92fec650
Merge "Make FORCE_STOP_PACKAGES "signature|system""
2014-02-14 18:04:46 +00:00
Narayan Kamath
3d03e5b90d
Remove java.io.tmpdir assignment in AndroidRuntime.
...
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
2014-02-14 17:42:24 +00:00