Winson Chung
27700e54d2
am 6b150206: am 9d78363f: am e07c1cc0: Intermediate refactoring to move towards in-app view transitions.
...
* commit '6b15020610c48600a221b4e209d25814cf1f1558':
Intermediate refactoring to move towards in-app view transitions.
2014-07-22 22:37:03 +00:00
Winson Chung
e6c27b45f5
am 9d78363f: am e07c1cc0: Intermediate refactoring to move towards in-app view transitions.
...
* commit '9d78363f8f36d5bd4862c121c8f3b5c05bb1aa6b':
Intermediate refactoring to move towards in-app view transitions.
2014-07-22 22:32:57 +00:00
Winson Chung
3c253b95d0
am e07c1cc0: Intermediate refactoring to move towards in-app view transitions.
...
* commit 'e07c1cc0a2315b5ee936e3c9ffe459596ad41bc4':
Intermediate refactoring to move towards in-app view transitions.
2014-07-22 22:28:47 +00:00
Winson Chung
dcfa7976fa
Intermediate refactoring to move towards in-app view transitions.
...
- Fixing bug where we weren't toggling to the right task when using affiliations
- Refactoring task rect calculation to allow full screen task view to be laid out for transitions
- Refactoring the view bounds animations into a separate class
- Refactoring the footer view (for lock-to-task) out of TaskView
- Refactoring some transform code out of TaskView
- Removing fullscreen overlay view
- Fixing case where extra invalidations and layouts were still happening in FixedSizeImageView
- Adding debug overlay to replace specific debug drawing code
Change-Id: Ibf98b6a0782a68cd84582203c807cece1ff3379f
2014-07-22 22:25:33 +00:00
Andrew Lee
ef9364c306
am c3f7f312: am f0e8e160: am 9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
...
* commit 'c3f7f31253f70e4f613b4349b8e649b4d7335427':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
2014-07-22 22:20:04 +00:00
Jason Long
7200639df6
am eae8b7b6: am 91c5480e: am e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev
...
* commit 'eae8b7b6e74b479c25745ba94f2a3f37d1b2ed55':
Switched Holo to Material for account chooser activities.
2014-07-22 22:19:59 +00:00
Adrian Roos
5983547449
am 689da622: am 70917abe: am ff3666ad: Kill flashlight when launching the camera from lockscreen
...
* commit '689da622acd6aeadbc262ce25dd47637c0f3048d':
Kill flashlight when launching the camera from lockscreen
2014-07-22 22:19:53 +00:00
Andrew Lee
10540cdbe4
am f0e8e160: am 9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
...
* commit 'f0e8e160a774f9e3cb8c2bf6dccdb1e98501b517':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
2014-07-22 22:15:26 +00:00
Jason Long
98236b3867
am 91c5480e: am e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev
...
* commit '91c5480ee6de8f3f740708e71d5be355e2c04266':
Switched Holo to Material for account chooser activities.
2014-07-22 22:15:21 +00:00
Adrian Roos
18b6790bdc
am 70917abe: am ff3666ad: Kill flashlight when launching the camera from lockscreen
...
* commit '70917abeddb096dca993636020c80a1b2085dcc6':
Kill flashlight when launching the camera from lockscreen
2014-07-22 22:15:17 +00:00
Adrian Roos
162c559733
am 98e452ad: am ff704ec8: am ed9a0c81: QS: Hide flashlight tile if camera is busy
...
* commit '98e452ad6060394a86727ec84fedc579081d75a1':
QS: Hide flashlight tile if camera is busy
2014-07-22 22:12:09 +00:00
Andrew Lee
abafc1b9ca
am 9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
...
* commit '9d8c0b5cd7ea662f14aeaf4b54138e840bac7adc':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
2014-07-22 22:08:28 +00:00
Jason Long
d7aa76ae79
am e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev
...
* commit 'e3d7fc4b6c485545851b3851e8e6b2abf8b180b3':
Switched Holo to Material for account chooser activities.
2014-07-22 22:08:25 +00:00
Adrian Roos
40e917a5aa
am ff3666ad: Kill flashlight when launching the camera from lockscreen
...
* commit 'ff3666adc57d9faad2636a26ed87bbeef7001131':
Kill flashlight when launching the camera from lockscreen
2014-07-22 22:08:21 +00:00
Adrian Roos
0383c80247
am ff704ec8: am ed9a0c81: QS: Hide flashlight tile if camera is busy
...
* commit 'ff704ec8a4130e0fba4e9b8e980f34c64486ec54':
QS: Hide flashlight tile if camera is busy
2014-07-22 22:07:20 +00:00
Adrian Roos
a04431e840
am ed9a0c81: QS: Hide flashlight tile if camera is busy
...
* commit 'ed9a0c819452d4b22d966623fa217e28de815fd6':
QS: Hide flashlight tile if camera is busy
2014-07-22 22:03:16 +00:00
Robin Lee
377e9e8d2c
am 65d05c92: am 51533e26: am 96251e35: Stop double-loading device admins
...
* commit '65d05c923be7a044bee2503394396ff94e29bf5f':
Stop double-loading device admins
2014-07-22 22:01:50 +00:00
Adrian Roos
1e1d6ac541
Kill flashlight when launching the camera from lockscreen
...
Bug: 16357300
Change-Id: I6838ac405bb30047b076c8acb98bd124e8d00fd6
2014-07-22 22:01:29 +00:00
Adrian Roos
930aaa717e
QS: Hide flashlight tile if camera is busy
...
Currently behind a flag because the camera API for this not working
correctly yet.
Bug: 16357300
Change-Id: Ib10a2eafb1323fd611f38db03a2e0b4d7aa67db0
2014-07-22 22:00:14 +00:00
Paul Soulos
8a69d8f823
am 296caf5f: am 642251ef: am 9d129942: Adds ScrollBounds to the Transition framework
...
* commit '296caf5f18a960033196568054537acf456698e4':
Adds ScrollBounds to the Transition framework
2014-07-22 21:55:30 +00:00
Alan Viverette
7827184db9
am a0660d91: am 62e45ecb: am d6f1350f: Make toolbarStyle public
...
* commit 'a0660d916799d4d06ca0f746682da9be493707df':
Make toolbarStyle public
2014-07-22 21:55:22 +00:00
Robert Ly
4d5ae741c8
am 94ac1894: am b5bf50b8: am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
...
* commit '94ac18948b37667217587375e1d3803546056ad7':
Doc change: add reminder for developers on using ad id.
2014-07-22 21:55:18 +00:00
David Friedman
9b95b6b43f
am 0dbc9b00: am 83fc010d: am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
...
* commit '0dbc9b00a4d17ddc12fae37b9b3638507088a29f':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
2014-07-22 21:55:13 +00:00
Chris Craik
f2011eeb5a
am 10a855b2: am c9d4ee79: am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
...
* commit '10a855b2c7b2c2c2cc1ca0123ca781f8a4fa1250':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
2014-07-22 21:55:10 +00:00
Alexandra Gherghina
dcad28182e
am 2b10cab0: (-s ours) am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync
...
* commit '2b10cab08642459b599ea3c568c088728d396610':
Do Not Merge Per-user API for master sync
2014-07-22 21:55:05 +00:00
Scott Rowe
4fc68b5ac5
am b3928b83: am 487dd79a: am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
...
* commit 'b3928b83a8d2bde8fd44cda3949d996a45302475':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
2014-07-22 21:55:00 +00:00
Igor Murashkin
a22ecc270f
am f696a3f3: am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
...
* commit 'f696a3f3ceabd42b59979ac4d84187318c92900a':
camera2: Add legacy available Request/Result/Characteristics keys
2014-07-22 21:54:56 +00:00
Alan Viverette
10f6e97b26
am 11d6a547: am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
...
* commit '11d6a5470fb5315a294bc1f2c50bf4232382b58a':
Add popupTheme attr, propagate from ActionBar to ToolBar
2014-07-22 21:54:52 +00:00
Alex Klyubin
b4e042031c
am 4c08680b: am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style.
...
* commit '4c08680b4be0cfb70bcd9479f46ede59e1cd29e5':
Align PSKKeyManager with framework API style.
2014-07-22 21:54:42 +00:00
Robin Lee
ea697d7269
am 51533e26: am 96251e35: Stop double-loading device admins
...
* commit '51533e265dc5081d70c010d6f17e36f6b72dc8e5':
Stop double-loading device admins
2014-07-22 21:53:45 +00:00
Paul Soulos
bc642e88ae
am 642251ef: am 9d129942: Adds ScrollBounds to the Transition framework
...
* commit '642251ef91bf4d593d7ab657df03b00afb2973ac':
Adds ScrollBounds to the Transition framework
2014-07-22 21:47:25 +00:00
Alan Viverette
1504123949
am 62e45ecb: am d6f1350f: Make toolbarStyle public
...
* commit '62e45ecbd12fa6221d8f0dfeb53df1af22409c6f':
Make toolbarStyle public
2014-07-22 21:47:21 +00:00
Robert Ly
bf56efcabf
am b5bf50b8: am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
...
* commit 'b5bf50b8995415ce1f205d76dc87aae05b65ba5a':
Doc change: add reminder for developers on using ad id.
2014-07-22 21:47:17 +00:00
David Friedman
3a95c5904c
am 83fc010d: am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
...
* commit '83fc010d0ab693fb1d06f89980ae629894a44ade':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
2014-07-22 21:47:13 +00:00
Chris Craik
8ef999a3e8
am c9d4ee79: am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
...
* commit 'c9d4ee79e73f000987a05d9d27d5eb024e5ba525':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
2014-07-22 21:47:09 +00:00
Alexandra Gherghina
a461c35ef5
am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync
...
* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
Do Not Merge Per-user API for master sync
2014-07-22 21:47:05 +00:00
Scott Rowe
30c5f1a3f0
am 487dd79a: am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
...
* commit '487dd79ab28525a3a3c685dd39f09ab0539757a1':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
2014-07-22 21:47:01 +00:00
Igor Murashkin
6f978b3e73
am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
...
* commit 'f555fe554c28bc8f4e094dce502f343d70be4f3e':
camera2: Add legacy available Request/Result/Characteristics keys
2014-07-22 21:46:55 +00:00
Alan Viverette
7b689aa6cf
am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
...
* commit '11dbd68d68aba1c7f42304544f88fbffe496bb02':
Add popupTheme attr, propagate from ActionBar to ToolBar
2014-07-22 21:46:49 +00:00
Alex Klyubin
7b969f3eea
am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style.
...
* commit '0caaa29e5bf388c929e81ed417637f4fe4df52f8':
Align PSKKeyManager with framework API style.
2014-07-22 21:46:43 +00:00
Robin Lee
e5cde201b7
am 96251e35: Stop double-loading device admins
...
* commit '96251e350b75e6ddbe061e891cfb15f54c936b4b':
Stop double-loading device admins
2014-07-22 21:45:56 +00:00
Paul Soulos
ea55f7820a
am 9d129942: Adds ScrollBounds to the Transition framework
...
* commit '9d129942f470ccb10096ebd1afe61a4be36419d0':
Adds ScrollBounds to the Transition framework
2014-07-22 21:39:52 +00:00
Alan Viverette
c41dd1039c
am d6f1350f: Make toolbarStyle public
...
* commit 'd6f1350fddb45253820fd8c07497186829788f6f':
Make toolbarStyle public
2014-07-22 21:39:42 +00:00
Robert Ly
0d65c8a739
am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
...
* commit '1c08a2ba917f732c8f4a18862b331f43d64f1505':
Doc change: add reminder for developers on using ad id.
2014-07-22 21:39:33 +00:00
David Friedman
cbc3815469
am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
...
* commit '0514aba57216b2388f85822b7a39731cd9a9ee7e':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
2014-07-22 21:39:29 +00:00
Chris Craik
cd96a6f0de
am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
...
* commit '52b2ae22c6e1ede01027c83cad33507cbfceabd9':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
2014-07-22 21:39:26 +00:00
Alexandra Gherghina
7f9a433e98
am 5f9a77e5: Do Not Merge Per-user API for master sync
...
* commit '5f9a77e5337c16335abaa586beab900c25014668':
Do Not Merge Per-user API for master sync
2014-07-22 21:39:14 +00:00
Scott Rowe
8d4f88a60f
am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
...
* commit 'd6900ec2a6603433e50657a7843966c7d10651ea':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
2014-07-22 21:39:09 +00:00
Igor Murashkin
a23eebfd83
am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
...
* commit '8f9b6d08fe8b8fc7d8ad88bb68989ebb13dd7aae':
camera2: Add legacy available Request/Result/Characteristics keys
2014-07-22 21:39:05 +00:00
Alan Viverette
741fd64fdd
am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
...
* commit '290f45f5affaedcc1ad07b531f700e9695e48b3f':
Add popupTheme attr, propagate from ActionBar to ToolBar
2014-07-22 21:38:58 +00:00