Christopher Tate
659898574a
am ef76d6a4: Merge "Handle single-package restores properly" into lmp-dev
...
* commit 'ef76d6a48709a99f6e49c0c2100ba2e0c4a083dd':
Handle single-package restores properly
2014-07-22 23:48:48 +00:00
John Spurlock
2f9b1b955e
am 3524c495: Merge "BatterySaver: Make the bars orange." into lmp-dev
...
* commit '3524c4956c378515fc8595676d6cc2bfc927e588':
BatterySaver: Make the bars orange.
2014-07-22 23:48:43 +00:00
Andrew Lee
c11b95c022
am 327d6793: am 195f16be: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
...
* commit '327d6793854896bc8dc6fcdea65e7dfbf9f41a29':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
2014-07-22 23:45:10 +00:00
Winson Chung
e309b7b2ef
am c4544b2b: am 6dcd490f: Always enable HW layers on task views. (Bug 15986310)
...
* commit 'c4544b2b8a2b8655923e6a9c8e77acc6220b15ba':
Always enable HW layers on task views. (Bug 15986310)
2014-07-22 23:45:05 +00:00
Andrew Lee
869a05dd96
am 195f16be: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
...
* commit '195f16be459635f732561aa0e25f84e3e8c76216':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
2014-07-22 23:40:18 +00:00
Winson Chung
f5df033135
am 6dcd490f: Always enable HW layers on task views. (Bug 15986310)
...
* commit '6dcd490f981843e9993cef8431781c46d49befc5':
Always enable HW layers on task views. (Bug 15986310)
2014-07-22 23:40:12 +00:00
Winson Chung
7ea62ba97b
Always enable HW layers on task views. (Bug 15986310)
...
- Use color filter to apply dim to the task view layer
- Fixing bug where you would see a flash of the task view when animating out of Recents.
2014-07-22 23:33:06 +00:00
RoboErik
c231679abc
am 390f77b3: am befdf350: Move return out of debug conditional
...
* commit '390f77b31b6c0cf71578e636154715fe462bcd93':
Move return out of debug conditional
2014-07-22 23:07:30 +00:00
RoboErik
2c84ca3826
am befdf350: Move return out of debug conditional
...
* commit 'befdf350a6e0b897a7d6825523de9875403d1a85':
Move return out of debug conditional
2014-07-22 23:03:40 +00:00
RoboErik
b7c014c291
Move return out of debug conditional
...
Accidentally put the return for not sending volume changes into
the debug conditional.
bug:16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
2014-07-22 23:00:14 +00:00
Andrew Lee
58aec03a67
am aebbc98b: am 601e5f54: Merge "Revert "Don\'t throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
...
* commit 'aebbc98b10ac54568d835841f932e1b0f2d05266':
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
2014-07-22 22:51:14 +00:00
Christopher Tate
574d5e1c8e
am 96448307: am 258e43ce: Merge "Always check restore against the latest backend metadata" into lmp-dev
...
* commit '96448307e6a14aa593adb19a0d2ab62a2b96b6ae':
Always check restore against the latest backend metadata
2014-07-22 22:47:06 +00:00
Andrew Lee
f2b2599c2b
am 601e5f54: Merge "Revert "Don\'t throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
...
* commit '601e5f546cd5624916beaf274a327ed2538e29ec':
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
2014-07-22 22:46:50 +00:00
Christopher Tate
6dc9de19da
am 258e43ce: Merge "Always check restore against the latest backend metadata" into lmp-dev
...
* commit '258e43cead6489c4472fa319be49060c5e213b65':
Always check restore against the latest backend metadata
2014-07-22 22:42:43 +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
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
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
Chris Craik
c403a39089
Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev
2014-07-22 22:02:55 +00:00
Chris Craik
0645128b80
Make setter methods on Outline call setEmpty() based on params
...
bug:16142564
Additionally, better define behavior around null outline providers:
A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.
Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
2014-07-22 15:15:11 -07:00
John Spurlock
0323bf7553
Merge "BatterySaver: Make the bars orange." into lmp-dev
2014-07-22 22:02:55 +00:00
John Spurlock
0ff62e0911
BatterySaver: Make the bars orange.
...
Bug:16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
2014-07-22 18:53:08 -04:00
John Spurlock
79cac9d0f0
Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev
2014-07-22 22:02:49 +00:00
John Spurlock
333f8dd78f
Wire up CATEGORY_ALARM and CATEGORY_EVENT.
...
And remove the alarm package whitelist now that deskclock
uses a category.
Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
2014-07-22 21:06:34 -04: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
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
Alan Viverette
52ff21d841
Merge "Remove dialog icons" into lmp-dev
2014-07-22 21:50:21 +00:00
Alan Viverette
ed8e09b664
Remove dialog icons
...
BUG: 16493564
Change-Id: Ica59abb70a924cccd705172d323a535ef9b75cf1
2014-07-22 18:41:37 -07: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