Zhijun He
7db103bb2d
am 7c358ce4: Merge "Camera2: replace AssertionError with error log"
...
* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
Camera2: replace AssertionError with error log
2014-05-02 18:50:07 +00:00
Zhijun He
25bb60e844
Merge "Camera2: replace AssertionError with error log"
2014-05-02 18:45:06 +00:00
Scott Main
1e976bd1ac
am 7d9d1c04: am 7cb2bf1b: am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '7d9d1c04cc0ee0e1220c349053282392fc6701c5':
add intel USB vendor ID bug: 13982556
2014-05-02 18:27:09 +00:00
Scott Main
201a24f652
am 7cb2bf1b: am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '7cb2bf1bf3d6ecb9c0a104c3cbc6486b5ffd8652':
add intel USB vendor ID bug: 13982556
2014-05-02 18:21:05 +00:00
Scott Main
7cb2bf1bf3
am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '3525b3c7e9d7d4fd2c60d88f6e3b92c30ec68558':
add intel USB vendor ID bug: 13982556
2014-05-02 18:18:34 +00:00
Scott Main
3525b3c7e9
am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '44e7ed77f16f6773d950e8b7a4fadb526b4c7a8a':
add intel USB vendor ID bug: 13982556
2014-05-02 18:13:11 +00:00
Scott Main
44e7ed77f1
am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '5584601c8ade068f403808a3c2b5e9c611134ab2':
add intel USB vendor ID bug: 13982556
2014-05-02 18:10:30 +00:00
Lajos Molnar
e1ab072cab
am cba1bcc6: Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"
...
* commit 'cba1bcc60f47af9007d23c141317f5d2880a09e6':
MediaHTTPConnection: support header android-allow-cross-domain-redirect
2014-05-02 18:09:17 +00:00
Lajos Molnar
74b3cda9e0
Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"
2014-05-02 18:02:45 +00:00
Scott Main
5584601c8a
add intel USB vendor ID
...
bug: 13982556
Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
2014-05-02 10:50:50 -07:00
Justin Koh
ce3c998337
am 93671ef4: am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '93671ef4b14fabcd06eb64618dc82f6e609edaa2':
Make global action key timeout configurable.
2014-05-02 17:42:07 +00:00
Justin Koh
f46009225b
am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '9abf0b9031d0ddc33970589d2fb88065d15de712':
Make global action key timeout configurable.
2014-05-02 17:33:48 +00:00
Justin Koh
9abf0b9031
am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
Make global action key timeout configurable.
2014-05-02 17:28:53 +00:00
Justin Koh
6015844578
Merge "Make global action key timeout configurable." into klp-modular-dev
2014-05-02 17:25:50 +00:00
Justin Koh
feabd2c730
Make global action key timeout configurable.
...
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321
Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
2014-05-02 10:04:34 -07:00
Mark Renouf
ef78c873b0
am 8302a4d9: am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gesture
...
* commit '8302a4d960ee2f4f22d9816f12218761d26f0707':
Implement cliff guard for swipeDismiss gesture
2014-05-02 16:59:11 +00:00
Matthew Williams
f686bfa68a
am b283ac25: Merge "Fix sdk build by removing javadoc link"
...
* commit 'b283ac25cbaf228dc8fdcde74e5c44e5db2af0da':
Fix sdk build by removing javadoc link
2014-05-02 16:54:57 +00:00
Mark Renouf
698a7ab344
am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gesture
...
* commit '63f728065a7584e3a51bb7b0b58ce8cf0c25390e':
Implement cliff guard for swipeDismiss gesture
2014-05-02 16:52:29 +00:00
Matthew Williams
6dd51be673
Merge "Fix sdk build by removing javadoc link"
2014-05-02 16:49:09 +00:00
Mark Renouf
63f728065a
am 11b14691: Implement cliff guard for swipeDismiss gesture
...
* commit '11b1469144d73ad0280ef9d0c2e478d180f17074':
Implement cliff guard for swipeDismiss gesture
2014-05-02 16:45:34 +00:00
Michael Wright
7e1c52bf40
am aacd869f: Merge "Fix WebViewClient docs"
...
* commit 'aacd869f7fdebfb9895699ecfb9c71c84f7f2708':
Fix WebViewClient docs
2014-05-02 16:33:18 +00:00
Michael Wright
428d1e40a9
Merge "Fix WebViewClient docs"
2014-05-02 16:29:27 +00:00
Matthew Williams
ae3e53e933
Fix sdk build by removing javadoc link
...
Change-Id: I3ed2a1a0f0c52ad6726be321d03a2c19e5b28d31
2014-05-02 09:22:25 -07:00
Ben Murdoch
af1019ffc2
am d70c9d98: Merge "Add API definition for WebSettings.allowMixedContent"
...
* commit 'd70c9d98771c950ef63e5c1c0fbe789043e5698f':
Add API definition for WebSettings.allowMixedContent
2014-05-02 15:51:02 +00:00
Ben Murdoch
27ecb35b19
Merge "Add API definition for WebSettings.allowMixedContent"
2014-05-02 15:48:12 +00:00
Jeff Davidson
8319d99a34
am 9e35d785: Merge "API for network cache subsystems."
...
* commit '9e35d785d00a3dd219f08cb5bdf5d3c525837619':
API for network cache subsystems.
2014-05-02 15:37:00 +00:00
Jeff Davidson
4cd4110f20
Merge "API for network cache subsystems."
2014-05-02 15:33:36 +00:00
Jorim Jaggi
27339f21fc
am c05e42b1: Epic performance fix during animation.
...
* commit 'c05e42b19c8fd24a0e95bd4026245382a042fa79':
Epic performance fix during animation.
2014-05-02 14:58:43 +00:00
Jorim Jaggi
59b5a356b8
Epic performance fix during animation.
...
Change-Id: I0a5627543a048cc5348f482ea3407676c9b42126
2014-05-02 16:46:02 +02:00
Jorim Jaggi
6e12b4c786
am 1232854e: Always use algorithm to set the children height.
...
* commit '1232854ef30a3506eb616e804776b9ee72bb9c49':
Always use algorithm to set the children height.
2014-05-02 14:34:59 +00:00
Jorim Jaggi
0a632c5be6
am 6d8c50b1: Fix animation play time, animation and alpha.
...
* commit '6d8c50b14b3810c188af509472046ec1ed99df41':
Fix animation play time, animation and alpha.
2014-05-02 14:34:56 +00:00
Jorim Jaggi
72d15cf645
am f57d5aa4: Update panel height when stack scroller padding is updated.
...
* commit 'f57d5aa4e737ab147068fa72d6ced92c41054ebb':
Update panel height when stack scroller padding is updated.
2014-05-02 14:34:47 +00:00
Jorim Jaggi
e3a940f593
am 81e60810: Introduce animation for changing top margin.
...
* commit '81e6081031f4b560d2550edb06320b94295b9839':
Introduce animation for changing top margin.
2014-05-02 14:34:44 +00:00
Jorim Jaggi
bbd19fc5fb
am 9b71e298: Change interaction for dragging down to full shade.
...
* commit '9b71e298c0d0286fe64caa511ed2e5dfef3e8adb':
Change interaction for dragging down to full shade.
2014-05-02 14:34:41 +00:00
Jorim Jaggi
1c6a32aafb
am e071ba1f: Introduce SHADE_LOCKED as a special state for the shade.
...
* commit 'e071ba1f3ce8d550d61629d965e649c32f3541e5':
Introduce SHADE_LOCKED as a special state for the shade.
2014-05-02 14:34:32 +00:00
Jorim Jaggi
9cbadd3c08
Always use algorithm to set the children height.
...
This makes possible to animate between different children heights
between the states.
Change-Id: I5d74814a84c7ff5406481c3ab0553530ee20997b
2014-05-02 16:15:42 +02:00
Jorim Jaggi
98fb09c2b2
Fix animation play time, animation and alpha.
...
Change-Id: Ib5f0a7880473930da3db70fcbd8c4e620f267cf8
2014-05-02 16:15:12 +02:00
Jorim Jaggi
864347ae94
Update panel height when stack scroller padding is updated.
...
Change-Id: Ib894c084fb2b78f7227fda33559079ad4f7cbb55
2014-05-02 16:14:59 +02:00
Jorim Jaggi
0dd6881ea4
Introduce animation for changing top margin.
...
Change-Id: I7f77a1c69efc2dca3e5a37e7d6fc497ae487ec46
2014-05-02 16:14:49 +02:00
Jorim Jaggi
4222d9a7fb
Change interaction for dragging down to full shade.
...
Starts expanding the card if it is expandable. If it's not, we
rubberband the expansion a lot. After the threshold has been reached,
we scale all the notifications up and make it fully white and opaque.
Change-Id: I9ecd020ca263b0f84e87fd6ab2332519ac5e9984
2014-05-02 16:14:38 +02:00
Jorim Jaggi
ecbab3662d
Introduce SHADE_LOCKED as a special state for the shade.
...
This state can be either reached by tapping the more card or dragging
down on any card. In this state, the shade is fully interactive, but
the phone is stil locked. This state can only be enterred if
redaction is off but security is on. If redaction is on, we will show
the bouncer instead and go to the normal shade.
Bug: 14161523
Change-Id: I95ca0991745ffc11ed1028581e3da15265c12ae5
2014-05-02 16:14:26 +02:00
Jason Monk
68b5c9d1ee
am 0d4a7358: Merge "Add IME Switcher icon to Navigation Bar"
...
* commit '0d4a73588b47b96d6a8911c0199b70dda9adc29c':
Add IME Switcher icon to Navigation Bar
2014-05-02 14:08:11 +00:00
Jason Monk
434bdf50b3
Merge "Add IME Switcher icon to Navigation Bar"
2014-05-02 14:04:52 +00:00
Jason Monk
f1ff209523
Add IME Switcher icon to Navigation Bar
...
Adds button in the same location as the menu button and overrides
it when present. The setNavigationHintIconHints lets it know when
the button should be shown.
Bug: 14257632
Change-Id: Ia80de7fd2390cd8b083e37cbe58b7ee53555e619
2014-05-02 09:39:41 -04:00
Ben Murdoch
fe9fc3d1a3
Add API definition for WebSettings.allowMixedContent
...
Introduces an API for configuring how the WebView behaves with
regard to referencing insecure content from a secure origin.
By default, apps targeting <= KK will allow mixed content. New apps
will block all insecure content.
Bug: 13948531
Change-Id: Ie773ee144e223f78b6449da0a8564192dd9c1c5d
2014-05-02 14:17:25 +01:00
Christoph Studer
5e7ec186f0
am 90142ba9: Merge "Fix notification visibility reporting"
...
* commit '90142ba99552faddd4a7de79909f2f6cc4035f16':
Fix notification visibility reporting
2014-05-02 12:35:38 +00:00
Christoph Studer
27364bc212
Merge "Fix notification visibility reporting"
2014-05-02 12:32:27 +00:00
Christoph Studer
037e34c823
Fix notification visibility reporting
...
Require the screen to be on for visibility reporting.
Change-Id: I600e2fa2861bddd41ab9f9f0f381d8b1c4946afa
2014-05-02 12:25:35 +02:00
Selim Cinek
d5755bb292
am 357a4459: Merge "Removed always running preDrawListener"
...
* commit '357a4459459d75c8a647b0979e76255ed0637b41':
Removed always running preDrawListener
2014-05-02 10:18:40 +00:00
Selim Cinek
97f1b8572f
Merge "Removed always running preDrawListener"
2014-05-02 10:16:06 +00:00