Jorim Jaggi
18ca6f3cc3
am 7a11b237: Merge "Introduce AmbientState for StackScroller."
...
* commit '7a11b237632fa2822678901659ea3a50246d2ced':
Introduce AmbientState for StackScroller.
2014-05-08 01:18:26 +00:00
Jorim Jaggi
8a2a5fa0d1
Merge "Introduce AmbientState for StackScroller."
2014-05-08 01:13:31 +00:00
Jason Monk
cb20502fb4
am a7cb6e54: Merge "Fix Docs breakage"
...
* commit 'a7cb6e5419c68bf950b1babbf7ba5c951ddf8086':
Fix Docs breakage
2014-05-08 01:05:02 +00:00
Craig Mautner
749d065a9b
am aa79c9d7: Merge "Use new doccentric flags and attributes in Sharing"
...
* commit 'aa79c9d7d4c4adc24f7f0ffa2c01c46241430b71':
Use new doccentric flags and attributes in Sharing
2014-05-08 01:04:59 +00:00
Jason Monk
607562a766
Merge "Fix Docs breakage"
2014-05-08 01:00:54 +00:00
Craig Mautner
f12fca4ba5
Merge "Use new doccentric flags and attributes in Sharing"
2014-05-08 00:59:54 +00:00
Jorim Jaggi
d552d9d8e9
Introduce AmbientState for StackScroller.
...
AmbientState is a global state for the algorithm of the
StackScroller. Dimmed and which child is activated was moved
into this state. Further, scale and dimmed is also a
StackScrollState and animated in StackStateAnimator.
Change-Id: Ia68131cee62b2e0005f55ea6dc400d149ec15278
2014-05-08 02:33:56 +02:00
Russ Schnapp
d4a2c8ca7d
am f975bc6a: Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras"
...
* commit 'f975bc6a682cc5b5a5c764a8cc9acedf0288ee43':
Fix erroneous javadoc example SyncRequest.Builder.setExtras
2014-05-08 00:31:31 +00:00
Russ Schnapp
7359b0b885
Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras"
2014-05-08 00:24:10 +00:00
Craig Mautner
41db4a77fa
Use new doccentric flags and attributes in Sharing
...
Put the new doccentric flags and attributes into use. And make their
first application the Share widget. Sharing now creates a new task
which is destroyed once the share action has completed.
Fixes bug 14463859.
Change-Id: I34c4c79775ef44d65e1967be5601997a2d46b210
2014-05-07 17:20:56 -07:00
Jason Sams
5066ac85d3
am 6eb4c5bf: Merge "Add flags to context creation for RS"
...
* commit '6eb4c5bf830c952d70473edff5f2b8e5ab98ce29':
Add flags to context creation for RS
2014-05-08 00:05:04 +00:00
Jason Sams
8999bdc63c
Merge "Add flags to context creation for RS"
2014-05-08 00:01:39 +00:00
Alan Viverette
e80e2fc71e
am 91c091cf: Merge "State based animators for Views"
...
* commit '91c091cf7b732796d26971de6a508966e24d40a0':
State based animators for Views
2014-05-08 00:01:07 +00:00
Alan Viverette
b466977765
Merge "State based animators for Views"
2014-05-07 23:58:15 +00:00
Yigit Boyar
f4c5bf30b4
State based animators for Views
...
Set quantum theme buttons to elevate 2dp on press
Change-Id: Ibf4f5ef166b901382c304d392eba075836a96a35
2014-05-07 16:52:17 -07:00
John Reck
bf4c565cda
am c58ab5f6: Merge "Allow all loopers to be RT-accelerated"
...
* commit 'c58ab5f60e5fcc845ceb1e146372a1dbf99cbb82':
Allow all loopers to be RT-accelerated
2014-05-07 23:45:12 +00:00
Jason Monk
40878bebf5
am 59e6e796: Merge "Fix Docs breakage"
...
* commit '59e6e796dae4e3e6436c7c714510155931183990':
Fix Docs breakage
2014-05-07 23:45:08 +00:00
Vinod Krishnan
6c6fd8ad50
am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
...
* commit 'f215073420706e29305da762fa5f9f53dcf330ff':
Adding a HeartRate Feature
2014-05-07 23:44:59 +00:00
Florin Malita
5a04eb5212
am af72ee8f: Merge "Encapsulate Canvas.mNativeCanvas"
...
* commit 'af72ee8f538a265f572a71914879c1ae55e8e9fe':
Encapsulate Canvas.mNativeCanvas
2014-05-07 23:44:28 +00:00
Brian Carlstrom
b6d9ba2f70
am 529d0c9e: resolved conflicts for merge of 0b5598c9 to master
...
* commit '529d0c9ebf7f113a06f0cb5be9ea178075c19a4b':
Add BackgroundDexOptService
2014-05-07 23:43:50 +00:00
Selim Gurun
d7625b2b59
am 11b98d6d: Merge "Fix build"
...
* commit '11b98d6d25fb87dd43228160e10e9a4206bc21c9':
Fix build
2014-05-07 23:43:43 +00:00
Brian Carlstrom
ea4facab1c
am a599245c: Merge "resolved conflicts for merge of 3bbef521 to master"
...
* commit 'a599245ca0d4886842bff4257e254adaf6743e5f':
Use package usage information to decide what dex files to optimize in PackageManagerService
2014-05-07 23:43:38 +00:00
Winson Chung
e962c85e96
am 1c0090b6: Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants."
...
* commit '1c0090b6b3348cd7fe9e78e00c41f69cac2cdb7b':
Disabling shadowing (until bugs are addressed) and refactoring some constants.
2014-05-07 23:43:34 +00:00
John Reck
14d5767c37
am 9cdc11c6: Merge "Cleanup attachFunctor"
...
* commit '9cdc11c684756336734399dac16476a24b8348ef':
Cleanup attachFunctor
2014-05-07 23:43:30 +00:00
Jorim Jaggi
2daec8f4ad
am d19697b5: Merge "New layout structure for the expanded status bar."
...
* commit 'd19697b58c260e566f7724c7de81cbfd50a931e1':
New layout structure for the expanded status bar.
2014-05-07 23:43:26 +00:00
Jim Miller
56d9f20039
am e22854a7: am 424edf06: am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
...
* commit 'e22854a78f3149b5614bfcbe12dd767a24db03d9':
Fix can't change airplane mode from GlobalActions.
2014-05-07 23:43:21 +00:00
Zhijun He
02157bb93f
am eb440873: Camera: remove some DNG tags
...
* commit 'eb44087344cb545f97f78b802dc91bfec252f0f7':
Camera: remove some DNG tags
2014-05-07 23:42:39 +00:00
John Reck
b53f2b7882
am 47003dcd: Merge "Implement TODO(romainguy)"
...
* commit '47003dcd3993f06416c63b2a781ef43c6f5feed3':
Implement TODO(romainguy)
2014-05-07 23:42:32 +00:00
John Reck
fd0ca638b8
am be376021: Merge "Don\'t try to draw if there\'s no canvas or surface"
...
* commit 'be376021bc20431bf829de868d199992635d84c1':
Don't try to draw if there's no canvas or surface
2014-05-07 23:42:29 +00:00
Jorim Jaggi
4d2f8a553d
am 08d852aa: Merge "Add intermediate lock icon so users know how to unlock."
...
* commit '08d852aa220d3272b80b23ab3c221dbf5670fd8f':
Add intermediate lock icon so users know how to unlock.
2014-05-07 23:41:58 +00:00
Jason Monk
0c744579c5
am b80ab1b9: Fix Build
...
* commit 'b80ab1b91ab06679137678243b05f1f5a8fe19ee':
Fix Build
2014-05-07 23:41:53 +00:00
Jason Monk
41a2e33744
Fix Docs breakage
...
This depends on another API which evidently has not been merged
yet, this change should be reverted once the API is available
to be linked.
Change-Id: I59cb76e158fc0fac68ebd1c0de48b55e52274805
2014-05-07 19:18:38 -04:00
John Reck
ae493d967f
Merge "Allow all loopers to be RT-accelerated"
2014-05-07 23:16:52 +00:00
Jason Monk
fab0126136
Merge "Fix Docs breakage"
2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13
am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
...
* commit '03498d349ae3aa5e429e999b97036d194981373f':
Adding a HeartRate Feature
2014-05-07 22:57:45 +00:00
John Reck
030d619aaa
Allow all loopers to be RT-accelerated
...
Bug: 14445956
Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
2014-05-07 15:46:36 -07:00
Florin Malita
531fecca1c
Merge "Encapsulate Canvas.mNativeCanvas"
2014-05-07 22:44:47 +00:00
Jason Monk
faf3fd59d5
Fix Docs breakage
...
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
2014-05-07 18:41:13 -04:00
Brian Carlstrom
dfad99ad9f
resolved conflicts for merge of 0b5598c9 to master
...
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
2014-05-07 15:24:01 -07:00
Selim Gurun
b5a449e488
Merge "Fix build"
2014-05-07 22:08:31 +00:00
Brian Carlstrom
095652d3cb
Merge "resolved conflicts for merge of 3bbef521 to master"
2014-05-07 22:06:24 +00:00
Selim Gurun
5ba69bef8c
Fix build
...
Fix the java reflection to have the devices boot again.
Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
2014-05-07 15:04:40 -07:00
Winson Chung
945c27836b
Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants."
2014-05-07 22:04:16 +00:00
Winson Chung
814086db67
Disabling shadowing (until bugs are addressed) and refactoring some constants.
...
Change-Id: Iaf4c98bcb13441be3e66048687ea5b0673d2bce6
2014-05-07 15:01:14 -07:00
John Reck
ef27453cf7
Merge "Cleanup attachFunctor"
2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a
am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
...
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
Adding a HeartRate Feature
2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78
resolved conflicts for merge of 3bbef521 to master
...
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
2014-05-07 14:46:40 -07:00
Jorim Jaggi
4f0128fb8f
Merge "New layout structure for the expanded status bar."
2014-05-07 21:43:14 +00:00
Jim Miller
46426009a5
am 424edf06: am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
...
* commit '424edf064fb705b07f5f7d41e875dd2b24ccf271':
Fix can't change airplane mode from GlobalActions.
2014-05-07 21:40:15 +00:00
John Reck
832b151465
Cleanup attachFunctor
...
Bug: 13961296
Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
2014-05-07 14:39:44 -07:00