summaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Collapse)AuthorAgeFilesLines
* am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only ↵Svetoslav2014-03-131-6/+10
|\ | | | | | | | | | | | | one color mode." into klp-dev * commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02': PrintSpooler crash if printer is reported to have only one color mode.
| * Merge "PrintSpooler crash if printer is reported to have only one color ↵Svetoslav2014-03-131-6/+10
| |\ | | | | | | | | | mode." into klp-dev
| | * PrintSpooler crash if printer is reported to have only one color mode.Svetoslav2014-03-121-6/+10
| | | | | | | | | | | | | | | | | | | | | bug:11993304 Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c (cherry picked from commit b0d97b87ba5f23ee867f381a4e5916ebb2e5f762)
* | | am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into ↵Adrian Roos2014-03-131-11/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440': DO NOT MERGE - Fix keyguard pattern lockout bug
| * | DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-131-11/+12
| |/ | | | | | | | | | | | | | | (cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6) Conflicts: packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java Bug: 13302967 Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
* | am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." ↵John Spurlock2014-03-041-6/+11
|\ \ | |/ | | | | | | | | | | into klp-dev * commit 'd36ede391619e6fc8a1553f5b2f4b33b3603cd65': Allow lights-out + bar icon dimming on low-end devices.
| * Allow lights-out + bar icon dimming on low-end devices.John Spurlock2014-03-041-6/+11
| | | | | | | | | | | | | | | | Maintain fallback to OPAQUE mode on low-end devices in place of the translucent modes. Bug: 12546110 Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a
| * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-208-15/+15
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-198-15/+15
| | | | | | | | | | | | | | | Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0 Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-4/+4
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-4/+4
| | |/ | | | | | | | | | | | | Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132 Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-2/+2
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-2/+2
| | |/ | | | | | | | | | | | | Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37 Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-1/+1
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-1/+1
| | |/ | | | | | | | | | | | | Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2014-02-192-5/+5
| |/ | | | | | | | | Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2014-01-062-3/+3
| | | | | | | | | | Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609 Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-261-1/+1
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-261-1/+1
| | | | | | | | | | | | | | | Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827 Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-261-2/+2
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-12-261-2/+2
| | |/ | | | | | | | | | | | | Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-261-1/+1
| |/ | | | | | | | | Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-191-2/+2
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-181-2/+2
| | | | | | | | | | | | | | | Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-181-1/+1
| |/ | | | | | | | | Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989 Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-111-1/+1
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-111-1/+1
| | | | | | | | | | | | | | | Change-Id: I3065b51a4d5b72fc2dbd65f34f2b7dec89fb37d7 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-112-2/+2
| |/ | | | | | | | | Change-Id: Ifd2fd893861b827395080d8bfde873be9c0e7425 Auto-generated-cl: translation import
* | am ce468a35: Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-8/+2
|\ \ | |/ | | | | | | * commit 'ce468a35b388ca46578934706b38dbae94941643': Stop wifi display discovery when no longer needed.
| * Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of how many clients are requesting scans and scan continuously until all of them are gone then explicitly terminate the scan instead of letting it time out as before. Suspend wifi display scans while connecting or connected to a remote display. This is handled by both the display manager and media router since neither has complete information about what is happening. Much of this code will no longer be needed once wifi display support is integrated directly into the media router service. Ensure that we don't attempt to scan or connect to wifi displays while the wifi display feature is off. Infer when a connection attempt fails and unselect the wifi display route automatically so it doesn't appear to be connecting forever. Fix issues around correctly canceling and retrying connection attempts. Often we would cancel but not retry. Improved connection reliability somewhat. It seems that discovery must already be in progress in order for a connection attempt to succeed. Ensure QuickSettings uses exactly the same logic as the MediaRouteButton to determine when the remote display tile should be made visible. Bug: 11717053 Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
| * Import translations. DO NOT MERGEBaligh Uddin2013-11-201-1/+1
| | | | | | | | | | Change-Id: I499aa31a9f0e9a997d5e60eb778f16bc3b497663 Auto-generated-cl: translation import
* | am c04aa87e: Merge "Fix incorrent page range parsing when custom print ↵Dave Langemak2013-11-191-3/+7
|\ \ | |/ | | | | | | | | | | options used." into klp-dev * commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1': Fix incorrent page range parsing when custom print options used.
| * Merge "Fix incorrent page range parsing when custom print options used." ↵Dave Langemak2013-11-191-3/+7
| |\ | | | | | | | | | into klp-dev
| | * Fix incorrent page range parsing when custom print options used.Svetoslav Ganov2013-11-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have APIs for a print service to declare an activity with custom print options. In this activity the service can add custom properties as well as change the standard ones such as pages to print. The ranges of selected pages from the custom activity was incorrectly parsed resulting in an off by one error in what is shown to the user and as a result getting an exception when trying to print. bug:11719051 Change-Id: Id04c94608178895f1d47381a63133f0eba7645e1
* | | am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-devJeff Sharkey2013-11-192-1/+5
|\ \ \ | |/ / | | | | | | | | | * commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829': Mask OOBE when filtering recent documents.
| * | Merge "Mask OOBE when filtering recent documents." into klp-devJeff Sharkey2013-11-192-1/+5
| |\ \
| | * | Mask OOBE when filtering recent documents.Jeff Sharkey2013-11-182-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a data ownership issue related to recent documents Cursors, and the loader and UI threads can end up traversing the same Cursor at runtime. This change masks OOBE crashes caused by this race until we have time to fix cleanly. Bug: 11736668 Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-11-1856-111/+56
| | | | | | | | | | | | | | | | | | | | Change-Id: Iacdab3a03a17cefc52aa7d72195d0cbcc2354039 Auto-generated-cl: translation import
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-11-171-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I6eea0f5a4b57c4686d1f6ff4fc137358400651b8 Auto-generated-cl: translation import
* | | | am 3de885be: Merge "Disallow applications from initiating cast screen." into ↵Jeff Brown2013-11-151-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | klp-dev * commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4': Disallow applications from initiating cast screen.
| * | | Merge "Disallow applications from initiating cast screen." into klp-devJeff Brown2013-11-151-0/+3
| |\ \ \
| | * | | Disallow applications from initiating cast screen.Jeff Brown2013-11-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow the system ui and settings to connect to a remote display. To do this, we essentially hide the remote displays from applications by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks around the operations that connect to them. As a bonus, this may actually save power on devices since applications that use MediaRouter will not longer be performing discover on remote display routes at all. Bug: 11257292 Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d1283da139ad2ef60213d83d7ac00939a4bfc04 Auto-generated-cl: translation import
* | | | | am 6874bfe1: Merge "Created print jobs should not be persisted until they ↵Svetoslav2013-11-142-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | are queued." into klp-dev * commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41': Created print jobs should not be persisted until they are queued.
| * | | | Merge "Created print jobs should not be persisted until they are queued." ↵Svetoslav2013-11-152-2/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into klp-dev
| | * | | Created print jobs should not be persisted until they are queued.Svetoslav2013-11-142-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print jobs in a created state should not be persisted. However, if a print service sets the tag to a print job that is queued, we were persisting even print jobs in a created state. This change adds a simple check while persisting to avoid storing created print jobs. bug:11696785 Change-Id: Idf28f3634b91fd5bf345f376114af4ed478ed3c6
* | | | | am 1907c0d2: Merge "Don\'t show external presentation until keyguard ↵Jim Miller2013-11-141-8/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | actually shows" into klp-dev * commit '1907c0d280d97776708810c9d24931aa6f818790': Don't show external presentation until keyguard actually shows
| * | | | Merge "Don't show external presentation until keyguard actually shows" into ↵Jim Miller2013-11-151-8/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| | * | | | Don't show external presentation until keyguard actually showsJim Miller2013-11-141-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was looking for just the display to turn off. It should wait until keyguard is actually shown before enabling the external presentations. Fix for bug 11694904 Change-Id: Iebf3aa04fc094cd4e5c8f56bc771aca1e5921d04
* | | | | | am a7a46a66: Merge "Update cast screen strings." into klp-devJeff Brown2013-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c': Update cast screen strings.