summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2014-11-1472-856/+440
| | | | | Change-Id: I7078d7365c176fea33e2daf657e0bf78c2edea93 Auto-generated-cl: translation import
* am f1faf930: am 553aeed9: Merge "CEC: Buffer messages coming from unknown ↵Jinsuk Kim2014-11-145-4/+220
|\ | | | | | | | | | | | | device" into lmp-mr1-dev automerge: cccafac * commit 'f1faf93094c2e49782a3ba26c2d0e67b13199238': CEC: Buffer messages coming from unknown device
| * am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into ↵Jinsuk Kim2014-11-145-4/+220
| |\ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: cccafac * commit 'cccafac36c7c0297afbfb17d4389951b77066cab': CEC: Buffer messages coming from unknown device
| | * am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into ↵Jinsuk Kim2014-11-145-4/+220
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '553aeed9c9de19fcadb5466b39b6903eac61598b': CEC: Buffer messages coming from unknown device
| | | * Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-devJinsuk Kim2014-11-145-4/+220
| | | |\
| | | | * CEC: Buffer messages coming from unknown deviceJinsuk Kim2014-11-125-4/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced a buffer for messages to be kept for later processing when they arrive before the service is ready to handle them. <Active Source>/<Initiate ARC> are handled in this CL to address the reported bug. Bug: 18277839 Change-Id: I1e73dd83dc9dd4a822fbcf4fda4c6221f09631cb
* | | | | am ff0c4856: am 8f5839be: Merge "Document that circular reveal is async" ↵John Reck2014-11-141-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: f1812b1 * commit 'ff0c4856f4f912f483c8293a72657d82b1dd14a9': Document that circular reveal is async
| * | | | am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-devJohn Reck2014-11-141-1/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f1812b1 * commit 'f1812b17bb3396a28f3be8d19e0086de2be613a6': Document that circular reveal is async
| | * | | am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-devJohn Reck2014-11-141-1/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '8f5839be21f028885b6171e75cba479a020a3a0c': Document that circular reveal is async
| | | * | Merge "Document that circular reveal is async" into lmp-mr1-devJohn Reck2014-11-141-1/+6
| | | |\ \
| | | | * | Document that circular reveal is asyncJohn Reck2014-11-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18058966 Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
* | | | | | am 376dee63: am 8977c1da: Merge "CEC: Fix a bug in ↵Yuncheol Heo2014-11-141-1/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HdmiPortInfo.createFromParcel()." into lmp-mr1-dev automerge: cde2617 * commit '376dee63f383d31f547a09d9708103592d9e0dd9': CEC: Fix a bug in HdmiPortInfo.createFromParcel().
| * | | | | am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into ↵Yuncheol Heo2014-11-141-1/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: cde2617 * commit 'cde261796b3b38e05380ba186cb78350f83e2d30': CEC: Fix a bug in HdmiPortInfo.createFromParcel().
| | * | | | am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into ↵Yuncheol Heo2014-11-141-1/+12
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '8977c1dab572cb61ebff1f844a549f7fb2e4e590': CEC: Fix a bug in HdmiPortInfo.createFromParcel().
| | | * | | Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-devYuncheol Heo2014-11-141-1/+12
| | | |\ \ \
| | | | * | | CEC: Fix a bug in HdmiPortInfo.createFromParcel().Yuncheol Heo2014-11-141-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added equals() for the testing. Bug: 18376178 Change-Id: Icc7d5fe78b3132bf51754fc3bb0d5a40e0d3b20a
* | | | | | | am ec74a7e7: am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui ↵John Spurlock2014-11-144-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to frameworks." into lmp-mr1-dev automerge: 8f84f62 * commit 'ec74a7e725dbf04b38cf959e6749a18bee5344b4': Volume: Move "Muted by" string from sysui to frameworks.
| * | | | | | am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to ↵John Spurlock2014-11-144-4/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks." into lmp-mr1-dev automerge: 8f84f62 * commit '8f84f62d1f296f78dcf50b9b4c22adb738b4b82a': Volume: Move "Muted by" string from sysui to frameworks.
| | * | | | | am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to ↵John Spurlock2014-11-144-4/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks." into lmp-mr1-dev * commit '8fe10b4b04447d997179604ead942fd4bbd5eef2': Volume: Move "Muted by" string from sysui to frameworks.
| | | * | | | Merge "Volume: Move "Muted by" string from sysui to frameworks." into ↵John Spurlock2014-11-144-4/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * | | | Volume: Move "Muted by" string from sysui to frameworks.John Spurlock2014-11-144-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To enable sharing with Settings. Bug: 17461563 Change-Id: Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5
* | | | | | | | am 643e8ebc: am 84998e28: Merge "Reduce spammy PackageManager critical ↵Jeff Sharkey2014-11-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logs." into lmp-mr1-dev automerge: adb5def * commit '643e8ebca31762279597e8bb83b8dd259195c6d4': Reduce spammy PackageManager critical logs.
| * | | | | | | am 84998e28: Merge "Reduce spammy PackageManager critical logs." into ↵Jeff Sharkey2014-11-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: adb5def * commit 'adb5defbd9e27b546c25886046f1977d856509da': Reduce spammy PackageManager critical logs.
| | * | | | | | am 84998e28: Merge "Reduce spammy PackageManager critical logs." into ↵Jeff Sharkey2014-11-141-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '84998e28584e44f69be06fc9fe7e77df182251eb': Reduce spammy PackageManager critical logs.
| | | * | | | | Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-devJeff Sharkey2014-11-141-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Reduce spammy PackageManager critical logs.Jeff Sharkey2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18390552 Change-Id: I66e34e6ebf3f644f8585056b9701b7f4582d777e
* | | | | | | | | am 9fb00cb4: am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" ↵Jeff Sharkey2014-11-141-3/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: bec816a * commit '9fb00cb428f3d4b0241490146f4d5a7b75fc552e': Fix NPE in DropBoxManagerService.dump()
| * | | | | | | | am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-devJeff Sharkey2014-11-141-3/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: bec816a * commit 'bec816adc7dbbc23a04156e2aefeec9d0cb92077': Fix NPE in DropBoxManagerService.dump()
| | * | | | | | | am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-devJeff Sharkey2014-11-141-3/+8
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17fe99ac01b8b6648d3d703fec1b28a792832331': Fix NPE in DropBoxManagerService.dump()
| | | * | | | | | Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-devJeff Sharkey2014-11-141-3/+8
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix NPE in DropBoxManagerService.dump()Jeff Sharkey2014-11-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18374803 Change-Id: Id1f66a0887d1584f97b127e837a4fad31f7d9d57
* | | | | | | | | | am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText ↵Raph Levien2014-11-142-0/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods" into lmp-mr1-dev automerge: 58fa003 * commit '7010d0b6c398cb03b4be43a547921c3e9a95eeb0': Check bounds on CharSequence drawText methods
| * | | | | | | | | am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into ↵Raph Levien2014-11-142-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 58fa003 * commit '58fa0035775bbb897115bae1b59719391a1a7edd': Check bounds on CharSequence drawText methods
| | * | | | | | | | am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into ↵Raph Levien2014-11-142-0/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5': Check bounds on CharSequence drawText methods
| | | * | | | | | | Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-devRaph Levien2014-11-142-0/+6
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Check bounds on CharSequence drawText methodsRaph Levien2014-11-122-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The canvas drawText() methods on CharSequence arguments didn't check whether the start and end offsets were within bounds, which triggered native crashes. This patch checks the bounds and throws IndexOutOfBoundsException when invalid. Bug: 18282500 Change-Id: I1935bf21f828b960c817b40ebce6affd4ce8bb99
* | | | | | | | | | | am c047ca45: am 25f7c4b9: Merge "Update hint text color even when text ↵Raph Levien2014-11-141-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present" into lmp-mr1-dev automerge: fbe0e8f * commit 'c047ca454012d49820e9bf14f4501156e4479881': Update hint text color even when text present
| * | | | | | | | | | am 25f7c4b9: Merge "Update hint text color even when text present" into ↵Raph Levien2014-11-141-2/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: fbe0e8f * commit 'fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6': Update hint text color even when text present
| | * | | | | | | | | am 25f7c4b9: Merge "Update hint text color even when text present" into ↵Raph Levien2014-11-141-2/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4': Update hint text color even when text present
| | | * | | | | | | | Merge "Update hint text color even when text present" into lmp-mr1-devRaph Levien2014-11-141-2/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Update hint text color even when text presentRaph Levien2014-11-121-2/+4
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When text is present (so the hint doesn't show), updating the hint color was suppressed. This patch updates the hint color in all cases, but still skips the invalidate when the hint text is not showing. Bug: 17454233 Change-Id: I3887908fb184a10f7a1d7e64f1d92b4955323227
* | | | | | | | | | | am 2d208505: am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor ↵Raph Levien2014-11-141-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | width" into lmp-mr1-dev automerge: be1ad50 * commit '2d2085052550ad0fa1b032d6cc3123b5524c5fe8': Fudge clipRect in TextView for extra cursor width
| * | | | | | | | | | am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into ↵Raph Levien2014-11-141-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: be1ad50 * commit 'be1ad50b34e160c5d490d1165a590eb4c633d996': Fudge clipRect in TextView for extra cursor width
| | * | | | | | | | | am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into ↵Raph Levien2014-11-141-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'cda81f2ded39b53dd813071760ad235363292d52': Fudge clipRect in TextView for extra cursor width
| | | * | | | | | | | Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-devRaph Levien2014-11-141-1/+5
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | | * | | | | | | Fudge clipRect in TextView for extra cursor widthRaph Levien2014-11-131-1/+5
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of cases (most commonly cursor at start of line in RTL direction) where the cursor extends past the right edge of the clipRect. This patch adds approximately 1dp on the right side of the clip, so that the cursor doesn't get clipped. Bug: 18035274 Change-Id: I489825a91750742c28e445f54f9d27000accbcfb
* | | | | | | | | | am b536c7a6: am 27936ad3: Merge "Block loading WebView in privileged ↵Jeff Sharkey2014-11-141-3/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processes." into lmp-mr1-dev automerge: 47d2c97 * commit 'b536c7a69340b85ef70197bbc4e443205110e2a5': Block loading WebView in privileged processes.
| * | | | | | | | | am 27936ad3: Merge "Block loading WebView in privileged processes." into ↵Jeff Sharkey2014-11-141-3/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 47d2c97 * commit '47d2c97e7084a676fe2b4d96683912279046b28c': Block loading WebView in privileged processes.
| | * | | | | | | | am 27936ad3: Merge "Block loading WebView in privileged processes." into ↵Jeff Sharkey2014-11-141-3/+9
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '27936ad3a677509fab1174c7b6655c894f018143': Block loading WebView in privileged processes.
| | | * | | | | | | Merge "Block loading WebView in privileged processes." into lmp-mr1-devJeff Sharkey2014-11-141-3/+9
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |