diff options
| author | Hyerim Kim <rimi.kim@samsung.com> | 2017-01-02 16:36:52 +0900 |
|---|---|---|
| committer | Hyerim Kim <rimi.kim@samsung.com> | 2017-01-02 16:36:52 +0900 |
| commit | 46edb99a23582acc55b65c9225d38588e4f7a54a (patch) | |
| tree | 3a71851e8457a64491b882f24ed298b1f93c1762 | |
| parent | b3588a13caa769c92577dab7088d97ca152baac0 (diff) | |
| download | air_home-46edb99a23582acc55b65c9225d38588e4f7a54a.tar.gz air_home-46edb99a23582acc55b65c9225d38588e4f7a54a.tar.bz2 air_home-46edb99a23582acc55b65c9225d38588e4f7a54a.zip | |
Merge from tizen_3.0submit/tizen/20170102.074645accepted/tizen/tv/20170102.223118
- Add Apps in home
- Install configuration files for systemd to /usr/lib directory
Change-Id: I585d111a76252b44dc912ada071acb8a30c1ca12
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
| -rw-r--r-- | config/home.json.in | 7 | ||||
| -rw-r--r-- | edje/view/home.edc | 2 | ||||
| -rw-r--r-- | packaging/org.tizen.home.spec | 14 |
3 files changed, 15 insertions, 8 deletions
diff --git a/config/home.json.in b/config/home.json.in index acec8f8..20b3afe 100644 --- a/config/home.json.in +++ b/config/home.json.in @@ -8,6 +8,13 @@ "parameter": "VIEW_USER" }, { + "name": "APP", + "icon": "@IMAGEDIR@/btn_menu_app_nor.png", + "focus_icon": "@IMAGEDIR@/btn_menu_app_foc.png", + "select_action": "launch", + "parameter": "org.tizen.apps" + }, + { "name": "Settings", "icon": "@IMAGEDIR@/btn_menu_setting_nor.png", "focus_icon": "@IMAGEDIR@/btn_menu_setting_foc.png", diff --git a/edje/view/home.edc b/edje/view/home.edc index 880f79f..828c89f 100644 --- a/edje/view/home.edc +++ b/edje/view/home.edc @@ -148,7 +148,7 @@ group { description { state, "show" 0.0; inherit, "default" 0.0; - min, 316 158; + min, 474 158; } } } diff --git a/packaging/org.tizen.home.spec b/packaging/org.tizen.home.spec index 1cb057b..eae9147 100644 --- a/packaging/org.tizen.home.spec +++ b/packaging/org.tizen.home.spec @@ -59,10 +59,10 @@ make %{?jobs:-j%jobs} %install %make_install install --directory %{buildroot}/%{_datadir} -install --directory %{buildroot}%{_libdir}%{_servicedir} -install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}%{_sysuserdir} -install -m 0644 %{SOURCE2} %{buildroot}%{_libdir}%{_sysuserdir} -ln -sf ../%{name}.path %{buildroot}%{_libdir}%{_servicedir} +install --directory %{buildroot}%{_prefix}/lib/%{_servicedir} +install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/%{_sysuserdir} +install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/%{_sysuserdir} +ln -sf ../%{name}.path %{buildroot}%{_prefix}/lib/%{_servicedir} %clean rm -rf %{buildroot} @@ -74,8 +74,8 @@ rm -rf %{buildroot} %{_resdir}/* %{_datadir} %{_manifestdir}/%{name}.xml -%{_libdir}%{_sysuserdir}/%{name}.service -%{_libdir}%{_sysuserdir}/%{name}.path -%{_libdir}%{_servicedir}/%{name}.path +%{_prefix}/lib/%{_sysuserdir}/%{name}.service +%{_prefix}/lib/%{_sysuserdir}/%{name}.path +%{_prefix}/lib/%{_servicedir}/%{name}.path %{_datarootdir}/license/* |