summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am e8628797: am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."Michael Wright2014-05-021-0/+2
|\ | | | | | | | | * commit 'e8628797833dfab1319d7a17f9ff465de760c633': Map KEY_APPSELECT to APP_SWITCH.
| * am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."Michael Wright2014-05-021-0/+2
| |\ | | | | | | | | | | | | * commit '09446329b1afbbc8b56885e61ed66841b59532b2': Map KEY_APPSELECT to APP_SWITCH.
| | * am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."Michael Wright2014-05-021-0/+2
| | |\ | | | | | | | | | | | | | | | | * commit '52025796cd264fd8ba3851c8e42fd5508366456a': Map KEY_APPSELECT to APP_SWITCH.
| | | * Merge "Map KEY_APPSELECT to APP_SWITCH."Michael Wright2014-05-021-0/+2
| | | |\
| | | | * Map KEY_APPSELECT to APP_SWITCH.Olivier Gay2014-05-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec801f2edfec9923aac088cb66663f64d62b3df6 Signed-off-by: Olivier Gay <ogay@logitech.com> Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
* | | | | Merge "Add an import missing"Selim Gurun2014-05-021-0/+1
|\ \ \ \ \
| * | | | | Add an import missingSelim Gurun2014-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I99a15779bff3bae5dd78d823d1f6c7f644c98751
* | | | | | Merge "Fix javadoc breakage"Selim Gurun2014-05-021-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix javadoc breakageSelim Gurun2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
* | | | | | Merge "Allow starting an RT animation via Canvas"John Reck2014-05-023-2/+19
|\ \ \ \ \ \
| * | | | | | Allow starting an RT animation via CanvasJohn Reck2014-05-023-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b105a01cf28ad03797b63347343f6b999d46386
* | | | | | | Merge "Unhide Client Cert APIS"Selim Gurun2014-05-024-7/+12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Unhide Client Cert APISSelim Gurun2014-05-024-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:12983007 Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
* | | | | | | Merge "Theme colors for legacy, Holo"Alan Viverette2014-05-029-232/+319
|\ \ \ \ \ \ \
| * | | | | | | Theme colors for legacy, HoloAlan Viverette2014-05-029-232/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 13677826 Change-Id: I60c38d9679c884fc8936a78732a52917db262d7d
* | | | | | | | Merge "Change wake reason checkin tag to "wr"."Dianne Hackborn2014-05-021-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Change wake reason checkin tag to "wr".Dianne Hackborn2014-05-021-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old "Wr" was also used for Wifi Running. Also include discharge/charge time remaining in checkin output. Change-Id: I303a0be902002d0399b9eb76773857da9103e8ce
* | | | | | | | | Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast."Amith Yamasani2014-05-021-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Send ACTION_MANAGED_PROFILE_REMOVED broadcast.Adam Connors2014-05-021-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the managed profile is removed, this new intent is used to inform the rest of the system. Change-Id: I1748bed0a7ee0122f69d5c78235a79f8e205efec
* | | | | | | | | | Merge "Design a static API for clearclientcertpreferences"Selim Gurun2014-05-023-8/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Design a static API for clearclientcertpreferencesSelim Gurun2014-05-023-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12983007 Change-Id: I869b4cd4c178b8fedf725f108fd2e369895543e9
* | | | | | | | | Merge "Add CanvasProperty for drawCircle"John Reck2014-05-0227-258/+803
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add CanvasProperty for drawCircleJohn Reck2014-05-0227-258/+803
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
* | | | | | | | | Fix issue #14492403: Oom scores appear to be incorrect...Dianne Hackborn2014-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and causing runtime restarts Got a little too aggressive with the delete key. *blush* Change-Id: Icd4637827424211abc2347f7f9407c2d4c95cfad
* | | | | | | | | 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.
generated by cgit v1.1 at 2025-01-09 07:04:11 +0000