summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed unnecessary typecast.jellybeanKevin Vajk2013-02-121-2/+6
| | | | | | | Don't need to call findViewById() again. Null pointer check, consistent with the rest of the code. Change-Id: I24c2871be27ef700b52b2f86d891c9929a7e0bed
* Merge "Trebuchet: Udated italian translation" into jellybeanMarco Brohet2013-02-041-0/+2
|\
| * Trebuchet: Udated italian translationrheeze2012-12-031-0/+2
| | | | | | | | | | | | | | Added strings for change: "Add a pref to set hotseat icon's number" Change-Id: Iea5c320619bc98645b0450d746df1fed1615d542
* | Trebuchet: Add Greek translationMichael Bestas2012-12-191-0/+68
| | | | | | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ib9eef5ada4807b91cee01ed46d6965bc6e387e93
* | Merge "Trebuchet: Update german translation" into jellybeanDaniel Hillenbrand2012-12-162-2/+3
|\ \
| * | Trebuchet: Update german translationelektroschmock2012-12-072-2/+3
| | | | | | | | | | | | | | | | | | | | | Patch set 1 - Update german translation Removed string without default translation in values-pt Change-Id: I5482790d7403afa2c96370911dc8e3cab24ca6fc
* | | Merge "Trebuchet: Simplified Chinese translations" into jellybeanDavid van Tonder2012-12-111-0/+2
|\ \ \ | |/ / |/| |
| * | Trebuchet: Simplified Chinese translationsAndrew Jiang2012-12-011-0/+2
| |/ | | | | | | Change-Id: Ic61858fdaa220012b84e38aef51eeab8d46f933a
* | Merge "Trebuchet: update pt-pt translations" into jellybeanSteve Kondik2012-12-051-31/+131
|\ \ | |/ |/|
| * Trebuchet: update pt-pt translationsJoão Ventura2012-11-251-31/+131
| | | | | | | | Change-Id: I21f7fdddc9a77c5c5d0d66e55c195a0db008850b
* | Trebuchet : Add a pref to set hotseat icon's numberAntonin Fouques2012-12-0115-20/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a preference for the hotseat (Launcher main bar/dock) - Choose the number of icons on the hotseat - Choose the place of the applications drawer button by drag'n'drop - Translations in English + French This is usefull for big screen devices. You can set from 1 to 9 buttons on the hotseat. You can set the app button where you want by drag'n'drop. Default values are keeped unchanged so there is no pb with first screen tuto + no pb with default shortcuts. Demo video : https://www.dropbox.com/s/2wamj9yr1s3woxl/Trebuchet-hotseat-icons.mp4 Demo apk : https://www.dropbox.com/s/psqab2gyivcyo3d/CmoaToto%20Trebuchet.apk PatchSet 1 : initial commit PatchSet 2 : coding style PatchSet 3 : - Remove prefs for tablet - AllApps Button move by Drag'n'Drop (instead of pref) PatchSet 4 : searchbar & deletebar don't dis/appear while dragging AllApps button) PatchSet 5 : dropOnFlingToDeleteTarget disabled for AllApps button PatchSet 6 : - Fix shortcuts errors in database - Set docks pref disabled for large screen programmatically - Fix english strings/french trads Change-Id: I21f6a4610ed16c8780ccf6e2acffcf6e07511457
* | Trebucher : Added missing French Translationjellybean-stableAntonin Fouques2012-11-091-2/+8
|/ | | | | | PatchSet 1 : Add a correction, thx to Florent Imfloflo Change-Id: I17854dbb9cb6507e6797357fb65ae9e43db02142
* Trebucher : Added missing French TranslationDelPETER2012-11-061-2/+2
| | | | Change-Id: I91fd42322fce3781dcd029b9df4a5e9fc7268ff4
* Update Russian Translation-Trebuchet-CM10 (typo)Vsevolod Zoubarev2012-11-051-1/+1
| | | | Change-Id: Ib9cebb36730055c8826b988bde09b82e566c7e9f
* Merge branch 'master' of ↵Steve Kondik2012-11-0515-553/+905
|\ | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp Conflicts: res/layout-land/drop_target_bar.xml src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java src/com/cyanogenmod/trebuchet/Launcher.java src/com/cyanogenmod/trebuchet/LauncherModel.java Change-Id: I5aa702e333da27645b0d765b233f4d8a89991cb9
| * Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| |\ | | | | | | | | | Change-Id: I96a076254209becd703d8a61d027bd41527f58fa
| | * merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-310-0/+0
| | |\
| * | \ am 2efda95e: Fixing landscape delete drop target padding.Winson Chung2012-07-301-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2efda95e5a8f1b3ef78b209a9259f7040bbf16be': Fixing landscape delete drop target padding.
| | * | Fixing landscape delete drop target padding.Winson Chung2012-07-271-0/+1
| | | | | | | | | | | | | | | | Change-Id: I17ee4c69f2f4b154a2dc19416a97d1d91b45b53a
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I3742aff353335629ae76eacc2d92a6aed87b1ebe
| | * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | | |\ \
| * | | \ \ am fa4086dd: Fixing issue where selected tab did not match AllApps page upon ↵Winson Chung2012-07-251-8/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation. * commit 'fa4086ddd7ab9dd98e3ffef798a655ec07e37e14': Fixing issue where selected tab did not match AllApps page upon rotation.
| | * | | | Fixing issue where selected tab did not match AllApps page upon rotation.Winson Chung2012-07-251-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f32ca7cca042b94bdaea5cf259c397404546e0d
| * | | | | am 8ed3752f: Fix issue where widget resize frame overlaps widget (issue 6493388)Adam Cohen2012-07-251-6/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8ed3752f03d4b6c27297fa4fc9d4e153df47bbf3': Fix issue where widget resize frame overlaps widget (issue 6493388)
| | * | | | Fix issue where widget resize frame overlaps widget (issue 6493388)Adam Cohen2012-07-251-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1e53a7df49b26ecb19880e58b19876b80cfb12c
| * | | | | am c93e5ae1: Binding AllApps synchronously. (Bug 6855061)Winson Chung2012-07-256-51/+76
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c93e5ae12018bb214099ff88a48cc21580aec4c3': Binding AllApps synchronously. (Bug 6855061)
| | * | | | Binding AllApps synchronously. (Bug 6855061)Winson Chung2012-07-246-51/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also ensuring that we restore to the settling page index if it is in motion Change-Id: I9c6760383113f7614f6cb962ab6562b0e7eb7138
| * | | | | am 1462de39: Ensuring that restoreInstanceState is being called promptly for ↵Adam Cohen2012-07-244-8/+61
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronously bound page * commit '1462de39f01cec0ba785386532719cb0207dd827': Ensuring that restoreInstanceState is being called promptly for synchronously bound page
| | * | | | Ensuring that restoreInstanceState is being called promptly for ↵Adam Cohen2012-07-244-8/+61
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | synchronously bound page Change-Id: I0e71c29f553ad360ec42a6a0b2529d16cbddd437
| * | | | am a13a2f2a: Fixing issue where defered unbind was running after synchronous ↵Adam Cohen2012-07-232-0/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | bind. (Bug 6858398, Bug 6863181) * commit 'a13a2f2a7bd0550d1ad973f760ff25e1a4137c43': Fixing issue where defered unbind was running after synchronous bind. (Bug 6858398, Bug 6863181)
| | * | | Fixing issue where defered unbind was running after synchronous bind. (Bug ↵Adam Cohen2012-07-232-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6858398, Bug 6863181) Change-Id: I03dc3ae18528901cc88c79638a8495c1ab8d61af
| * | | | am 36e6c5bb: Disabling synchronous binding when returning home from another ↵Winson Chung2012-07-193-9/+50
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | app while orientation has changed. (Bug 6792288) * commit '36e6c5bb232f3a876753b91fb9ec604cda8664a5': Disabling synchronous binding when returning home from another app while orientation has changed. (Bug 6792288)
| | * | | Disabling synchronous binding when returning home from another app while ↵Winson Chung2012-07-193-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation has changed. (Bug 6792288) - Fixing issue where we were reverting to the first page of the workspace after launching an application from all apps, rotating, and returning home - Enabling rotation in master. Change-Id: I291b9d76b20244e9028b6f62164430bc3606644c
| * | | | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I8eadf20cd941fbf298677537d3771780eca0b07b
| | * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-110-0/+0
| | | |\ \
| * | | \ \ am d7d37b13: DO NOT MERGE Adding sycnhronous loading of current page to ↵Adam Cohen2012-07-185-443/+687
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support seamless rotation. (Bug 6792288) * commit 'd7d37b134b7a3b12858ff099069eba369a6b5373': DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug 6792288)
| * | | | | am 827a5580: Fixing issue where drop target text was not showing in tablet ↵Winson Chung2012-07-112-37/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ui. (Bug 6789399) * commit '827a55807303c31ee289b352fb300f97562dfa43': Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: Id4de428001ead0dc7fd1cc38a594b2704e1879af
| * | | | | am e76e36f4: Merge "Disallowing touches through the custom workspace cling. ↵Winson Chung2012-06-271-3/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 6721250)" into jb-dev * commit 'e76e36f420c4e0ff2198eeadc86a3b2acfa2479a': Disallowing touches through the custom workspace cling. (Bug 6721250)
| * \ \ \ \ \ am 9dc25f06: Merge "Fixing concurrent modification exception when iterating ↵Winson Chung2012-06-251-3/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through new apps list. (Bug 6621553)" into jb-dev * commit '9dc25f06a870938a2adb976194da78574825e83e': Fixing concurrent modification exception when iterating through new apps list. (Bug 6621553)
| * \ \ \ \ \ \ Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1dce27a5a2dc5fd8af5cafd7501d59f54614df3
| * \ \ \ \ \ \ \ Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9e036e4156d80d4990cb53a8f7a259df27fb7ce
| * \ \ \ \ \ \ \ \ am eb04476d: Merge "Fix issue where "X" would appear over QSB bar in ↵Michael Jurka2012-06-181-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landscape mode" into jb-dev * commit 'eb04476def775427a4d216c9ce32e53da5ad4765': Fix issue where "X" would appear over QSB bar in landscape mode
| * \ \ \ \ \ \ \ \ \ am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-devMichael Jurka2012-06-182-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd74389d9027a128da85be151670ee43e55feaba5': Add null pointer checks to fix NPEs
| * \ \ \ \ \ \ \ \ \ \ am a71d745a: Merge "Address widget size callback issue for small phones ↵Adam Cohen2012-06-182-10/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (issue 6670346)" into jb-dev * commit 'a71d745ab3449c29f86aa2da8e1848d6edf40dbe': Address widget size callback issue for small phones (issue 6670346)
| * \ \ \ \ \ \ \ \ \ \ \ am 15254fc3: Import translations. DO NOT MERGEYing Wang2012-06-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15254fc386975a8ce2e171de40efd6348d7f9fbb': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ am 7e4e4ba4: Merge "Removing logging in AppsCustomizePagedView (Bug ↵Winson Chung2012-06-144-42/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6597629)" into jb-dev * commit '7e4e4ba494e50d918a1573b2fa601c561037deae': Removing logging in AppsCustomizePagedView (Bug 6597629)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am a35a7807: Merge "Fix NPE" into jb-devMichael Jurka2012-06-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a35a7807c27641187e6de5dee8dcd405b683e294': Fix NPE