George Mount
486384ef46
am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500
...
* commit '0d6624d35af7c7623cf97084753255079b01fbdf':
Ensure views are attached prior to starting enter transition.
2014-10-31 21:43:21 +00:00
George Mount
0d6624d35a
am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
...
automerge: 7bce500
2014-10-31 21:38:13 +00:00
George Mount
fa21e75734
Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
2014-10-31 21:30:20 +00:00
Sander Alewijnse
fc3ddf1107
am a1ceb929: am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
...
* commit 'a1ceb92964612fca32bcd83e07b26e72994afca2':
Change javadoc of setAccountManagementDisabled.
2014-10-31 10:26:03 +00:00
Sander Alewijnse
a1ceb92964
am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
...
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
Change javadoc of setAccountManagementDisabled.
2014-10-31 10:20:08 +00:00
Sander Alewijnse
a0edff4e94
Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
2014-10-31 10:05:36 +00:00
George Mount
6ced4faf69
am 104257ba: am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
...
* commit '104257bac6dfd677a2f0a36467d5a42eef27e597':
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
2014-10-31 00:43:37 +00:00
George Mount
104257bac6
am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
...
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
2014-10-31 00:38:48 +00:00
Jeff Hao
ab3ff04d52
am 05ea3213: am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
...
* commit '05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17':
Change boot screen title to "Android is starting" when not upgrading.
2014-10-31 00:00:57 +00:00
Jeff Hao
05ea3213fd
am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
...
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
Change boot screen title to "Android is starting" when not upgrading.
2014-10-30 23:44:09 +00:00
George Mount
1fb941dd4f
Ensure views are attached prior to starting enter transition.
...
Bug 17964119
Change-Id: Ic4ecd5aa9a3bbe5565381b8d9b3c79dd47720e5d
2014-10-30 12:30:12 -07:00
George Mount
ca5094a05c
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
...
Bug 18170774
Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
2014-10-30 12:21:00 -07:00
Sander Alewijnse
112e053b9a
Change javadoc of setAccountManagementDisabled.
...
Method can also be called by device owner.
Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
2014-10-30 14:54:28 +00:00
Jeff Hao
9f60c08a44
Change boot screen title to "Android is starting" when not upgrading.
...
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
2014-10-29 14:42:39 -07:00
George Mount
830593ee70
am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev automerge: 8a536bb
...
* commit 'aeb0a9dba297a027344bc91e8b9e33c84c450876':
Fix NPE in moveSharedElementsToOverlay
2014-10-28 19:05:50 +00:00
George Mount
7883be77e5
am c1423972: am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev automerge: 69a3dd8
...
* commit 'c1423972727f59a02ca1bc3e55f694e9a27b82d5':
Fixed: Nested shared elements now transition separately.
2014-10-28 19:05:47 +00:00
George Mount
aeb0a9dba2
am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
...
automerge: 8a536bb
2014-10-28 18:06:58 +00:00
George Mount
c142397272
am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
...
automerge: 69a3dd8
2014-10-28 18:06:04 +00:00
George Mount
95d520f160
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
2014-10-28 17:01:25 +00:00
George Mount
45b701085b
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
2014-10-28 17:00:43 +00:00
Dake Gu
286918f718
am 54aad953: am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev automerge: 63964d9
...
* commit '54aad9533646d3e4ebbf474858112d61424f9b6d':
ActivityTransition: Encode scaleType and matrix in snapshot view
2014-10-28 07:16:30 +00:00
Dake Gu
54aad95336
am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
...
automerge: 63964d9
2014-10-27 21:34:58 +00:00
George Mount
eca1ae5e44
Fix NPE in moveSharedElementsToOverlay
...
Bug 18119532
Change-Id: I334bda2d63427032583a15a483e000412024c150
2014-10-27 14:25:12 -07:00
Dake Gu
4c2e3491ec
Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
2014-10-27 20:23:28 +00:00
George Mount
8652102d3f
am a618afc0: am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
...
* commit 'a618afc0c76ceefc9a0fb4dd9c1b5f7685e0e84e':
Fix NPE when rejected snapshots are null.
2014-10-25 02:36:40 +00:00
George Mount
333b8093ea
Fixed: Nested shared elements now transition separately.
...
Bug 18073470
Shared element ordering was based on the key ordering in an
ArrayMap. This is normally fine, but when shared elements
are nested, the child's layout can be overwritten by the
parent's if it is laid out first. The only way to force the
ordering of shared element layout was the change the transition
name. To fix this, shared elements are now laid out parent
first, then child.
On return, nested shared elements were not transitioning to their
final destination properly because the matrix used to calculate
their position was not correct. This change recalculates the
parent matrices when appropriate.
Change-Id: I62333183cf03519e525587e4ea31fcf14bb83cdc
2014-10-24 16:19:19 -07:00
George Mount
a618afc0c7
am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
...
* commit '511452cf4d3cd2669a89abd98658a844b852b5e3':
Fix NPE when rejected snapshots are null.
2014-10-24 23:13:38 +00:00
George Mount
b71580c34e
Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
2014-10-24 22:43:45 +00:00
George Mount
83c692efd3
Fix NPE when rejected snapshots are null.
...
Bug 18055705
Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
2014-10-24 15:26:32 -07:00
Jeff Sharkey
b0baae47e8
am b144b5f1: am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev
...
* commit 'b144b5f1251c74ddbeeea20eecdda9906c76286d':
Allow I/O when installing providers.
2014-10-24 17:52:57 +00:00
Jeff Sharkey
b144b5f125
am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev
...
* commit 'e92bd4c04bcb0d18c0fdae9246f4af06a5aba345':
Allow I/O when installing providers.
2014-10-24 17:48:22 +00:00
Jeff Sharkey
2d87ba630c
Merge "Allow I/O when installing providers." into lmp-mr1-dev
2014-10-24 17:40:30 +00:00
Adrian Roos
8b70c1e29b
am 621823e0: am 53f30ec2: am bcd07652: Add API for querying trusted state
...
* commit '621823e0641b883684e7f9e8c705f0dc69dd02ce':
Add API for querying trusted state
2014-10-24 13:33:30 +00:00
Adrian Roos
621823e064
am 53f30ec2: am bcd07652: Add API for querying trusted state
...
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
Add API for querying trusted state
2014-10-24 13:27:39 +00:00
Adrian Roos
bcd076525c
Add API for querying trusted state
...
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
2014-10-24 13:59:45 +02:00
Svetoslav
8ec648c18f
am eed63916: am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev automerge: 89e7ffe
...
* commit 'eed63916a184b05fa8572c9a8151745d05777740':
APIs for an accessibility service to put interaction tracking overlays.
2014-10-24 02:14:06 +00:00
Svetoslav
eed63916a1
am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev
...
automerge: 89e7ffe
2014-10-24 02:04:11 +00:00
Jeff Sharkey
bb2e2cae58
Allow I/O when installing providers.
...
Bug: 17879170
Change-Id: I073d5b56bab6db01290aad5386c53c305669dc5b
2014-10-23 11:42:31 -07:00
Svetoslav
3a5c721072
APIs for an accessibility service to put interaction tracking overlays.
...
An accessibility service may register to observe the interactive windows
on the primary display. These windows are the one that has input focus and
ones a sighted user can touch. It is sometimes beneficial for an
accessibility service to overlay a window to intercept user interaction
and based on that introspect and perform an action on the windows that
are on the screen. This is problematic as overlaying a full screen window
that is touchable prevents the accessibility service to introspect the
content under this window.
This change adds a special type of window that only an accessibility service
can place which does not affect what an accessibility service can "see" on
the screen. Hence, even putting such a window full screen the service will
be able to interact with the other interactive windows it covers.
Change-Id: I053ccc3a5c6360a98dc40bdb172b54dab35d8b31
2014-10-21 14:45:53 -07:00
Brian Carlstrom
c12099678f
am 70111a42: am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit '70111a429d6da51ffd1790eb767086acada2dabe':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 18:12:59 +00:00
Brian Carlstrom
70111a429d
am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'fe6cde379a7b086032877917c0ee0e64bf7e9e57':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 18:05:13 +00:00
Brian Carlstrom
6580c273a5
am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 17:45:54 +00:00
George Mount
e084c1f1e5
am 56789daa: am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
...
* commit '56789daadf666a24c4644cd3820561566582109f':
Use empty snapshots list when there are no shared elements.
2014-10-16 14:35:30 +00:00
George Mount
56789daadf
am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
...
* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
Use empty snapshots list when there are no shared elements.
2014-10-16 14:29:51 +00:00
George Mount
ea6f0ae86d
Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
2014-10-16 14:21:43 +00:00
Brian Carlstrom
20de619d66
Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
2014-10-16 01:01:26 +00:00
George Mount
7c479f5a01
Use empty snapshots list when there are no shared elements.
...
Bug 17964119
Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
2014-10-15 16:21:51 -07:00
Amith Yamasani
8d0c97af73
am 2df0ce5e: am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '2df0ce5e2b73900452b8a1841938d3407469af41':
Fix admin policies in managed profiles
2014-10-15 18:16:54 +00:00
Amith Yamasani
2df0ce5e2b
am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit 'ecb7b899b022d2ecbee48324c1e4a524a596a29e':
Fix admin policies in managed profiles
2014-10-15 18:12:10 +00:00
Amith Yamasani
5c8cafa614
am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
Fix admin policies in managed profiles
2014-10-15 17:54:34 +00:00
