Chris Craik
3a35c79230
am d93bb9e1: Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev
...
* commit 'd93bb9e1ef18d6b91022adaa7e75d8846d64e8b4':
Make setter methods on Outline call setEmpty() based on params
2014-07-23 00:31:20 +00:00
Sandeep Siddhartha
355a14c2fa
am 82d56d82: Merge "Make hotword availability a callback" into lmp-dev
...
* commit '82d56d8265a5f8101260af2534e3984199c96c8f':
Make hotword availability a callback
2014-07-23 00:31:16 +00:00
Alan Viverette
5b9b89180c
am ee9da48f: am 22086055: Update spinner asset, fix default popup context and elevation
...
* commit 'ee9da48f932b39d06294690098849305387c614d':
Update spinner asset, fix default popup context and elevation
2014-07-23 00:29:10 +00:00
Alan Viverette
83797835f7
am 22086055: Update spinner asset, fix default popup context and elevation
...
* commit '22086055e66b6f574b56970392ddef5277a049ae':
Update spinner asset, fix default popup context and elevation
2014-07-23 00:23:46 +00:00
Yao Chen
ce548123ce
am e35271bf: am 1b630ae7: am 5d35986f: Merge "Add thumbnail related api." into lmp-dev
...
* commit 'e35271bf3d7eb67ab5426dcd66a546afadbc1ada':
Add thumbnail related api.
2014-07-23 00:21:30 +00:00
Chris Craik
88fbb5f48f
am 215ecb93: Merge "Restore untrusted glStencilMask value on resume after functor"
...
* commit '215ecb93e9ca93a7445f38534b29ac917557f8e1':
Restore untrusted glStencilMask value on resume after functor
2014-07-23 00:20:16 +00:00
Yao Chen
2415e36c3e
am 1b630ae7: am 5d35986f: Merge "Add thumbnail related api." into lmp-dev
...
* commit '1b630ae7614e1c6b1555465ef7e0511e523c382d':
Add thumbnail related api.
2014-07-23 00:18:50 +00:00
Alan Viverette
77e5037d81
Update spinner asset, fix default popup context and elevation
...
BUG: 15985882
Change-Id: Ica8c2597c35bd3012da11e315a93bbd1df2f3f38
2014-07-23 00:18:07 +00:00
Winson Chung
e8f6c302ca
am 6e29369f: am 22cd005d: am f67f7277: Fixing animation when dismissing certain tasks.
...
* commit '6e29369f4dfb67d2474485e361dea95dfa7f771c':
Fixing animation when dismissing certain tasks.
2014-07-23 00:17:28 +00:00
Chong Zhang
5a9b5fd812
am f943c8df: am c32da708: am 2c4813d3: update battery stats for audio/video
...
* commit 'f943c8dfed52b27ba1e3a0b34ac92e32a5b0c64b':
update battery stats for audio/video
2014-07-23 00:17:24 +00:00
Winson Chung
5d5ae28966
am 22cd005d: am f67f7277: Fixing animation when dismissing certain tasks.
...
* commit '22cd005d5f1245207185e006ea0ba7a079bee16f':
Fixing animation when dismissing certain tasks.
2014-07-23 00:14:27 +00:00
Chong Zhang
f4da6eaf1a
am c32da708: am 2c4813d3: update battery stats for audio/video
...
* commit 'c32da70878e8c5b4b8175157af9acee90e4656e0':
update battery stats for audio/video
2014-07-23 00:14:23 +00:00
Yao Chen
b569a58346
am 5d35986f: Merge "Add thumbnail related api." into lmp-dev
...
* commit '5d35986f734b4b87c8d3b1005b8440ec00a31223':
Add thumbnail related api.
2014-07-23 00:10:56 +00:00
Winson Chung
05b6d041de
am f67f7277: Fixing animation when dismissing certain tasks.
...
* commit 'f67f72774383b35d0661f60d933c1a9468bac296':
Fixing animation when dismissing certain tasks.
2014-07-23 00:06:43 +00:00
Chong Zhang
d496790e1d
am 2c4813d3: update battery stats for audio/video
...
* commit '2c4813d3e33b275166d77f6c397920a10b2dd91e':
update battery stats for audio/video
2014-07-23 00:06:39 +00:00
Winson Chung
d6c3db5e5a
Fixing animation when dismissing certain tasks.
2014-07-23 00:05:36 +00:00
Chong Zhang
f3d00e4e0a
update battery stats for audio/video
...
Bug: 12979595
Change-Id: I581376cb88a2d14dc4bad77d454b9bba73d0eb9b
2014-07-23 00:01:46 +00:00
Sreeram Ramachandran
6ff7386407
am a9dc918b: am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev
...
* commit 'a9dc918b3dc7c45c4c8d45b838d058d1323e092f':
Cleanup: Delete dead code.
2014-07-22 23:57:27 +00:00
Christopher Tate
b713d1b946
am 9422b47d: am 8b9f6619: am ef76d6a4: Merge "Handle single-package restores properly" into lmp-dev
...
* commit '9422b47db61fed874885bd70a319793384cc6d4c':
Handle single-package restores properly
2014-07-22 23:57:22 +00:00
John Spurlock
e887756e29
am 8a595808: am b3d83469: am 3524c495: Merge "BatterySaver: Make the bars orange." into lmp-dev
...
* commit '8a595808400b0caf3940fe179eeb6b0dfb1b178a':
BatterySaver: Make the bars orange.
2014-07-22 23:57:17 +00:00
Sreeram Ramachandran
3e47b60378
am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev
...
* commit 'a4a229185c60f4abf6674adc6a49e5ab7000fb16':
Cleanup: Delete dead code.
2014-07-22 23:53:25 +00:00
Christopher Tate
a5e44a8cf8
am 8b9f6619: am ef76d6a4: Merge "Handle single-package restores properly" into lmp-dev
...
* commit '8b9f6619830d5291b16d13ce211a5b7542417907':
Handle single-package restores properly
2014-07-22 23:53:21 +00:00
John Spurlock
057dff0573
am b3d83469: am 3524c495: Merge "BatterySaver: Make the bars orange." into lmp-dev
...
* commit 'b3d834695725aafcb79f75d7bc8e1bba1da3f7e3':
BatterySaver: Make the bars orange.
2014-07-22 23:53:13 +00:00
Andrew Lee
11af70a77d
am fc50b246: am 327d6793: am 195f16be: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
...
* commit 'fc50b2462d8a2573213891eaa5e8d5dba742a8dd':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
2014-07-22 23:49:09 +00:00
Winson Chung
97e913bbec
am b8c5a126: am c4544b2b: am 6dcd490f: Always enable HW layers on task views. (Bug 15986310)
...
* commit 'b8c5a126ed70a36d7e75d8337b1e385d672da190':
Always enable HW layers on task views. (Bug 15986310)
2014-07-22 23:49:04 +00:00
Sreeram Ramachandran
f0db442e0d
am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev
...
* commit 'bfea100c342c640efc001af733e9dff7355e16fd':
Cleanup: Delete dead code.
2014-07-22 23:48:52 +00:00
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
7995e144f2
am 1b15ed72: am 390f77b3: am befdf350: Move return out of debug conditional
...
* commit '1b15ed72211e4996a9b8ee7651f8cc9823cf8b9b':
Move return out of debug conditional
2014-07-22 23:11:51 +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
4cadf2e181
am 4253251a: am aebbc98b: am 601e5f54: Merge "Revert "Don\'t throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
...
* commit '4253251ad30fc03f87eacd46da85e7ff22ab4622':
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
2014-07-22 22:55:00 +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
c0bb054926
am f2d8df2f: am 96448307: am 258e43ce: Merge "Always check restore against the latest backend metadata" into lmp-dev
...
* commit 'f2d8df2f194236131bd101a5b8946cfc3473600b':
Always check restore against the latest backend metadata
2014-07-22 22:50:55 +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
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