Alan Viverette
04067f33c8
Clean up ContextThemeWrapper
...
Fix trailing white space, use of final, comments.
Change-Id: Iacc034acd46a651c35c32f2efbc0fe5fb58e1209
2015-08-25 14:07:02 -04:00
Alan Viverette
99bf63fdaf
Return asset manager with correct config from ContextThemeWrapper
...
Bug: 23416037
Change-Id: Ia87bebbe6f23214c892bc2ca19d4112853023235
2015-08-25 13:45:38 -04:00
Eino-Ville Talvala
170e089551
am d9a24b1b: am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd9a24b1b907fabc76a9c4bdc07ac26b6959db811':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-25 00:46:50 +00:00
Eino-Ville Talvala
b8079c5c49
am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 23:39:22 +00:00
Eino-Ville Talvala
d9a24b1b90
am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd7f3dfb7c8f40308a95a56f90ef7a1157897cce6':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:38:17 +00:00
Eino-Ville Talvala
cd05509a81
am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '6393275f5f8daa2d14dbc3fbd6511a78978999cd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:21:16 +00:00
Eino-Ville Talvala
6393275f5f
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:16 +00:00
Eino-Ville Talvala
2bf7b98a2a
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
2015-08-24 23:08:00 +00:00
Eino-Ville Talvala
e3f5483977
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
...
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
2015-08-24 14:08:58 -07:00
Eino-Ville Talvala
f76d558bb0
am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit '93826c7ebd3d5c6d6372a8bc6050d276727f7464':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:42:49 +00:00
Eino-Ville Talvala
f2c5ce5db1
am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'a42cf680a57e73eb4ed874bb78b7f47c6d5d76d3':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:27:42 +00:00
Eino-Ville Talvala
a42cf680a5
Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
2015-08-24 19:22:04 +00:00
Xiaohui Chen
bd0e03bb76
More USER_OWNER cleanup.
...
Bug: 19913735
Change-Id: I408a92d9dbab2a096407efccb91e2a8bdc22714d
2015-08-24 16:42:37 +00:00
Filip Gruszczynski
db0fa33f44
Merge "Using initial activity layout to position the launching activity."
2015-08-24 14:39:03 +00:00
Filip Gruszczynski
9b1ce52f25
Using initial activity layout to position the launching activity.
...
The activity can be positioned in the center or in one of the corners.
From there it shifts its position and tries to find a spot where it
doesn't collide with other activities.
The CL also includes a few fixes necessary to pipe the information about
the initial layout through the system.
Change-Id: I2aaf5b6d20044aafec713b7bd4193b05cfbd16f3
2015-08-24 07:35:38 -07:00
Eino-Ville Talvala
6960966f17
am 8c0104ef: am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '8c0104ef9fe5152c742a456c564c6588878e7645':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 07:24:08 +00:00
Eino-Ville Talvala
8c0104ef9f
am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'b5a913f9e264b79f5c714d4a590a44dac2ed2cf2':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 06:00:44 +00:00
Eino-Ville Talvala
f99eba07c0
am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'ec2efb9cac57f0cd6c371422114a37c5c9791ec8':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:45:46 +00:00
Eino-Ville Talvala
ec2efb9cac
am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '08b12dfba630659601972f0d857b6580fdae4313':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:38:01 +00:00
Eino-Ville Talvala
08b12dfba6
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
2015-08-22 05:33:26 +00:00
Eino-Ville Talvala
7ca1f243b8
am cf620038: am 68f46013: am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'cf620038f4af0fec5980fd9ef8e9234cfaf7670c':
Camera: Fix depth documentation issues
2015-08-22 01:38:25 +00:00
Fyodor Kupolov
3a22ad0ac4
am 09dbd46a: am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit '09dbd46af8faa60419a97e926463dc25fbd0513f':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 01:22:32 +00:00
Jim Miller
c7506b3718
am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
Fix type-o in FingerprintManager documentation
2015-08-22 01:22:18 +00:00
Adrian Roos
e3b07451c3
resolved conflicts for merge of bcc26c02 to master
...
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
2015-08-21 18:08:58 -07:00
Eino-Ville Talvala
cf620038f4
am 68f46013: am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit '68f460130c64669070211ec121b7cd8fe659f286':
Camera: Fix depth documentation issues
2015-08-22 00:52:06 +00:00
Eino-Ville Talvala
2e3215c9f6
Camera: Add support for notifying NFC stack when camera is active
...
On some devices, NFC full poll operation and camera operation
interfere. Add a system property ro.camera.notify_nfc. When set to >
0, the NFC adapter will be notified to disable polling whenever the
camera is active.
Bug: 23393557
Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d
2015-08-21 17:41:47 -07:00
Fyodor Kupolov
09dbd46af8
am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit '037281d4a9a22fa55b643e785ff32144cfa61591':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 00:41:08 +00:00
Jim Miller
e271d91e5f
am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '7225af947233f506d40500ab30a8c93bd1a603a5':
Fix type-o in FingerprintManager documentation
2015-08-22 00:40:58 +00:00
Adrian Roos
bcc26c0201
am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker
...
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
Add StrongAuthTracker
2015-08-22 00:40:47 +00:00
Eino-Ville Talvala
00ca835d89
am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'e5b4c3d5f329ee830c46f92deef23be1dfbead80':
Camera: Fix depth documentation issues
2015-08-22 00:33:47 +00:00
Eino-Ville Talvala
e5b4c3d5f3
am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
Camera: Fix depth documentation issues
2015-08-22 00:25:38 +00:00
Fyodor Kupolov
563f974d97
am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit 'd7cdbd4d812f3d3501c37b7242a7038298c7ee14':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 00:17:44 +00:00
Jim Miller
c66a0db280
am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '1bbc2750bb58f397a0195540d50c44400c381441':
Fix type-o in FingerprintManager documentation
2015-08-22 00:17:22 +00:00
Adrian Roos
a8bbebd426
am b5e47228: Add StrongAuthTracker
...
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
Add StrongAuthTracker
2015-08-22 00:16:48 +00:00
Eino-Ville Talvala
a7dde2e89e
Merge "Camera: Fix depth documentation issues" into mnc-dev
2015-08-22 00:14:13 +00:00
Eino-Ville Talvala
315bc09715
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
...
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.
Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
2015-08-21 16:31:58 -07:00
Fyodor Kupolov
d7cdbd4d81
am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-21 23:12:43 +00:00
Fyodor Kupolov
e6c64508ab
Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
2015-08-21 23:04:09 +00:00
Jim Miller
1bbc2750bb
am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
Fix type-o in FingerprintManager documentation
2015-08-21 22:11:30 +00:00
Jim Miller
74d9c2aad1
Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
2015-08-21 21:59:51 +00:00
Chris Craik
655c5d4c70
Merge "Revert "Revert "Simplify TextureView draw path"""
2015-08-21 20:28:46 +00:00
Adrian Roos
b5e4722891
Add StrongAuthTracker
...
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
2015-08-21 13:28:00 -07:00
Roozbeh Pournader
4bae2038cd
Merge "Cleanup android.text.TextUtils a little."
2015-08-21 19:04:29 +00:00
Fyodor Kupolov
7d35fc3898
Fixed a typo in convertRestrictionsToBundle JavaDoc
...
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
2015-08-21 11:25:55 -07:00
Chris Craik
3aadd60521
Revert "Revert "Simplify TextureView draw path""
...
Fixed build breakage
This reverts commit d35dcb1311
2015-08-21 10:33:02 -07:00
Roozbeh Pournader
999da7464a
Merge "Update tests and support negative values in formatBytes()."
2015-08-21 17:21:11 +00:00
Roozbeh Pournader
4059d7dbfa
Update tests and support negative values in formatBytes().
...
This updates the tests to match the older commit
f723017481
2015-08-20 17:59:30 -07:00
Filip Gruszczynski
c12e6780e4
Merge "API for specifying size/gravity of launching activity."
2015-08-20 22:43:25 +00:00
Filip Gruszczynski
848fe6bef2
API for specifying size/gravity of launching activity.
...
Change-Id: I4d75b3fa56ff9c35be9beeba81e3ec9ab28a9996
2015-08-20 15:27:36 -07:00
Fyodor Kupolov
e67177d79a
am 9125dbbf: am 1ffb592e: am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
...
* commit '9125dbbf932efafa7a86ddb3e45598f230a81952':
Fixed key comparison in equals method
2015-08-20 20:27:35 +00:00
