lp:~unity-team/unity/trunk-cherrypicks-for-6.0
Created by
Michal Hruby
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Brandon Schaefer (community): Approve
- Didier Roche-Tolomelli: Approve
-
Diff: 1075 lines (+353/-175)30 files modifieddash/DashView.cpp (+0/-5)
dash/DashView.h (+0/-3)
dash/ResultViewGrid.cpp (+14/-2)
dash/previews/ActionButton.cpp (+0/-5)
dash/previews/PreviewInfoHintWidget.cpp (+0/-1)
launcher/BamfLauncherIcon.cpp (+24/-21)
launcher/FavoriteStoreGSettings.cpp (+3/-3)
launcher/StandaloneSwitcher.cpp (+2/-2)
launcher/SwitcherController.cpp (+1/-2)
launcher/SwitcherController.h (+1/-1)
launcher/VolumeImp.cpp (+4/-1)
manual-tests/Switcher.txt (+1/-0)
plugins/unityshell/resources/emblem_apps.svg (+90/-19)
plugins/unityshell/resources/emblem_others.svg (+12/-0)
plugins/unityshell/resources/emblem_video.svg (+58/-17)
plugins/unityshell/resources/lens-nav-gwibber.svg (+6/-8)
plugins/unityshell/src/unityshell.cpp (+10/-4)
plugins/unityshell/src/unityshell.h (+3/-1)
tests/autopilot/unity/emulators/icons.py (+4/-0)
tests/autopilot/unity/tests/test_home_lens.py (+4/-1)
tests/gmockvolume.c (+18/-0)
tests/gmockvolume.h (+2/-0)
tests/test_switcher_controller.cpp (+3/-3)
tests/test_volume_imp.cpp (+5/-2)
unity-shared/CoverArt.cpp (+2/-2)
unity-shared/DashStyle.cpp (+1/-1)
unity-shared/IconLoader.cpp (+57/-40)
unity-shared/PluginAdapter.h (+2/-0)
unity-shared/PluginAdapterCompiz.cpp (+25/-30)
unity-shared/SearchBar.cpp (+1/-1)
Related bugs
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:unity