summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Opimized the number of calls to updateChildren.Selim Cinek2014-05-011-18/+21
| | | | | | | Improved the performance by batching multiple calls to updateChildren to a single call on preDraw. Change-Id: I386edeb15ac35201d39afcac8beaa48b09245448
* Fixed a bug when a notification was quickly added and removed.Selim Cinek2014-05-011-9/+17
| | | | Change-Id: Id9b1cb771a2b6d1f42b61ef40a637e15c8d8f3b7
* am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-devMindy Pereira2014-05-014-2/+20
|\ | | | | | | | | * commit 'ed7e36dc2ef400916356459f9ea67d66645a85fb': Update fling min velocity
| * am d5e92318: Merge "Update fling min velocity" into klp-modular-devMindy Pereira2014-05-014-2/+20
| |\ | | | | | | | | | | | | * commit 'd5e92318b69d8af6d91dc3b51738913595e0f536': Update fling min velocity
| | * Merge "Update fling min velocity" into klp-modular-devMindy Pereira2014-05-014-2/+20
| | |\
| | | * Update fling min velocityMindy Pereira2014-04-304-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | Make it configurable for watch Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
* | | | Merge "Remove unused AndroidProxySelectorRoutePlanner"Jason Monk2014-05-011-42/+0
|\ \ \ \
| * | | | Remove unused AndroidProxySelectorRoutePlannerJason Monk2014-05-011-42/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903
* | | | | Add support for hiding action bars on scroll.Adam Powell2014-05-0111-104/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also tweak the nested scrolling API around nested flings and fix a bug where recursive nested scrolling would stop prematurely. Change-Id: I561226db878b2493970440a6af3e2332c56a1913
* | | | | Merge "Fixed a bug where the notification scroller could crash."Selim Cinek2014-05-011-1/+1
|\ \ \ \ \
| * | | | | Fixed a bug where the notification scroller could crash.Selim Cinek2014-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a race condition the scroller could crash in certain cases after an animation. Bug: 14458203 Change-Id: Idc52109550270924bae5857e581574c63452f159
* | | | | | Merge "Implement long-term condition subscriptions."John Spurlock2014-05-017-103/+416
|\ \ \ \ \ \
| * | | | | | Implement long-term condition subscriptions.John Spurlock2014-05-017-103/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bind long-term conditions (like "in a meeting") to enter/exit zen mode automatically. Persist automatic condition subscriptions to maintain them across reboots. Normalize condition state binding: true => enter zen, false => exit. Change-Id: Icba2b8b25c0a352ae8215f4c0a324e4f966c0165
* | | | | | | Address comments/fix javadoc in TaskManager APIMatthew Williams2014-05-013-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0cdff12971b88acb40571a5e63b7d644ef629911
* | | | | | | Merge "Fix build"RoboErik2014-05-011-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix buildRoboErik2014-05-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A CL missed running update-api after making a change before submitting. https://googleplex-android.googlesource.com/platform/frameworks/base/+/6e31c5c82bc5c9bddf9c01d254067ea5bebbd96b Change-Id: I62b33f07a98ecd546d8128c1eeb4c01bd338f202
* | | | | | | | am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | * commit '437994578272f9770748b152c53ec655059d19ec': Add support for NETWORK_TYPE_GSM
| * | | | | | am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74ec580873bb56cb5045a25efdb1eb7e2bac384c': Add support for NETWORK_TYPE_GSM
| | * \ \ \ \ \ am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e411f74efe6dd383e59634760cccd96da1c209b': Add support for NETWORK_TYPE_GSM
| | | * \ \ \ \ \ Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
| | | |\ \ \ \ \ \
| | | | * | | | | | Add support for NETWORK_TYPE_GSMSandeep Kunta2014-05-012-0/+7
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for NETWORK_TYPE_GSM in TelephonyManager and corresponding mapping in ServicState.java so that when application queries for getVoiceNetworkType() and currently camped rat is GSM, they get network mode as GSM instead of network mode unknown. Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
* | | | | | | | | am 0c88867c: am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update ↵Robert Ly2014-05-014-112/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wear stack notifications to coincide with devbyte code"" into klp-docs * commit '0c88867c7c626c805e9f466bf9010d2a3115eb42': Revert "update wear stack notifications to coincide with devbyte code"
| * | | | | | | | am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack ↵Robert Ly2014-05-014-112/+25
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications to coincide with devbyte code"" into klp-docs * commit '0135261361e21f3585b21ff4498b05bd6d1bf88d': Revert "update wear stack notifications to coincide with devbyte code"
| | * | | | | | | am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to ↵Robert Ly2014-05-014-112/+25
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coincide with devbyte code"" into klp-docs * commit 'a9dfeaa94083c322fb95d8bd2ac765521ae8bceb': Revert "update wear stack notifications to coincide with devbyte code"
| | | * \ \ \ \ \ \ am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with ↵Robert Ly2014-05-014-112/+25
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devbyte code"" into klp-docs * commit '7fadcf84244172004568c4107083d415f1285b75': Revert "update wear stack notifications to coincide with devbyte code"
| | | | * \ \ \ \ \ \ Merge "Revert "update wear stack notifications to coincide with devbyte ↵Robert Ly2014-05-014-112/+25
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code"" into klp-docs
| | | | | * | | | | | | Revert "update wear stack notifications to coincide with devbyte code"Robert Ly2014-05-014-112/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8e3f209af70a7707be75d866b142dc1fccc8d5f. Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766
* | | | | | | | | | | | am edbabd28: am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method ↵Robert Ly2014-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name" * commit 'edbabd2806a9c5c717eff24c65a718f4d2ece817': Revert "docs: fix method name"
| * | | | | | | | | | | am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name"Robert Ly2014-05-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3135059dee534c9d93cfb0c6e4fa7574eff1049': Revert "docs: fix method name"
| | * | | | | | | | | | am 9f129366: am 80b2cbbe: Revert "docs: fix method name"Robert Ly2014-05-011-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f129366e6963aacb00893e0be1892003bc0b39d': Revert "docs: fix method name"
| | | * | | | | | | | | am 80b2cbbe: Revert "docs: fix method name"Robert Ly2014-05-011-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80b2cbbe6c134ff415072f29eaa7392c1ebb0c52': Revert "docs: fix method name"
| | | | * | | | | | | | Revert "docs: fix method name"Robert Ly2014-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed. Change-Id: Ib7ed4fac07301dd5640fc41348af0d49ad9ef518
* | | | | | | | | | | | Merge "TaskManager API first pass."Matthew Williams2014-05-019-0/+990
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | TaskManager API first pass.Matthew Williams2014-04-219-0/+990
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very barebones first pass, meant to ensure we're all on the same page, and also get feedback. Change-Id: I7d5492dc5aafbe583f7c2d97ebf1444b6d2e068a
* | | | | | | | | | | | | am 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while ↵Mark Renouf2014-05-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | swiping" into klp-modular-dev * commit '5b72a6abf85b26e66589db478cc105e7bfec6116': SwipeDismiss: limit fade to 50% alpha while swiping
| * | | | | | | | | | | | am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" ↵Mark Renouf2014-05-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '41615284dfb00595ed642c4e31da6a035ff53224': SwipeDismiss: limit fade to 50% alpha while swiping
| | * | | | | | | | | | | Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-devMark Renouf2014-05-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | SwipeDismiss: limit fade to 50% alpha while swipingMark Renouf2014-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 14319825 Change-Id: I3704fab77f2d3660ae374bdf16c767c124dcb8e9
* | | | | | | | | | | | | | Merge "Add Session API calls to RCC and AudioManager"RoboErik2014-05-0111-102/+664
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add Session API calls to RCC and AudioManagerRoboErik2014-05-0111-102/+664
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready. Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
* | | | | | | | | | | | | | | Merge "Add dump to MediaSessionService"RoboErik2014-05-017-15/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add dump to MediaSessionServiceRoboErik2014-04-297-15/+121
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a dump implementation for debugging MediaSessionService. Also fixes some synchronize calls that weren't using the same lock object. Change-Id: I14343f853398749c8ce7ebf91f72729abc9132d9
* | | | | | | | | | | | | | | am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-05-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-modular-dev * commit '1ffec559d04618fbd31eaf972a81c6df324965c1': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-05-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'bf4927ee0d085fd0c7eaf1221f709811f3be6f4f': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-05-013-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-303-11/+11
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ccf4c1b33a7aa11cbf76dd86a2dd13be3f31ab9 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-05-0156-479/+1481
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-3056-479/+1481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f33ab6f48410b6cc0e8e8343e2a816090748623 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-301-1/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia11b15d1e802b1f4fb3afbc9261487a5ab364a7f Auto-generated-cl: translation import