summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Swap the chess king and queen glyphs in Droid Sans Fallback.Roozbeh Pournader2014-06-183-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the unused DroidSansFallbackLegacy.ttf. Based on public bug report https://code.google.com/p/android/issues/detail?id=71389. The original glyphs were mistakenly swapped. Following is the code that was run on the font: import sys from fontTools import ttLib WHITE_KING = 0x2654 WHITE_QUEEN = 0x2655 BLACK_KING = 0x265A BLACK_QUEEN = 0x265B font_name = sys.argv[1] font = ttLib.TTFont(font_name) for table in font['cmap'].tables: cmap = table.cmap cmap[WHITE_KING], cmap[WHITE_QUEEN] = cmap[WHITE_QUEEN], cmap[WHITE_KING] cmap[BLACK_KING], cmap[BLACK_QUEEN] = cmap[BLACK_QUEEN], cmap[BLACK_KING] font.save(font_name+'-fixed') Bug: 15643969 Change-Id: Iacee3d72ef8146016e15828f051822460ae2ff4e
* Merge "Introduce <application> attribute android:fullBackupOnly={boolean}"Christopher Tate2014-06-175-0/+26
|\
| * Introduce <application> attribute android:fullBackupOnly={boolean}Christopher Tate2014-06-175-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | It is quite possible for an application to be happy with having the OS save full-data archives of its data, but still need to selectively filter the set of saved files or otherwise participate in full-data backup and restore. In general we assume that any app which provides a backup agent implementation will be directly participating via the incremental key/value backup API; this new attribute allows an app to tell the OS "perform full-data backup/restore for me even though I am supplying my own agent implementation to participate." Change-Id: I810c50d44aa683b1f23604b7d1f3e96a1722103a
* | Merge "Add getSystemPhoneApplication to TelecommManager"Yorke Lee2014-06-171-0/+12
|\ \
| * | Add getSystemPhoneApplication to TelecommManagerYorke Lee2014-06-181-0/+12
| | | | | | | | | | | | Change-Id: Ie67698e8363d1498b37692dc7be23b14a0d8c388
* | | Merge "Fix the default VPN confirm dialog component name."Sreeram Ramachandran2014-06-181-1/+1
|\ \ \
| * | | Fix the default VPN confirm dialog component name.Sreeram Ramachandran2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a mistake introduced in http://ag/479286. Bug: 15087985 Change-Id: I09e1cdcbfbe36b322db9b3178324a9ebb7d5e586
* | | | Merge "Fix job service validation in secondary users"Christopher Tate2014-06-181-5/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Fix job service validation in secondary usersChristopher Tate2014-06-181-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug 15714663 Change-Id: I101bcc979f30062bec36f462522227b857b58054
* | | | Merge "TvContract: Change constants of canonical genres to all-caps values"Jae Seo2014-06-192-22/+22
|\ \ \ \
| * | | | TvContract: Change constants of canonical genres to all-caps valuesJae Seo2014-06-172-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just for consistency with other constant values. Change-Id: If226af08e66532c9110bc88e3c68d3958c67cdb6
* | | | | Merge "TvContract: Add columns for video format and resolution"Jae Seo2014-06-182-0/+141
|\ \ \ \ \
| * | | | | TvContract: Add columns for video format and resolutionJae Seo2014-06-172-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added COLUMN_VIDEO_FORMAT to the Channels table to indicate typical video format for programs from a given TV channel, which can later be used to filter out channels. Also defined common video formats and resolutions and a utility method to get the video resolution for a given format. Added COLUMN_VIDEO_WIDTH and COLUMN_VIDEO_HEIGHT to the Programs table to indicate the actual video dimension for each individual TV program, which can be shown as a part of program information by applications. Bug: 15351111, 15456031 Change-Id: Id72e25de40f06a1b615620365e06cf11e4cd9f81
* | | | | | Merge "Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts."Roozbeh Pournader2014-06-181-0/+15
|\ \ \ \ \ \
| * | | | | | Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts.Roozbeh Pournader2014-06-171-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15708701 Change-Id: I1cdd26798ace5eec24d09b9b5b49eb943edacbe9
* | | | | | | Merge "Don't end lock task mode when not in lock task mode"Christopher Tate2014-06-171-6/+10
|\ \ \ \ \ \ \
| * | | | | | | Don't end lock task mode when not in lock task modeChristopher Tate2014-06-181-6/+10
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e
* | | | | | | Merge "Adding start delay to the task view transforms."Winson Chung2014-06-186-46/+45
|\ \ \ \ \ \ \
| * | | | | | | Adding start delay to the task view transforms.Winson Chung2014-06-186-46/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adding slight delay to task bar buttons to allow touch feedback to show Change-Id: I9f31ca378541fc34c7b741840c7f038340684b13
* | | | | | | | am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"Jason Sams2014-06-181-11/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3aa4de11b05599d75af92a15820731144941c38f': Fix element size on 64b
| * \ \ \ \ \ \ \ am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"Jason Sams2014-06-181-11/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330': Fix element size on 64b
| | * \ \ \ \ \ \ \ am 47de3060: Merge "Fix element size on 64b"Jason Sams2014-06-181-11/+19
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47de306050576535014ff2b0c08006f951eea2ee': Fix element size on 64b
| | | * \ \ \ \ \ \ \ Merge "Fix element size on 64b"Jason Sams2014-06-171-11/+19
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix element size on 64bJason Sams2014-06-181-11/+19
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderScript Element types know their own size. This change properly tracks the new object sizes. Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
* | | | | | | | | | | Merge "Stronger PackageParser contract, more split work."Jeff Sharkey2014-06-186-323/+360
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Stronger PackageParser contract, more split work.Jeff Sharkey2014-06-186-323/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require that method callers always provide relevant paths, instead of relying on constructor. Move DisplayMetrics to be an overall parser parameter, and move PARSE_TRUSTED_OVERLAY to flags. Parse split APKs and apply deterministic ordering based on split names. Assert consistent package name and version code across all split APKs in a package, and enforce unique split names and required base APK. Collect certificates for split APKs, enforcing they're all signed consistently. Better flow control and resource cleanup when collecting certs. Refactor validation code so it's easier to reason about. Cleaner maintenance of read buffer when draining stream contents. Change-Id: I8bc8c62095fbb933227b9e76ad8771f4b1246fe8
* | | | | | | | | | | | Merge "Don't make translucent window opaque during activity transition."George Mount2014-06-182-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't make translucent window opaque during activity transition.George Mount2014-06-182-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 15535332 Returning transitions will continue to not work until Bug 14869070 is fixed. Change-Id: If0128b58eb852b037924ae6dea8e975fedbe5be7
* | | | | | | | | | | | | Merge "Clean up tessellation cache in prep for other tesselation types"Chris Craik2014-06-186-90/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Clean up tessellation cache in prep for other tesselation typesChris Craik2014-06-186-90/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:15536396 Also fixes compilation warning, avoids SkPaint deep copy Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b
* | | | | | | | | | | | | Fix docs breakage from refactorJason Monk2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I567249542ee02e4bde3e0e03cdfae8969104c1b8
* | | | | | | | | | | | | Merge "Throw ISE on too-big-views-with-layers"John Reck2014-06-173-14/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Throw ISE on too-big-views-with-layersJohn Reck2014-06-183-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12971954 Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1
* | | | | | | | | | | | | | am 7deaf7c5: am f2dcb390: Merge "Limit swipe dismiss progress to positive ↵Mark Renouf2014-06-181-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values" into klp-modular-dev * commit '7deaf7c5304aed9ca2ed6dc0e6c5e853127e6020': Limit swipe dismiss progress to positive values
| * | | | | | | | | | | | | am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into ↵Mark Renouf2014-06-181-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'f2dcb390444ffb42cf8637c99f53d821917554e6': Limit swipe dismiss progress to positive values
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Limit swipe dismiss progress to positive values" into klp-modular-devMark Renouf2014-06-171-5/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Limit swipe dismiss progress to positive valuesMark Renouf2014-06-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 15716749 Change-Id: Ibd6daa1a515611e5c9b8a02c6df75130aa8c093b
* | | | | | | | | | | | | | | | am 8312bfd6: am 5cfea842: Merge "docs: add allowembedded" into klp-modular-devRobert Ly2014-06-181-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | * commit '8312bfd6181037eb7dab04a38bca9b6231bcad00': docs: add allowembedded
| * | | | | | | | | | | | | | am 5cfea842: Merge "docs: add allowembedded" into klp-modular-devRobert Ly2014-06-181-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cfea84264911b93057a667cbcaf90e10740d658': docs: add allowembedded
| | * | | | | | | | | | | | | Merge "docs: add allowembedded" into klp-modular-devRobert Ly2014-06-171-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | docs: add allowembeddedRobert Ly2014-06-181-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I748db66a62c85ad37f900b5bde83be178a1c6902
* | | | | | | | | | | | | | | | Merge "setSelectedHeader() when switching to fragment"Brian Attwell2014-06-181-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | setSelectedHeader() when switching to fragmentBrian Attwell2014-06-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, passing a EXTRA_SHOW_FRAGMENT value for a two panel preferences activity will cause the correct fragment to be shown. However, it will not cause the correct header to be highlighted. Bug: 15675746 Bug: 5045558 Change-Id: I18d8e15dd104e8f39ae1ccbb11ab17fd1bf7462e
* | | | | | | | | | | | | | | | Merge "Fix blinking animation during Visibility transitions."George Mount2014-06-182-33/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix blinking animation during Visibility transitions.George Mount2014-06-182-33/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 15618501 Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
* | | | | | | | | | | | | | | | | Merge "Fix build break in log statement"Adam Lesinski2014-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix build break in log statementAdam Lesinski2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For logging purposes, a uint32_t was being converted into a void pointer, which on certain systems would be a conversion to a different size. Change-Id: I90af69ab975d84c9c8cbb1cce94ff4e9cc6edcf2
* | | | | | | | | | | | | | | | | | Merge "Fix missed running update-api"Jason Monk2014-06-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix missed running update-apiJason Monk2014-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build server is stuck on something else, but will likely soon discover this... Change-Id: Ib029d07a09d373f8bea1204176f3d00c830c9f0b
* | | | | | | | | | | | | | | | | | Merge "Improve constant state for VectorDrawable"ztenghui2014-06-174-3/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \