summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github/cm-11.0' into HEADBrint E. Kriebel2014-03-278-8/+373
|\
| * Trebuchet: UG translationsahranbay2014-03-242-0/+145
| | | | | | | | Change-Id: I386f78366a618e07a320811aa8f4db38853616dd
| * Merge "trebuchet: build headers from internal adapter instance" into cm-11.0Jorge Ruesga2014-03-101-3/+12
| |\
| | * trebuchet: build headers from internal adapter instanceJorge Ruesga2014-03-091-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trebuchet will be killed if any of its settings changed, so if it is accessed from recents then the PreferencesActivity is rebuilt from its saved instance and the headers are not filled by onBuildHeaders, because this is not called. Just ensure we build the headers from the internal adapter. Change-Id: I3159daadd715d5cbc0d9bcd377d8bbe51f638d32 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
| * | Merge "trebuchet: fix custom home transition effect" into cm-11.0Jorge Ruesga2014-03-091-2/+2
| |\ \ | | |/ | |/|
| | * trebuchet: fix custom home transition effectJorge Ruesga2014-02-241-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie9d24fd40a2c60834cd4e69564bbb59224b32cb9 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
| * | Merge "Trebuchet: fix icons disappearing from the hotseat (dock)." into cm-11.0Abhisek Devkota2014-03-041-3/+4
| |\ \
| | * | Trebuchet: fix icons disappearing from the hotseat (dock).lee worrall2014-03-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "occupied" array for the hotseat should be [numHotseatIcons][1], not [numColumns+1][numRows+1], because numHotseatIcons can be >1 more than numColumns; so the rightmost hotseat icon is lost on restart if, for example, the workspace is 5x5 but there are 7 hotseat icons. Change-Id: If68b5fa3d668302601320cd0cb96498afe4fc200
| * | | Trebuchet: AST translations4malditoastur2014-03-043-0/+210
| | | | | | | | | | | | | | | | Change-Id: I442036f4dce0f1469e464158fe434273ef3f6607
* | | | Merge remote-tracking branch 'github/cm-11.0' into HEADBrint E. Kriebel2014-02-2818-115/+415
|\| | |
| * | | Merge "Trebuchet : Decouple iconMask and iconBack dependency" into cm-11.0Danesh Mondegarian2014-02-281-4/+4
| |\ \ \
| | * | | Trebuchet : Decouple iconMask and iconBack dependencyDanesh Mondegarian2014-02-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow them to function independently in the case where an icon pack only has one of them. Change-Id: I7b72bd689eac7e411f88cb5fbacea3604d45036b
| * | | | Trebuchet: PT-BR translationsMarco Brohet2014-02-282-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I732a2b534ff71843b5d51485e4a414068999a45f
| * | | | Trebuchet: IT translationsFrancesco2014-02-271-4/+4
| | |/ / | |/| | | | | | | | | | Change-Id: Ib3d50a6f9d79849252d8b3fed7bb5413886d8b37
| * | | Trebuchet: MS translationsMarco Brohet2014-02-252-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | Transifex import Change-Id: I4afa65e524e122584bfc0a84a3c5abc07f23e777
| * | | Trebuchet: IT translationsFrancesco2014-02-252-0/+87
| | | | | | | | | | | | | | | | Change-Id: I8e57e64a7ca6b459d4d898b9f356221c0f1ed01f
| * | | Merge "Trebuchet: ES translations" into cm-11.0Marco Brohet2014-02-242-0/+87
| |\ \ \
| | * | | Trebuchet: ES translationsLorenzo M2014-02-242-0/+87
| | | |/ | | |/| | | | | | | | | | | | | | | | | - Initial translations (import from Tx) Change-Id: I361bcd6c0f177dedca44909a3ba8f4921b3fb5ae
| * | | Merge "Trebuchet: Af Translations" into cm-11.0Marco Brohet2014-02-242-0/+87
| |\ \ \ | | |/ / | |/| |
| | * | Trebuchet: Af Translationsisimobile2014-02-242-0/+87
| | | | | | | | | | | | | | | | Change-Id: I5cec542094476e6d4f82368ca33263276d79e9ae
| * | | Merge "Trebuchet: NL translation" into cm-11.0Marco Brohet2014-02-231-0/+1
| |\ \ \
| | * | | Trebuchet: NL translationEddy Witkamp2014-02-171-0/+1
| | | |/ | | |/| | | | | | | | | Change-Id: Iec7e0a737edf3aa737b70550ceb7e035874384ed
| * | | Trebuchet: Transifex fix revert 2Marco Brohet2014-02-232-0/+0
| | | | | | | | | | | | | | | | Change-Id: I2a3a7fffdeefa07a25af295bb7b75e48ffd071ad
| * | | Trebuchet: revert Transifex fixesMarco Brohet2014-02-234-42/+78
| | | | | | | | | | | | | | | | Change-Id: Ie21f672c74d97b141b3bb43573d28f408f018cc1
| * | | Merge "Revert "Trebuchet: ES translations"" into cm-11.0Marco Brohet2014-02-231-68/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Trebuchet: ES translations"Michael Bestas2014-02-231-68/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4b689dc9a9143a88b85d3227131e624934188aa8. Change-Id: I19e8ba2180dbb9f3498070942dd3d3749dfb3639
| * | | Trebuchet : Avoid unecessary generatePressedFocusedStatesDanesh M2014-02-191-1/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | When the drawable's state changes, don't generate state drawables until after the invalidate call, which takes care of this already, otherwise it gets drawn before measure/layout gets a chance to run. Change-Id: I1ce89fffaa535f5c47e42ec64801a70cbc3f7814
* | | Merge remote-tracking branch 'github/cm-11.0' into HEADBrint E. Kriebel2014-02-1922-37/+727
|\| |
| * | Merge "Trebuchet: CS translation" into cm-11.0Jorge Ruesga2014-02-151-0/+10
| |\ \
| | * | Trebuchet: CS translationOndrej Zima2014-02-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | - added missing Change-Id: Ia7c108c21dae2cbf301dd975ec5703de154f9a60
| * | | Merge "Trebuchet: Initial DE translation" into cm-11.0Jorge Ruesga2014-02-151-0/+69
| |\ \ \
| | * | | Trebuchet: Initial DE translationelektroschmock2014-02-111-0/+69
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib16810584df94960353b893107a1189f47a916e6
| * | | | trebuchet: remove aapt warningsJorge Ruesga2014-02-154-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c1b3f2dd6e889227e9ee1efb0c009c0b007a5c3 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
| * | | | Merge "Trebuchet: LT translations" into cm-11.0Jorge Ruesga2014-02-152-0/+87
| |\ \ \ \
| | * | | | Trebuchet: LT translationsFrant1c2014-02-132-0/+87
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: Ie3f5693cc5c578e07817ab92e0b057190dcd046a
| * | | | Merge "Trebuchet: IW translation" into cm-11.0Jorge Ruesga2014-02-151-0/+67
| |\ \ \ \
| | * | | | Trebuchet: IW translationArthur Zamarin2014-02-111-0/+67
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | - Transifex export Change-Id: I32a9f21f25773f750a5b3e4d369348cf9a332464
| * | | | Merge "Trebuchet : Fix appInfo crash for hotseat" into cm-11.0Danesh M2014-02-151-1/+1
| |\ \ \ \
| | * | | | Trebuchet : Fix appInfo crash for hotseatDanesh M2014-02-131-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I070f9b3f490b3105a57126180c90aab1b4e7829b
| * | | | | Merge "Trebuchet : Add iconMask/iconBack/iconUpon/iconScale support" into ↵Danesh Mondegarian2014-02-143-11/+118
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | cm-11.0
| | * | | | | Trebuchet : Add iconMask/iconBack/iconUpon/iconScale supportDanesh Mondegarian2014-02-123-11/+118
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: I85ecee3b5c26f79918fe0c4d220e09c943eec3e6
| * | | | | Trebuchet : Avoid unecessary generatePressedFocusedStatesDanesh Mondegarian2014-02-141-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the drawable's state changes, don't generate state drawables until after the invalidate call, which takes care of this already, otherwise it gets drawn before measure/layout gets a chance to run. Change-Id: I92543302730446abbb11e3c9c963bd12689cdc7b
| * | | | Trebuchet : Avoid upgrade paths if ALL_APPS buttonDanesh M2014-02-131-2/+4
| | |/ / | |/| | | | | | Change-Id: I0632760f7c5869940711e711114177cc3e576453
| * | | Trebuchet: NL translationEddy Witkamp2014-02-122-0/+86
| | | | | | | | | | | | | | | | Change-Id: I61b4ecc026347019dd6dfc0012ee96130044c62f
| * | | Merge "Trebuchet: PT-BR Translations" into cm-11.0Abhisek Devkota2014-02-121-2/+7
| |\ \ \
| | * | | Trebuchet: PT-BR TranslationsGustavo2014-02-121-2/+7
| | |/ / | | | | | | | | | | | | Change-Id: I67aafc73cae2870aa2310eb48b2e2829fcb4e721
| * | | Merge "Trebuchet: DA translation" into cm-11.0Abhisek Devkota2014-02-122-0/+87
| |\ \ \
| | * | | Trebuchet: DA translationJacob Overgaard Madsen2014-02-122-0/+87
| | |/ / | | | | | | | | | | | | | | | | | | | | Patchset 4: 2 unneeded strings removed Change-Id: I9dee441a45d982c792cf2aa613533ce378eca728
| * | | Merge "Trebuchet: RU translation" into cm-11.0Abhisek Devkota2014-02-122-0/+97
| |\ \ \
| | * | | Trebuchet: RU translationVladislav Koldobskiy2014-02-102-0/+97
| | |/ / | | | | | | | | | | | | Change-Id: I90f5aeaa58ed5a97f616119e41aa942940b10d77