summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make GET_TASKS signature|system."Dianne Hackborn2014-05-0216-443/+50
|\
| * Make GET_TASKS signature|system.Dianne Hackborn2014-05-0216-443/+50
| | | | | | | | | | | | | | | | | | | | | | Normal apps can't hold it now. If they try to use getRecentTasks() or getRunningTasks() without the permission, they will only see their own tasks and home in the list. Also took this opportunity to eradicate all of the old pending thumbnail stuff. Change-Id: I6dc52a06221c78097162e4a8b482027b798bf3ee
* | Merge "Add playback state and metadata to dump"RoboErik2014-05-024-0/+33
|\ \
| * | Add playback state and metadata to dumpRoboErik2014-05-014-0/+33
| | | | | | | | | | | | Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
* | | Merge "Fix a bug in querying showing state for action bars"Adam Powell2014-05-021-1/+1
|\ \ \
| * | | Fix a bug in querying showing state for action barsAdam Powell2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug 14492418 Change-Id: I8d24fd90a8d4004ace186f5ce84ba68fc8419307
* | | | Merge "Fix padding for SIM pin entry."Jorim Jaggi2014-05-023-22/+26
|\ \ \ \
| * | | | Fix padding for SIM pin entry.Jorim Jaggi2014-05-023-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14224920 Change-Id: Icd8bf48a5946adeef9bfc6b00e4522c7fa3e56c3
* | | | | Merge "Filter touch events in ExpandableView."Jorim Jaggi2014-05-021-0/+14
|\ \ \ \ \
| * | | | | Filter touch events in ExpandableView.Jorim Jaggi2014-05-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the actual height is the different as the laid out one, we need to filter the touch events here. Change-Id: I6abd3fb0fffe275c2b83e7c48df1dd866499a28c
* | | | | | am 76df9c34: am db94d2d1: am 1d7ea94d: am 937db487: Merge "update dashboard ↵Scott Main2014-05-021-23/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 5/1/14" into klp-docs * commit '76df9c3485526fd99de031d9bc7df7e24e4641cf': update dashboard for 5/1/14
| * \ \ \ \ \ am db94d2d1: am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" ↵Scott Main2014-05-021-23/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit 'db94d2d1e5fe1a357f53357429e4035bc08ee5d0': update dashboard for 5/1/14
| | * \ \ \ \ \ am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docsScott Main2014-05-021-23/+23
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d7ea94d72808162e70e55a531563cb011ac6f30': update dashboard for 5/1/14
| | | * \ \ \ \ \ am 937db487: Merge "update dashboard for 5/1/14" into klp-docsScott Main2014-05-021-23/+23
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '937db487443171b75f321190be591c8f3d5f74bb': update dashboard for 5/1/14
| | | | * \ \ \ \ \ Merge "update dashboard for 5/1/14" into klp-docsScott Main2014-05-021-23/+23
| | | | |\ \ \ \ \ \
| | | | | * | | | | | update dashboard for 5/1/14Scott Main2014-05-021-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I874f060089ecc701c23b91adc52d19d50fd51014
* | | | | | | | | | | Merge "Camera2: replace AssertionError with error log"Zhijun He2014-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Camera2: replace AssertionError with error logZhijun He2014-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14448494 Change-Id: I8962cea14324c5c2faa580d009c58db2d35219ae
* | | | | | | | | | | am 7cb2bf1b: am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID ↵Scott Main2014-05-021-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 13982556 * commit '7cb2bf1bf3d6ecb9c0a104c3cbc6486b5ffd8652': add intel USB vendor ID bug: 13982556
| * | | | | | | | | | am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556Scott Main2014-05-021-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3525b3c7e9d7d4fd2c60d88f6e3b92c30ec68558': add intel USB vendor ID bug: 13982556
| | * | | | | | | | | am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556Scott Main2014-05-021-0/+4
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44e7ed77f16f6773d950e8b7a4fadb526b4c7a8a': add intel USB vendor ID bug: 13982556
| | | * | | | | | | | am 5584601c: add intel USB vendor ID bug: 13982556Scott Main2014-05-021-0/+4
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5584601c8ade068f403808a3c2b5e9c611134ab2': add intel USB vendor ID bug: 13982556
| | | | * | | | | | | add intel USB vendor IDScott Main2014-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 13982556 Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
* | | | | | | | | | | Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"Lajos Molnar2014-05-021-12/+97
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MediaHTTPConnection: support header android-allow-cross-domain-redirectLajos Molnar2014-04-291-12/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If present and set to false, media http redirects across domains will not be followed. As long as domains are identical, redirects across protocols or ports will still be followed. Also fail more seriously if redirection fails or is not supported, so that media client does not keep retrying the connection. Bug: 12573548 Change-Id: Ifd2539ad3a90f669d43bd0e82845dbc8ae0b4a3e
* | | | | | | | | | | | am 9abf0b90: am 60158445: Merge "Make global action key timeout ↵Justin Koh2014-05-025-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configurable." into klp-modular-dev * commit '9abf0b9031d0ddc33970589d2fb88065d15de712': Make global action key timeout configurable.
| * | | | | | | | | | | am 60158445: Merge "Make global action key timeout configurable." into ↵Justin Koh2014-05-025-4/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '6015844578dc4d725c7ab3d3004d18ffea446087': Make global action key timeout configurable.
| | * | | | | | | | | | Merge "Make global action key timeout configurable." into klp-modular-devJustin Koh2014-05-025-4/+26
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Make global action key timeout configurable.Justin Koh2014-05-025-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make global action key timeout configurable: deprecated the old public method and created a new one: getDeviceGlobalActionKeyTimeout. Bug: 14441321 Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
* | | | | | | | | | | | | am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gestureMark Renouf2014-05-022-12/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '63f728065a7584e3a51bb7b0b58ce8cf0c25390e': Implement cliff guard for swipeDismiss gesture
| * | | | | | | | | | | | am 11b14691: Implement cliff guard for swipeDismiss gestureMark Renouf2014-05-022-12/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11b1469144d73ad0280ef9d0c2e478d180f17074': Implement cliff guard for swipeDismiss gesture
| | * | | | | | | | | | | Implement cliff guard for swipeDismiss gestureMark Renouf2014-05-022-12/+10
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 14319825 Change-Id: I6a80c91b4a6ee2eaf49a8c0c69065d4b97d7f8f2
* | | | | | | | | | | | Merge "Fix sdk build by removing javadoc link"Matthew Williams2014-05-021-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix sdk build by removing javadoc linkMatthew Williams2014-05-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ed2a1a0f0c52ad6726be321d03a2c19e5b28d31
* | | | | | | | | | | | | Merge "Fix WebViewClient docs"Michael Wright2014-05-021-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix WebViewClient docsMichael Wright2014-05-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I960701a49be66fccfd03a8876779a5f7917642ea
* | | | | | | | | | | | | Merge "Add API definition for WebSettings.allowMixedContent"Ben Murdoch2014-05-022-0/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add API definition for WebSettings.allowMixedContentBen Murdoch2014-05-022-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge "API for network cache subsystems."Jeff Davidson2014-05-027-21/+242
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | API for network cache subsystems.Jeff Davidson2014-04-307-21/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A network subsystem (e.g. Wi-Fi) will be responsible for implementing INetworkScoreCache. NetworkScoreService will load caches for each configured network subsystem. When it receives a call to update scores, it will separate the networks by type and call updateScores on the appropriate INetworkScoreCache. Each subsystem will also be responsible for requesting scores for new networks by calling NetworkScoreManager#requestScores. Bug: 14408144 Bug: 14137255 Change-Id: I76e5e5205bc359c39d6b9c1782126fb7f465cd96
* | | | | | | | | | | | | | Epic performance fix during animation.Jorim Jaggi2014-05-021-1/+3
| |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a5627543a048cc5348f482ea3407676c9b42126
* | | | | | | | | | | | | Always use algorithm to set the children height.Jorim Jaggi2014-05-026-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes possible to animate between different children heights between the states. Change-Id: I5d74814a84c7ff5406481c3ab0553530ee20997b
* | | | | | | | | | | | | Fix animation play time, animation and alpha.Jorim Jaggi2014-05-026-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5f0a7880473930da3db70fcbd8c4e620f267cf8
* | | | | | | | | | | | | Update panel height when stack scroller padding is updated.Jorim Jaggi2014-05-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib894c084fb2b78f7227fda33559079ad4f7cbb55
* | | | | | | | | | | | | Introduce animation for changing top margin.Jorim Jaggi2014-05-025-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f77a1c69efc2dca3e5a37e7d6fc497ae487ec46
* | | | | | | | | | | | | Change interaction for dragging down to full shade.Jorim Jaggi2014-05-0217-216/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Introduce SHADE_LOCKED as a special state for the shade.Jorim Jaggi2014-05-0214-49/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "Add IME Switcher icon to Navigation Bar"Jason Monk2014-05-0212-67/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add IME Switcher icon to Navigation BarJason Monk2014-05-0212-67/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge "Fix notification visibility reporting"Christoph Studer2014-05-021-13/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |