Alan Viverette
e89c65fb94
am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev
...
* commit '8830db0a6a595f1690cb6f0b76863c3759a8ccbd':
Never fully detach header or footer views in AbsListView
2015-07-07 21:15:54 +00:00
Wale Ogunwale
d8c77f4bb0
am 880a54f6: Merge "Cleaned-up logic for determining clip rect for transitions animations." into mnc-dev
...
* commit '880a54f6d85f5880a79ff94b2116ab2c12ea2fd8':
Cleaned-up logic for determining clip rect for transitions animations.
2015-07-07 21:15:50 +00:00
Alan Viverette
8830db0a6a
Merge "Never fully detach header or footer views in AbsListView" into mnc-dev
2015-07-07 21:08:32 +00:00
Jeff Sharkey
e719d83c63
am dafaa45c: Merge "Split app move into separate copy/delete steps." into mnc-dev
...
* commit 'dafaa45c0ea1802944566f0e71d81beb3eb55296':
Split app move into separate copy/delete steps.
2015-07-07 21:00:59 +00:00
Wale Ogunwale
880a54f6d8
Merge "Cleaned-up logic for determining clip rect for transitions animations." into mnc-dev
2015-07-07 21:00:43 +00:00
Makoto Onuki
4030c53db0
am a844a8c5: am f31f4cdc: am 53d17aee: Merge "Give fixed READ_PHONE_STATE permission to calllog provider" into mnc-dev
...
* commit 'a844a8c5cafb5fb8559d03e7cfe76098a80c7957':
Give fixed READ_PHONE_STATE permission to calllog provider
2015-07-07 20:59:53 +00:00
Dongwon Kang
e94f5f556f
am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev
...
* commit '279864ca820b666b2344bbe96efdcc856f787935':
Revert "Use AlertDialog for MediaRouteControllerDialog"
2015-07-07 20:59:46 +00:00
Vineeta Srivastava
0baee4f1cc
am 002c7d74: am a572506e: am 9d918db3: Merge "UsbDeviceManager: Add back support for persistent property" into mnc-dev
...
* commit '002c7d7484dca1501b7083dd00ad7357c2c4d14c':
UsbDeviceManager: Add back support for persistent property
2015-07-07 20:59:39 +00:00
Jeff Sharkey
dafaa45c0e
Merge "Split app move into separate copy/delete steps." into mnc-dev
2015-07-07 20:46:36 +00:00
Makoto Onuki
a844a8c5ca
am f31f4cdc: am 53d17aee: Merge "Give fixed READ_PHONE_STATE permission to calllog provider" into mnc-dev
...
* commit 'f31f4cdc3aa868af0af0ddccba00ea389c5c2ada':
Give fixed READ_PHONE_STATE permission to calllog provider
2015-07-07 20:42:53 +00:00
Dongwon Kang
279864ca82
am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev
...
* commit 'aaac72ac65560d72743d01f9f9811e4cfb3e9589':
Revert "Use AlertDialog for MediaRouteControllerDialog"
2015-07-07 20:42:49 +00:00
Vineeta Srivastava
002c7d7484
am a572506e: am 9d918db3: Merge "UsbDeviceManager: Add back support for persistent property" into mnc-dev
...
* commit 'a572506edc60915dae9b0ff755aa22382f3b67a3':
UsbDeviceManager: Add back support for persistent property
2015-07-07 20:42:44 +00:00
Eino-Ville Talvala
0dd17509a9
Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
...
This mode splits processing quality based on stream resolution, to
enable ZSL operation where low-resolution (preview/recording) streams
require more processing since they are immediately user-visible, while
the high-resolution intermediate ZSL stream should have minimal/no
processing since it will be reprocessed into final quality when
necessary
Bug: 22266686
Change-Id: Ib41102b66b07d61a099f021f8c6251f28c62686f
2015-07-07 13:39:55 -07:00
Christopher Tate
4198f62c5c
am c2ef1fbe: am 0546b1b1: am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev
...
* commit 'c2ef1fbe222007251b9628a3d365aeda95ad6651':
Clean up obsolete pending timeout after restoring package metadata
2015-07-07 20:35:58 +00:00
Aravind Akella
5444b6be80
am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev
...
* commit '1656c02468f0123be2cab0039d7a7cf870a4e012':
Clean up get sensorList.
2015-07-07 20:35:51 +00:00
Jeff Sharkey
6b7bb60457
Split app move into separate copy/delete steps.
...
App movement now has three distinct stages: copying, scanning, and
cleanup. Previously, a battery pull late in the move process would
end up with packages.xml pointing at the old location which had been
torn down. Now, we update packages.xml to point at the new location
as the "source of truth" before we start deleting the old location.
Bug: 21831336
Change-Id: I6f57f37a8cb335127db9ebb7c6b6cfe5755ada99
2015-07-07 13:32:14 -07:00
Makoto Onuki
f31f4cdc3a
am 53d17aee: Merge "Give fixed READ_PHONE_STATE permission to calllog provider" into mnc-dev
...
* commit '53d17aeee07de3f4e7e88f9578f5c0b689f5b627':
Give fixed READ_PHONE_STATE permission to calllog provider
2015-07-07 20:27:52 +00:00
Dongwon Kang
aaac72ac65
am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev
...
* commit '0c58229306f30e26d4b0ddb3d332def9b7382480':
Revert "Use AlertDialog for MediaRouteControllerDialog"
2015-07-07 20:27:47 +00:00
Vineeta Srivastava
a572506edc
am 9d918db3: Merge "UsbDeviceManager: Add back support for persistent property" into mnc-dev
...
* commit '9d918db350aa52a1c01c605ef94e1158f265fed0':
UsbDeviceManager: Add back support for persistent property
2015-07-07 20:27:43 +00:00
Makoto Onuki
53d17aeee0
Merge "Give fixed READ_PHONE_STATE permission to calllog provider" into mnc-dev
2015-07-07 20:23:26 +00:00
Dongwon Kang
0c58229306
Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev
2015-07-07 20:22:40 +00:00
Christopher Tate
c2ef1fbe22
am 0546b1b1: am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev
...
* commit '0546b1b14939523f74534572538de4dcefba698b':
Clean up obsolete pending timeout after restoring package metadata
2015-07-07 20:18:13 +00:00
Aravind Akella
1656c02468
am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev
...
* commit '2ea6c646bcaa67b6f36582abff9f5ccaf193acf2':
Clean up get sensorList.
2015-07-07 20:18:09 +00:00
Vineeta Srivastava
9d918db350
Merge "UsbDeviceManager: Add back support for persistent property" into mnc-dev
2015-07-07 20:13:46 +00:00
Christopher Tate
0546b1b149
am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev
...
* commit '7bc8f51aa665603b00454aa98129fe6c11594b64':
Clean up obsolete pending timeout after restoring package metadata
2015-07-07 20:03:45 +00:00
Aravind Akella
2ea6c646bc
am c5889757: Merge "Clean up get sensorList." into mnc-dev
...
* commit 'c5889757cb7474b613db22cc7a0af44fe50661fd':
Clean up get sensorList.
2015-07-07 20:03:41 +00:00
Jorim Jaggi
4165748359
am 17bf58a3: am d4be15d5: am 588932a5: Always wait for the main app window before starting a transition
...
* commit '17bf58a34a41b8067ff60964403607bfb8fe9f0b':
Always wait for the main app window before starting a transition
2015-07-07 19:54:31 +00:00
Christopher Tate
7bc8f51aa6
Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev
2015-07-07 19:54:20 +00:00
Selim Cinek
7f213d4f7b
am 4ecb66d0: am 865c35aa: am 7e675645: Merge "Fixed keyguard affordances" into mnc-dev
...
* commit '4ecb66d0f305302ba02f47c882a4301a7a3b54d2':
Fixed keyguard affordances
2015-07-07 19:54:20 +00:00
Aravind Akella
c5889757cb
Merge "Clean up get sensorList." into mnc-dev
2015-07-07 19:53:46 +00:00
Jorim Jaggi
17bf58a34a
am d4be15d5: am 588932a5: Always wait for the main app window before starting a transition
...
* commit 'd4be15d551f57cb13c44cac79b8b0efa1e54b4cf':
Always wait for the main app window before starting a transition
2015-07-07 19:44:21 +00:00
Selim Cinek
4ecb66d0f3
am 865c35aa: am 7e675645: Merge "Fixed keyguard affordances" into mnc-dev
...
* commit '865c35aa3218e535b387861a23cf0ad625257a1a':
Fixed keyguard affordances
2015-07-07 19:44:17 +00:00
Chris Craik
ab614e540a
am 30eaf590: am df134e87: am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev
...
* commit '30eaf590f247ac0a14d199bf4685a84726ffb691':
Simplify matrix copy constructor/load
2015-07-07 19:42:16 +00:00
Jorim Jaggi
d4be15d551
am 588932a5: Always wait for the main app window before starting a transition
...
* commit '588932a53e63c0a7ee281dea22559c129b40eb99':
Always wait for the main app window before starting a transition
2015-07-07 19:34:15 +00:00
Chris Craik
30eaf590f2
am df134e87: am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev
...
* commit 'df134e8722efe489ccdc23cb276c98e20ff74738':
Simplify matrix copy constructor/load
2015-07-07 19:34:13 +00:00
Selim Cinek
865c35aa32
am 7e675645: Merge "Fixed keyguard affordances" into mnc-dev
...
* commit '7e675645a9f02ae2273291d31673164177b7be0b':
Fixed keyguard affordances
2015-07-07 19:34:11 +00:00
Alex Klyubin
70c4b87378
am b1b3be8e: am eb9c8613: am 024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev
...
* commit 'b1b3be8e5b7fadba7428f8c5e9dedaf7f9a9565e':
Support loading AES keys with authorized digests.
2015-07-07 19:32:18 +00:00
Andrew Solovay
195f0406bc
am 4bfeb665: am da2b00ac: am a5c82a6b: am 4357181d: am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions
...
* commit '4bfeb665deb4bd2750366e84ab05185dcf752e95':
docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
2015-07-07 19:32:12 +00:00
Chris Craik
b5892a4156
am 93d7725b: am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev
...
* commit '93d7725b008f90d8d1e5a2c01cab95e3ad6451f9':
Don't update DisplayLists when dumping
2015-07-07 19:32:06 +00:00
Jorim Jaggi
588932a53e
Always wait for the main app window before starting a transition
...
When waiting for all the windows that belong to an activity, we
skipped the main window, in case it didn't had a surface yet. This
was a problem because with SurfaceViews: They set it's visibility
extremely early in the app visibility change cycle. Then, they use
another thread to draw content. Thus, they have drawn their first
frame pretty fast, where the main thread might still be in the
activity lifecycle phases. Then, we don't even have a surface for the
main window yet, but we start the app transition already because we
think the only interesting window for this app token is the
SurfaceView, which has already drawn.
Bug: 22207948
Change-Id: I708add3aab00575ae1707b25622b9b4614472892
2015-07-07 19:27:29 +00:00
Chris Craik
df134e8722
am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev
...
* commit '54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793':
Simplify matrix copy constructor/load
2015-07-07 19:22:34 +00:00
Selim Cinek
7e675645a9
Merge "Fixed keyguard affordances" into mnc-dev
2015-07-07 19:19:05 +00:00
Chien-Yu Chen
12a8385b7e
Camera2: implement Key.toString()
...
Implement toString() for CameraCharacteristics.Key,
CaptureResult.Key, and CaptureRequest.Key.
Bug: 22279124
Change-Id: Ib1076e3f6d7bcbffbb148a7a01f72133daccebb8
2015-07-07 12:17:22 -07:00
Alex Klyubin
b1b3be8e5b
am eb9c8613: am 024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev
...
* commit 'eb9c86131ebb07729db712f357ff2f9770b30f1a':
Support loading AES keys with authorized digests.
2015-07-07 19:14:00 +00:00
Andrew Solovay
4bfeb665de
am da2b00ac: am a5c82a6b: am 4357181d: am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions
...
* commit 'da2b00acfa5d52eefed50163e8f630fa5c2a4e70':
docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
2015-07-07 19:13:55 +00:00
Chris Craik
93d7725b00
am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev
...
* commit '268ad521b3880917849407273565fb6f4aed8a0b':
Don't update DisplayLists when dumping
2015-07-07 19:13:49 +00:00
Chris Craik
54d1f0439e
Merge "Simplify matrix copy constructor/load" into mnc-dev
2015-07-07 19:09:43 +00:00
Alex Klyubin
eb9c86131e
am 024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev
...
* commit '024bce82292786f9b71da488f06a0bb35d029bbf':
Support loading AES keys with authorized digests.
2015-07-07 19:05:00 +00:00
Andrew Solovay
da2b00acfa
am a5c82a6b: am 4357181d: am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions
...
* commit 'a5c82a6b2adfbad7ac9009fa6feba3e02dad0c04':
docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
2015-07-07 18:56:15 +00:00
Chris Craik
268ad521b3
am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev
...
* commit '6ef57e974144e05e83ee1bd00f705f0f409f48b3':
Don't update DisplayLists when dumping
2015-07-07 18:56:11 +00:00