Remove unused code 37/69137/1 submit/tizen/20160512.025729
authorHyunjee Kim <hj0426.kim@samsung.com>
Thu, 12 May 2016 01:33:41 +0000 (10:33 +0900)
committerHyunjee Kim <hj0426.kim@samsung.com>
Thu, 12 May 2016 01:35:42 +0000 (10:35 +0900)
* remove 210.org.tizen.setting.patch.sh/mime.setting.xml.in/ref rpm
* unused code in setting-display
* change icon path(make sound dir)
* remove unused icons (savingpower/motions/etc)

Change-Id: I610ed2f252b4241b276861c4d17cef8daa380827
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>
121 files changed:
210.org.tizen.setting.patch.sh [deleted file]
CMakeLists.txt
mime.setting.xml.in [deleted file]
org.tizen.setting.xml.ref.in [deleted file]
packaging/org.tizen.setting.spec
resource/icons/00_volume_icon.png [deleted file]
resource/icons/A01-1_icon_color_Audio.png [deleted file]
resource/icons/A01-1_icon_color_applications.png [deleted file]
resource/icons/A01-1_icon_color_available.png [deleted file]
resource/icons/A01-1_icon_color_miscellaneous_files.png [deleted file]
resource/icons/A01-1_icon_color_pictures.png [deleted file]
resource/icons/A01-1_icon_color_system.png [deleted file]
resource/icons/B04_slider_icon_notification.png [deleted file]
resource/icons/B04_slider_icon_notification_mute.png [deleted file]
resource/icons/B04_slider_icon_notification_vibrate.png [deleted file]
resource/icons/B04_slider_icon_ring.png [deleted file]
resource/icons/B04_slider_icon_system.png [deleted file]
resource/icons/B04_slider_icon_system_mute.png [deleted file]
resource/icons/B04_slider_icon_system_vibrate.png [deleted file]
resource/icons/B04_slider_icon_vibrate.png [deleted file]
resource/icons/B04_volume_icon_Vibrat.png [deleted file]
resource/icons/B04_volume_icon_mute.png [deleted file]
resource/icons/color-theme/colorpicker/A01-1_color_picker_palette_focus.#.png [deleted file]
resource/icons/gallery-viewer.png [deleted file]
resource/icons/motions/direct call/B15_direct_call_01.png [deleted file]
resource/icons/motions/direct call/B15_direct_call_02.png [deleted file]
resource/icons/motions/direct call/B15_direct_call_03.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_bg.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_01.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_02.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_03.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_04.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_05.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_06.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_07.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_08.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_09.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_10.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_11.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_12.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_13.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_14.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_15.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_16.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_17.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_18.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_19.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_20.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_21.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_22.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_23.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_24.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_25.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_26.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_27.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_28.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_29.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_30.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_31.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_32.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_33.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_34.png [deleted file]
resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_35.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_01.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_02.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_03.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_04.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_05.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_06.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_07.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_08.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_09.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_10.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_11.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_12.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_13.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_14.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_15.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_16.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_17.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_18.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_19.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_20.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_21.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_22.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_23.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_24.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_25.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_26.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_27.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_28.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_29.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_30.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_31.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_32.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_33.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_34.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_35.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_36.png [deleted file]
resource/icons/savingpower/popup/standby_time/A01-11_popup_time_bg.png [deleted file]
resource/icons/sound_icon/00_volume_icon.png [new file with mode: 0755]
resource/icons/sound_icon/B04_slider_icon_notification.png [new file with mode: 0644]
resource/icons/sound_icon/B04_slider_icon_notification_mute.png [new file with mode: 0644]
resource/icons/sound_icon/B04_slider_icon_ring.png [new file with mode: 0644]
resource/icons/sound_icon/B04_slider_icon_system.png [new file with mode: 0644]
resource/icons/sound_icon/B04_slider_icon_system_mute.png [new file with mode: 0644]
resource/icons/sound_icon/B04_slider_icon_vibrate.png [new file with mode: 0644]
resource/icons/sound_icon/B04_volume_icon_mute.png [new file with mode: 0644]
resource/icons/wallpaper-viewer.png [deleted file]
setting-common/include/setting-common-string.h
setting-display/CMakeLists.txt
setting-display/include/setting-display-backlight.h [deleted file]
setting-display/include/setting-display.h
setting-display/src/setting-display-backlight.c [deleted file]
setting-display/src/setting-display-brightness.c [changed mode: 0644->0755]
setting-display/src/setting-display-main.c [changed mode: 0644->0755]
setting-display/src/setting-display.c
setting-phone/include/setting-phone.h
setting-profile/include/setting-profile.h
setting-storage/src/setting-storage-main.c
src/CMakeLists.txt

diff --git a/210.org.tizen.setting.patch.sh b/210.org.tizen.setting.patch.sh
deleted file mode 100644 (file)
index 686efdf..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/usr/apps/org.tizen.setting/bin/setting_conf_util mig_cfg
-chown app:app %{TZ_SYS_DATA}/setting/setting.cfg
index 0a85b93de83302f0b4f4d652c448bbddd8a83883..64a50a841f99e3b21d42c4e258dd4eb368c3e434 100755 (executable)
@@ -76,14 +76,12 @@ ADD_SUBDIRECTORY(resource/po)
 
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/org.tizen.setting.xml.in ${CMAKE_SOURCE_DIR}/org.tizen.setting.xml @ONLY)
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/org.tizen.setting.xml.ref.in ${CMAKE_SOURCE_DIR}/org.tizen.setting.xml.ref @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resource/langlist_all.xml.in ${CMAKE_SOURCE_DIR}/resource/langlist_all.xml @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resource/ug-setting-shortcut-efl.xml.in ${CMAKE_SOURCE_DIR}/resource/ug-setting-shortcut-efl.xml @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resource/langlist.india.xml.in ${CMAKE_SOURCE_DIR}/resource/langlist.india.xml @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resource/langlist.xml.in ${CMAKE_SOURCE_DIR}/resource/langlist.xml @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resource/changeable/org.tizen.setting.xml.in ${CMAKE_SOURCE_DIR}/resource/changeable/org.tizen.setting.xml @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resource/changeable/org.tizen.setting_font-lite.xml.in ${CMAKE_SOURCE_DIR}/resource/changeable/org.tizen.setting_font-lite.xml @ONLY)
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/mime.setting.xml.in ${CMAKE_SOURCE_DIR}/mime.setting.xml @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc.in ${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc @ONLY)
 
 
diff --git a/mime.setting.xml.in b/mime.setting.xml.in
deleted file mode 100644 (file)
index 5edda71..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-<mime-type type="application/sasf">
-       <comment>Setting/Manage accessibiilty File</comment>
-       <glob pattern="*.sasf"/>
-</mime-type>
-</mime-info>
diff --git a/org.tizen.setting.xml.ref.in b/org.tizen.setting.xml.ref.in
deleted file mode 100755 (executable)
index 9f0a387..0000000
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.setting" version="0.9.5" install-location="internal-only">
-       <label>Settings</label>
-       <author email="mj2004.park@samsung.com" href="www.samsung.com">MyoungJune Park</author>
-       <description>Setting Application</description>
-       <ui-application appid="org.tizen.setting" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting" nodisplay="true" multiple="false" type="capp" taskmanage="true" indicatordisplay="true" portrait-effectimage="/usr/share/splash_images/type0_portrait.jpg" landscape-effectimage="/usr/share/splash_images/type1/landscape.jpg">
-               <icon>@TZ_SYS_RO_ICONS@/default/small/org.tizen.setting.png</icon>
-               <label>Settings</label>
-               <label xml:lang="ar-ae">ﺎﻠﻀﺒﻃ</label>
-               <label xml:lang="az-az">Parametrlər</label>
-               <label xml:lang="bg-bg">Настройки</label>
-               <label xml:lang="ca-es">Ajustaments</label>
-               <label xml:lang="cs-cz">Nastavení</label>
-               <label xml:lang="da-dk">Indstillinger</label>
-               <label xml:lang="de-de">Einstellungen</label>
-               <label xml:lang="el-gr">Ρυθμίσεις</label>
-               <label xml:lang="en-gb">Settings</label>
-               <label xml:lang="en-ph">Settings</label>
-               <label xml:lang="en-us">Settings</label>
-               <label xml:lang="es-es">Ajustes</label>
-               <label xml:lang="es-mx">Configuración</label>
-               <label xml:lang="et-ee">Seaded</label>
-               <label xml:lang="eu-es">Ezarpenak</label>
-               <label xml:lang="fi-fi">Asetukset</label>
-               <label xml:lang="fr-ca">Paramètres</label>
-               <label xml:lang="fr-fr">Paramètres</label>
-               <label xml:lang="ga-ie">Socruithe</label>
-               <label xml:lang="gl-es">Axustes</label>
-               <label xml:lang="hi-in">सेटिंग्स</label>
-               <label xml:lang="hr-hr">Postavke</label>
-               <label xml:lang="hu-hu">Beállítások</label>
-               <label xml:lang="hy-am">Պարամետրեր</label>
-               <label xml:lang="is-is">Stillingar</label>
-               <label xml:lang="it-it">Impostazioni</label>
-               <label xml:lang="ja-jp">設定</label>
-               <label xml:lang="ka-ge">პარამეტრები</label>
-               <label xml:lang="kk-kz">Қондырғ-р</label>
-               <label xml:lang="ko-kr">설정</label>
-               <label xml:lang="lt-lt">Nustat.</label>
-               <label xml:lang="lv-lv">Iestatījumi</label>
-               <label xml:lang="mk-mk">Опции</label>
-               <label xml:lang="nb-no">Innstillinger</label>
-               <label xml:lang="nl-nl">Instellingen</label>
-               <label xml:lang="pl-pl">Ustawienia</label>
-               <label xml:lang="pt-br">Configurações</label>
-               <label xml:lang="pt-pt">Definições</label>
-               <label xml:lang="ro-ro">Setări</label>
-               <label xml:lang="ru-ru">Настройки</label>
-               <label xml:lang="sk-sk">Nastavenia</label>
-               <label xml:lang="sl-si">Nastavitve</label>
-               <label xml:lang="sr-rs">Podešavanja</label>
-               <label xml:lang="sv-se">Inställningar</label>
-               <label xml:lang="tr-tr">Ayarlar</label>
-               <label xml:lang="uk-ua">Установки</label>
-               <label xml:lang="uz-uz">Parametrlar</label>
-               <label xml:lang="zh-cn">设定</label>
-               <label xml:lang="zh-hk">設定</label>
-               <label xml:lang="zh-sg">设定</label>
-               <label xml:lang="zh-tw">設定</label>
-       </ui-application>
-       <ui-application appid="setting-network-efl" exec="@TZ_SYS_RO_UG@/bin/setting-network-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Network.png</icon>
-                       <label>Network</label>
-                       <label xml:lang="en-us">Network</label>
-                       <label xml:lang="ja-jp">ネットワーク</label>
-                       <label xml:lang="ko-kr">네트워크</label>
-                       <application-service>
-                               <operation name="http://samsung.com/appcontrol/operation/setting/mobile_network"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/setting/mobile_network"/>
-                       </application-service>
-       </ui-application>
-       <ui-application appid="setting-font-efl" exec="@TZ_SYS_RO_UG@/bin/setting-font-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Font.png</icon>
-                       <label>Font</label>
-                       <label xml:lang="en-us">Font</label>
-                       <label xml:lang="ja-jp">フォント</label>
-                       <label xml:lang="ko-kr">서체</label>
-                       <application-service>
-                               <operation name="http://samsung.com/appcontrol/operation/configure/font/type"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/configure/font/type"/>
-                       </application-service>
-
-                       <application-service>
-                               <operation name="http://samsung.com/appcontrol/operation/configure/font/size"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/configure/font/size"/>
-                       </application-service>
-       </ui-application>
-       <ui-application appid="setting-ledindicator-efl" exec="@TZ_SYS_RO_UG@/bin/setting-ledindicator-efl" type="capp" nodisplay="true" taskmanage="false">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_led_indi.png</icon>
-                        <label>LED indicator</label>
-                        <label xml:lang="en-us">LED indicator</label>
-                       <label xml:lang="ja-jp">LEDインジケーター</label>
-                       <label xml:lang="ko-kr">LED 상태 표시등</label>
-        </ui-application>
-       <ui-application appid="setting-accessory-efl" exec="@TZ_SYS_RO_UG@/bin/setting-accessory-efl" type="capp" nodisplay="true" taskmanage="false">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_accessories.png</icon>
-                        <label>Accessories</label>
-                        <label xml:lang="en-us">Accessories</label>
-                       <label xml:lang="ja-jp">アクセサリ</label>
-                       <label xml:lang="ko-kr">액세서리</label>
-        </ui-application>
-       <ui-application appid="setting-storage-efl" exec="@TZ_SYS_RO_UG@/bin/setting-storage-efl" type="capp" nodisplay="true" taskmanage="false">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_storage.png</icon>
-                        <label>Storage</label>
-                        <label xml:lang="en-us">Storage</label>
-                       <label xml:lang="ja-jp">ストレージ</label>
-                       <label xml:lang="ko-kr">저장소</label>
-        </ui-application>
-       <ui-application appid="setting-about-efl" exec="@TZ_SYS_RO_UG@/bin/setting-about-efl" type="capp" nodisplay="true" taskmanage="false">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_About_phone.png</icon>
-                        <label>About device</label>
-                        <label xml:lang="en-us">About device</label>
-                       <label xml:lang="ja-jp">端末情報</label>
-                       <label xml:lang="ko-kr">디바이스 정보</label>
-        </ui-application>
-       <ui-application appid="setting-security-efl" exec="@TZ_SYS_RO_UG@/bin/setting-security-efl" type="capp" nodisplay="true" taskmanage="false">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_security.png</icon>
-                       <label>Security</label>
-                        <label xml:lang="en-us">Security</label>
-                       <label xml:lang="ja-jp">セキュリティ</label>
-                       <label xml:lang="ko-kr">보안</label>
-        </ui-application>
-       <ui-application appid="setting-time-efl" exec="@TZ_SYS_RO_UG@/bin/setting-time-efl" type="capp" nodisplay="true" taskmanage="true">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Date_and_time.png</icon>
-                        <label>Date and time</label>
-                        <label xml:lang="en-us">Date and time</label>
-                       <label xml:lang="ja-jp">日付と時刻</label>
-                       <label xml:lang="ko-kr">날짜 및 시간</label>
-        </ui-application>
-       <ui-application appid="setting-profile-efl" exec="@TZ_SYS_RO_UG@/bin/setting-profile-efl" hw-acceleration="use-GL" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Sound.png</icon>
-                       <label>Sound</label>
-                       <label xml:lang="en-us">Sound</label>
-                       <label xml:lang="ja-jp">サウンド</label>
-                       <label xml:lang="ko-kr">소리</label>
-       </ui-application>
-       <ui-application appid="setting-datausage-efl" exec="@TZ_SYS_RO_UG@/bin/setting-datausage-efl" type="capp" nodisplay="true" taskmanage="true">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/org.tizen.traf-control.png</icon>
-                       <label>Data usage</label>
-                       <label xml:lang="en-us">Data usage</label>
-                       <label xml:lang="ja-jp">データ使用量</label>
-                       <label xml:lang="ko-kr">데이터 사용량</label>
-       </ui-application>
-       <ui-application appid="setting-mmc-encryption-efl" exec="@TZ_SYS_RO_UG@/bin/setting-mmc-encryption-efl" type="capp" nodisplay="true" taskmanage="true">
-                       <icon>ug-setting-mmc-encryption-efl.png</icon>
-                       <label>MMC encryption</label>
-                       <label xml:lang="en-us">MMC encryption</label>
-       </ui-application>
-       <ui-application appid="setting-encrypting-efl" exec="@TZ_SYS_RO_UG@/bin/setting-encrypting-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>ug-setting-encrypting-efl.png</icon>
-                       <label>Encrypting</label>
-                       <label xml:lang="en-us">Encrypting</label>
-       </ui-application>
-       <ui-application appid="setting-plugin-efl" exec="@TZ_SYS_RO_UG@/bin/setting-plugin-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>ug-setting-plugin-efl.png</icon>
-                       <label>Setting Plugin </label>
-                       <label xml:lang="en-us">Setting Plugin view </label>
-                       <application-service>
-                               <operation name="http://samsung.com/appcontrol/operation/app_setting/show"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/app_setting/show"/>
-                       </application-service>
-       </ui-application>
-       <ui-application appid="setting-accessibility-efl" exec="@TZ_SYS_RO_UG@/bin/setting-accessibility-efl" type="capp" nodisplay="true" taskmanage="false">
-                        <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/Accessibility.png</icon>
-                        <label>Accessibility</label>
-                        <label xml:lang="en-us">Accessibility</label>
-                       <label xml:lang="ja-jp">ユーザー補助</label>
-                       <label xml:lang="ko-kr">접근성</label>
-        </ui-application>
-        <ui-application appid="org.tizen.setting-blockingmode-alarm" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting-blockingmode-alarm" type="capp" nodisplay="true" taskmanage="false">
-                       <label>Setting-blockingmode-alarm</label>
-       </ui-application>
-       <ui-application appid="setting-privacy-efl" exec="@TZ_SYS_RO_UG@/bin/setting-privacy-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_privacy.png</icon>
-                       <label>Privacy </label>
-                       <label xml:lang="en-us">Privacy</label>
-                       <label xml:lang="ja-jp">プライバシー</label>
-                       <label xml:lang="ko-kr">개인 정보 보호</label>
-                       <application-service>
-                               <operation name="http://samsung.com/appcontrol/operation/configure/privacy/service"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/configure/privacy/service"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/configure/privacy"/>
-                       </application-service>
-       </ui-application>
-       <ui-application appid="setting-motion-efl" exec="@TZ_SYS_RO_UG@/bin/setting-motion-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Motion.png</icon>
-                       <label>Motion</label>
-                       <label xml:lang="en-us">Motion</label>
-       </ui-application>
-       <ui-application appid="setting-powersaving-efl" exec="@TZ_SYS_RO_UG@/bin/setting-powersaving-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Power_saving_mode.png</icon>
-                       <label>Power saving mode</label>
-                       <label xml:lang="en-us">Power saving mode</label>
-                       <label xml:lang="ja-jp">省電力モード</label>
-                       <label xml:lang="ko-kr">절전 모드</label>
-       </ui-application>
-       <ui-application appid="setting-blockingmode-efl" exec="@TZ_SYS_RO_UG@/bin/setting-blockingmode-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_106_block.png</icon>
-                       <label>Blocking mode</label>
-                       <label xml:lang="en-us">Blocking mode</label>
-                       <label xml:lang="ja-jp">ブロックモード</label>
-                       <label xml:lang="ko-kr">차단 모드</label>
-       </ui-application>
-       <ui-application appid="setting-display-efl" exec="@TZ_SYS_RO_UG@/bin/setting-display-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Display.png</icon>
-                       <label>Display</label>
-                       <label xml:lang="en-us">Display</label>
-       </ui-application>
-       <ui-application appid="setting-drivingmode-efl" exec="@TZ_SYS_RO_UG@/bin/setting-drivingmode-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Driving_mode.png</icon>
-                       <label>Driving mode</label>
-                       <label xml:lang="en-us">Driving mode</label>
-                       <label xml:lang="ja-jp">クルマモード</label>
-                       <label xml:lang="ko-kr">운전 모드</label>
-       </ui-application>
-       <ui-application appid="setting-personalpage-efl" exec="@TZ_SYS_RO_UG@/bin/setting-personalpage-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_personal_mode.png</icon>
-                        <label>Personal mode</label>
-                        <label xml:lang="en-us">Personal mode</label>
-                        <label xml:lang="ja-jp">パーソナルモード</label>
-                        <label xml:lang="ko-kr">개인 모드</label>
-        </ui-application>
-       <ui-application appid="setting-emergency-efl" exec="@TZ_SYS_RO_UG@/bin/setting-emergency-efl" type="capp" nodisplay="true" taskmanage="false">
-                               <icon>ug-setting-emergency-efl.png</icon>
-                               <label>Emergency Setting</label>
-                               <label xml:lang="en-us">Emergency Setting</label>
-       </ui-application>
-       <ui-application appid="setting-flightmode-efl" exec="@TZ_SYS_RO_UG@/bin/setting-flightmode-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>ug-setting-flightmode-efl.png</icon>
-                       <label>Flight mode</label>
-                       <label xml:lang="en-us">Flgiht mode</label>
-       </ui-application>
-       <ui-application appid="setting-netrestrictionmode-efl" exec="@TZ_SYS_RO_UG@/bin/setting-netrestrictionmode-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>ug-setting-netrestrictionmode-efl.png</icon>
-                       <label>Network restriction mode</label>
-                       <label xml:lang="en-us">Network restriction mode</label>
-       </ui-application>
-       <ui-application appid="setting-shortcut-efl" exec="@TZ_SYS_RO_UG@/bin/setting-shortcut-efl" type="capp" nodisplay="true" taskmanage="false">
-                       <icon>org.tizen.setting.png</icon>
-                       <label>Settings shortcut</label>
-                       <label xml:lang="en-us">Settings shortcut</label>
-       </ui-application>
-       <ui-application appid="org.tizen.setting.display" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_display_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Display.png</icon>
-                <label>Display</label>
-                <label xml:lang="en-us">Display</label>
-               <label xml:lang="ja-jp">ディスプレイ</label>
-               <label xml:lang="ko-kr">디스플레이</label>
-        </ui-application>
-       <ui-application appid="org.tizen.setting.wallpaper" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_wallpaper_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Wallpaper.png</icon>
-                <label>Wallpaper</label>
-                <label xml:lang="en-us">Wallpaper</label>
-               <label xml:lang="ja-jp">壁紙</label>
-               <label xml:lang="ko-kr">월페이퍼</label>
-        </ui-application>
-       <ui-application appid="org.tizen.setting.motion" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_motion_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Motion.png</icon>
-                <label>Motion</label>
-                <label xml:lang="en-us">Motion</label>
-               <label xml:lang="ja-jp">モーション</label>
-               <label xml:lang="ko-kr">모션</label>
-        </ui-application>
-       <ui-application appid="org.tizen.setting.smartscreen" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_smartscreen_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/smartscreen.png</icon>
-                <label>Smart screen</label>
-                <label xml:lang="en-us">Smart screen</label>
-               <label xml:lang="ja-jp">スマートスクリーン</label>
-               <label xml:lang="ko-kr">스마트 화면</label>
-        </ui-application>
-       <ui-application appid="org.tizen.setting.language" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_language_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/settings_language_region.png</icon>
-                <label>Language and keyboard</label>
-                <label xml:lang="en-us">Language and keyboard</label>
-               <label xml:lang="ja-jp">言語とキーボード</label>
-               <label xml:lang="ko-kr">언어 및 키보드</label>
-        </ui-application>
-       <ui-application appid="org.tizen.setting.manageapplications" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_manageapplications_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_Manage_Application.png</icon>
-                <label>Manage applications</label>
-                <label xml:lang="en-us">Manage applications</label>
-               <label xml:lang="ja-jp">アプリケーション管理</label>
-               <label xml:lang="ko-kr">애플리케이션 관리</label>
-        </ui-application>
-       <ui-application appid="org.tizen.setting.developeroptions" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting_developeroptions_menu" type="capp" nodisplay="true" taskmanage="false">
-                <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/A01-1_icon_USB_Connection.png</icon>
-                <label>Developer options</label>
-                <label xml:lang="en-us">Developer options</label>
-               <label xml:lang="ja-jp">開発者向けオプション</label>
-               <label xml:lang="ko-kr">개발자 옵션</label>
-        </ui-application>
-       <shortcut-list>
-               <shortcut appid="setting-shortcut-efl" extra_key="type" extra_data="setting">
-                       <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/livebox/settings_shortcut_1x1.png</icon>
-                       <label>Settings - Shortcut</label>
-                       <label xml:lang="ar-ae">ﺎﻠﻀﺒﻃ - اختصار</label>
-                       <label xml:lang="az-az">Parametrlər - Qısa yol</label>
-                       <label xml:lang="bg-bg">Настройки - Бърз клавиш</label>
-                       <label xml:lang="ca-es">Ajustaments - Accés directe</label>
-                       <label xml:lang="cs-cz">Nastavení - Zkratka</label>
-                       <label xml:lang="da-dk">Indstillinger - Genvej</label>
-                       <label xml:lang="de-de">Einstellungen - Shortcut</label>
-                       <label xml:lang="el-gr">Ρυθμίσεις - Συντόμευση</label>
-                       <label xml:lang="en-gb">Settings - Shortcut</label>
-                       <label xml:lang="en-ph">Settings - Shortcut</label>
-                       <label xml:lang="en-us">Settings - Shortcut</label>
-                       <label xml:lang="es-es">Ajustes - Acceso directo</label>
-                       <label xml:lang="es-mx">Configuración - Atajos</label>
-                       <label xml:lang="et-ee">Seaded - Otsetee</label>
-                       <label xml:lang="eu-es">Ezarpenak - Lasterbidea</label>
-                       <label xml:lang="fi-fi">Asetukset - Pikakuvake</label>
-                       <label xml:lang="fr-ca">Paramètres - Raccourci</label>
-                       <label xml:lang="fr-fr">Paramètres - Raccourci</label>
-                       <label xml:lang="ga-ie">Socruithe - Aicearra</label>
-                       <label xml:lang="gl-es">Axustes - Atallo</label>
-                       <label xml:lang="hi-in">सेटिंग्स - शॉर्टकट</label>
-                       <label xml:lang="hr-hr">Postavke - Prečac</label>
-                       <label xml:lang="hu-hu">Beállítások - Rövidítés</label>
-                       <label xml:lang="hy-am">Պարամետրեր - Արագ անցում</label>
-                       <label xml:lang="is-is">Stillingar - Flýtileið</label>
-                       <label xml:lang="it-it">Impostazioni - Scelta rapida</label>
-                       <label xml:lang="ja-jp">設定 - ショートカット</label>
-                       <label xml:lang="ka-ge">პარამეტრები - სწრაფი ღილაკი</label>
-                       <label xml:lang="kk-kz">Қондырғ-р - Тіркесім</label>
-                       <label xml:lang="ko-kr">설정 - 단축어</label>
-                       <label xml:lang="lt-lt">Nustat. - Trumpinys</label>
-                       <label xml:lang="lv-lv">Iestatījumi - Īsceļš</label>
-                       <label xml:lang="mk-mk">Опции - Кратенка</label>
-                       <label xml:lang="nb-no">Innstillinger - Snarvei</label>
-                       <label xml:lang="nl-nl">Instellingen - Sneltoets</label>
-                       <label xml:lang="pl-pl">Ustawienia - skrót</label>
-                       <label xml:lang="pt-br">Configurações - Atalho</label>
-                       <label xml:lang="pt-pt">Definições - Atalho</label>
-                       <label xml:lang="ro-ro">Setări - Comandă rapidă</label>
-                       <label xml:lang="ru-ru">Настройки - Горячая клавиша</label>
-                       <label xml:lang="sk-sk">Nastavenia - Odkaz</label>
-                       <label xml:lang="sl-si">Nastavitve - Bližnjica</label>
-                       <label xml:lang="sr-rs">Podešavanja - Prečica</label>
-                       <label xml:lang="sv-se">Inställningar - Genväg</label>
-                       <label xml:lang="tr-tr">Ayarlar - Kısayol</label>
-                       <label xml:lang="uk-ua">Установки - Швидкий доступ</label>
-                       <label xml:lang="uz-uz">Parametrlar - Yorliq</label>
-                       <label xml:lang="zh-cn">设定 - 快捷键</label>
-                       <label xml:lang="zh-hk">設定 - 捷徑</label>
-                       <label xml:lang="zh-sg">设定 - 快捷键</label>
-                       <label xml:lang="zh-tw">設定 - 捷徑</label>
-               </shortcut>
-       </shortcut-list>
-       <livebox appid="org.tizen.setting.livebox" script="edje" pinup="FALSE" primary="true" secured="FALSE" auto_launch="FALSE" network="FALSE" abi="C" timeout="20" period="0" libexec="@TZ_SYS_RO_APP@/org.tizen.setting/libexec/liblive-org.tizen.setting.so">
-               <label>Settings</label>
-               <label xml:lang="ar-ae">ﺎﻠﻀﺒﻃ</label>
-                <label xml:lang="az-az">Parametrlər</label>
-                <label xml:lang="bg-bg">Настройки</label>
-                <label xml:lang="ca-es">Ajustaments</label>
-                <label xml:lang="cs-cz">Nastavení</label>
-                <label xml:lang="da-dk">Indstillinger</label>
-                <label xml:lang="de-de">Einstellungen</label>
-                <label xml:lang="el-gr">Ρυθμίσεις</label>
-                <label xml:lang="en-gb">Settings</label>
-                <label xml:lang="en-ph">Settings</label>
-                <label xml:lang="en-us">Settings</label>
-                <label xml:lang="es-es">Ajustes</label>
-                <label xml:lang="es-mx">Configuración</label>
-                <label xml:lang="et-ee">Seaded</label>
-                <label xml:lang="eu-es">Ezarpenak</label>
-                <label xml:lang="fi-fi">Asetukset</label>
-                <label xml:lang="fr-ca">Paramètres</label>
-                <label xml:lang="fr-fr">Paramètres</label>
-                <label xml:lang="ga-ie">Socruithe</label>
-                <label xml:lang="gl-es">Axustes</label>
-                <label xml:lang="hi-in">सेटिंग्स</label>
-                <label xml:lang="hr-hr">Postavke</label>
-                <label xml:lang="hu-hu">Beállítások</label>
-                <label xml:lang="hy-am">Պարամետրեր</label>
-                <label xml:lang="is-is">Stillingar</label>
-                <label xml:lang="it-it">Impostazioni</label>
-                <label xml:lang="ja-jp">設定</label>
-                <label xml:lang="ka-ge">პარამეტრები</label>
-                <label xml:lang="kk-kz">Қондырғ-р</label>
-                <label xml:lang="ko-kr">설정</label>
-                <label xml:lang="lt-lt">Nustat.</label>
-                <label xml:lang="lv-lv">Iestatījumi</label>
-                <label xml:lang="mk-mk">Опции</label>
-                <label xml:lang="nb-no">Innstillinger</label>
-                <label xml:lang="nl-nl">Instellingen</label>
-                <label xml:lang="pl-pl">Ustawienia</label>
-                <label xml:lang="pt-br">Configurações</label>
-                <label xml:lang="pt-pt">Definições</label>
-                <label xml:lang="ro-ro">Setări</label>
-                <label xml:lang="ru-ru">Настройки</label>
-                <label xml:lang="sk-sk">Nastavenia</label>
-                <label xml:lang="sl-si">Nastavitve</label>
-                <label xml:lang="sr-rs">Podešavanja</label>
-                <label xml:lang="sv-se">Inställningar</label>
-                <label xml:lang="tr-tr">Ayarlar</label>
-                <label xml:lang="uk-ua">Установки</label>
-                <label xml:lang="uz-uz">Parametrlar</label>
-                <label xml:lang="zh-cn">设定</label>
-                <label xml:lang="zh-hk">設定</label>
-                <label xml:lang="zh-sg">设定</label>
-                <label xml:lang="zh-tw">設定</label>
-               <icon>@TZ_SYS_RO_ICONS@/default/small/org.tizen.setting.png</icon>
-               <box type="IMAGE">
-                       <size preview="@TZ_SYS_RO_APP@/org.tizen.setting/shared/res/icons/livebox/settings_shortcut_1x1.png" need_frame="true">1x1</size>
-                       <size preview="@TZ_SYS_RO_APP@/org.tizen.setting/shared/res/icons/livebox/settings_shortcut_2x2.png" need_frame="true">2x2</size>
-               </box>
-       </livebox>
-       <livebox appid="org.tizen.setting.shortcut.livebox" script="edje" pinup="FALSE" primary="FALSE" nodisplay="true" secured="FALSE" auto_launch="FALSE" network="FALSE" abi="C" timeout="20" period="0" libexec="@TZ_SYS_RO_APP@/org.tizen.setting/libexec/liblive-org.tizen.shortcut.so">
-               <label>Shortcut</label>
-               <icon>@TZ_SYS_RO_ICONS@/default/small/org.tizen.setting.png</icon>
-               <box type="IMAGE">
-                       <size need_frame="true">1x1</size>
-               </box>
-       </livebox>
-       <livebox appid="org.tizen.setting.accessibility.livebox" script="edje" pinup="FALSE" primary="FALSE" nodisplay="FALSE" secured="FALSE" auto_launch="FALSE" network="FALSE" abi="C" timeout="20" period="0" libexec="@TZ_SYS_RO_APP@/org.tizen.setting/libexec/liblive-org.tizen.accessibility.so">
-               <label>Accessibility</label>
-               <label xml:lang="ar-ae">ﺈﻤﻛﺎﻨﻳﺓ ﺎﻟﻮﺻﻮﻟ</label>
-                <label xml:lang="az-az">Xüsusi imkanlar</label>
-                <label xml:lang="bg-bg">Достъпност</label>
-                <label xml:lang="ca-es">Accessibilitat</label>
-                <label xml:lang="cs-cz">Usnadnění</label>
-                <label xml:lang="da-dk">Tilgængelighed</label>
-                <label xml:lang="de-de">Eingabehilfe</label>
-                <label xml:lang="el-gr">Προσβασιμότητα</label>
-                <label xml:lang="en-gb">Accessibility</label>
-                <label xml:lang="en-ph">Accessibility</label>
-                <label xml:lang="en-us">Accessibility</label>
-                <label xml:lang="es-es">Accesibilidad</label>
-                <label xml:lang="es-mx">Accesibilidad</label>
-                <label xml:lang="et-ee">Juurdepääs</label>
-                <label xml:lang="eu-es">Erabilgarritasuna</label>
-                <label xml:lang="fi-fi">Helppokäyttöisyys</label>
-                <label xml:lang="fr-ca">Accessibilité</label>
-                <label xml:lang="fr-fr">Accessibilité</label>
-                <label xml:lang="ga-ie">Inrochtaineacht</label>
-                <label xml:lang="gl-es">Accesibilidade</label>
-                <label xml:lang="hi-in">पहुँच</label>
-                <label xml:lang="hr-hr">Pristupačnost</label>
-                <label xml:lang="hu-hu">Kisegítő lehetőségek</label>
-                <label xml:lang="hy-am">Մատչելիություն</label>
-                <label xml:lang="is-is">Aðgengi</label>
-                <label xml:lang="it-it">Accessibilita</label>
-                <label xml:lang="ja-jp">ユーザー補助</label>
-                <label xml:lang="ka-ge">წვდომა</label>
-                <label xml:lang="kk-kz">Қол жетімділік</label>
-                <label xml:lang="ko-kr">접근성</label>
-                <label xml:lang="lt-lt">Pasiekiamumas</label>
-                <label xml:lang="lv-lv">Pieejamība</label>
-                <label xml:lang="mk-mk">Пристапност</label>
-               <label xml:lang="nb-no">Tilgjengelighet</label>
-                <label xml:lang="nl-nl">Toegankelijkheid</label>
-                <label xml:lang="pl-pl">Dostępność</label>
-                <label xml:lang="pt-br">Acessibilidade</label>
-                <label xml:lang="pt-pt">Acessibilidade</label>
-                <label xml:lang="ro-ro">Accesibilitate</label>
-                <label xml:lang="ru-ru">Специальные возможности</label>
-                <label xml:lang="sk-sk">Zjednodušenie ovládania</label>
-                <label xml:lang="sl-si">Dostopnost</label>
-                <label xml:lang="sr-rs">Pristupačnost</label>
-                <label xml:lang="sv-se">Tillgänglighet</label>
-                <label xml:lang="tr-tr">Erişilebilirlik</label>
-                <label xml:lang="uk-ua">Доступність</label>
-                <label xml:lang="uz-uz">Foydalanish imkoniyati</label>
-                <label xml:lang="zh-cn">辅助功能</label>
-                <label xml:lang="zh-hk">協助工具</label>
-                <label xml:lang="zh-sg">辅助工具</label>
-                <label xml:lang="zh-tw">協助工具</label>
-               <icon>@TZ_SYS_RO_APP@/org.tizen.setting/res/icons/Accessibility.png</icon>
-               <box type="IMAGE">
-                       <size preview="@TZ_SYS_RO_APP@/org.tizen.setting/shared/res/icons/livebox/accessibility_1x1.png" need_frame="true">1x1</size>
-                       <size preview="@TZ_SYS_RO_APP@/org.tizen.setting/shared/res/icons/livebox/accessibility_2x2.png" need_frame="true">2x2</size>
-               </box>
-               <ui-appid>setting-accessibility-efl</ui-appid>
-       </livebox>
-</manifest>
-
index d319be60410a4d67089ce9673d7ca205db4ae846..09313c309f9e68e9d5648461a5f62341df77d956 100755 (executable)
@@ -95,15 +95,11 @@ BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(callmgr_client)
 BuildRequires:  pkgconfig(privilege-info)
-#BuildRequires:        pkgconfig(capi-location-manager)
 BuildRequires:  libcap-devel
 BuildRequires:  cmake
 BuildRequires:  edje-tools
 BuildRequires:  gettext-tools
-#BuildRequires:  security-privilege-manager-devel
 BuildRequires:  hash-signer
-#BuildRequires:  system-resource-devel-meta
-#Requires: libeas-common
 Requires: security-privilege-manager
 Requires(post): attr
 
@@ -111,21 +107,10 @@ Requires(post): attr
 Setting application
  BEAT UI, Setting application.
 
-%package ref
-Summary: replacement for org.tizen.setting.xml
-Group: Application/Core Applications
-Requires(post): org.tizen.setting
-
-%description ref
-replace for org.tizen.setting.xml
- need to check
-
 %package devel
 Summary: A setting common library (Development)
 Group: Application Framework/Settings
 
-#Requires: %{name} = %{version}-%{release}
-#Requires: pkgconfig(setting-common-internal)
 %description devel
 
 %prep
@@ -137,13 +122,10 @@ mkdir -p %{buildroot}%{TZ_SYS_SHARE}/settings
 %define PREFIX    %{_prefix}/apps/org.tizen.setting
 %define OPTPREFIX %{TZ_SYS_RW_APP}/org.tizen.setting
 %define RESDIR    %{PREFIX}/res
-#%define OPTSHAREREFIX  %{TZ_SYS_RO_APP}/org.tizen.setting/shared/res/settings
-
 %define CONFIGDIR    %{PREFIX}/def_config
 %define IMAGEDIR    %{RESDIR}/images
 CFLAGS+=" -fPIC -fvisibility=hidden ";export CFLAGS
 CXXFLAGS+=" -fPIC -fvisibility=hidden ";export CFLAGS
-
 LDFLAGS+="-Wl,--rpath=%{PREFIX}/lib -Wl,--hash-style=both -Wl,--as-needed";export LDFLAGS
 
 %if 0%{?sec_build_binary_debug_enable}
@@ -216,54 +198,20 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/default.target.wants
 %clean
 
 %post
-#if [ ! -d %{OPTPREFIX} ]
-#then
-#      echo "CREATE %{OPTPREFIX} DIR"
-#    mkdir -p %{OPTPREFIX}
-#      echo "CREATE %{OPTPREFIX}/data DIR"
-#    mkdir -p %{OPTPREFIX}/data
-#fi
-#chmod a+w %{OPTPREFIX}/data
-
-
-
-update-mime-database %{_prefix}/share/mime
-
 # Set vconf values with -g/-u options
 GOPTION="-g 6514"
 
 #resetSound
-#DEFAULT_CALL_TONE="%{OPTSHAREREFIX}/Ringtones/ringtone_sdk.mp3"
-#DEFAULT_NOTI_TONE="%{OPTSHAREREFIX}/Alerts/General notification_sdk.wav"
-
-       DEFAULT_CALL_TONE="%{TZ_SYS_SHARE}/settings/Ringtones/ringtone_sdk.mp3"
-       DEFAULT_NOTI_TONE="%{TZ_SYS_SHARE}/Alerts/General notification_sdk.wav"
-
-
+DEFAULT_CALL_TONE="%{TZ_SYS_SHARE}/settings/Ringtones/ringtone_sdk.mp3"
+DEFAULT_NOTI_TONE="%{TZ_SYS_SHARE}/Alerts/General notification_sdk.wav"
 
 #resetImages
-#      DEFAULT_HOME="%{OPTSHAREREFIX}/Wallpapers/Home_default.jpg"
-#      DEFAULT_LOCK="%{OPTSHAREREFIX}/Wallpapers/Default.jpg"
-       DEFAULT_HOME="%{TZ_SYS_SHARE}/Wallpapers/Home_default.jpg"
-       DEFAULT_LOCK="%{TZ_SYS_SHARE}/Wallpapers/Default.jpg"
-
-       #rm -f %{_sysconfdir}/localtime
-       #ln -s %{_datadir}/zoneinfo/Asia/Seoul %{_sysconfdir}/localtime
-
-#if [ -e /etc/localtime ]
-#then
-#      rm -f /etc/localtime
-#      ln -s /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-#fi
+DEFAULT_HOME="%{TZ_SYS_SHARE}/Wallpapers/Home_default.jpg"
+DEFAULT_LOCK="%{TZ_SYS_SHARE}/Wallpapers/Default.jpg"
 
 #resetSecurity
-       rm -rf {_prefix}/data/setting/set_info
+rm -rf {_prefix}/data/setting/set_info
 
-# for support shared menu icons
-#ln -s %{RESDIR}/icons %{PREFIX}/shared/res/icons
-
-#APP_PATH_INFO=`%{PREFIX}/bin/setting_conf_util get_data_path`
-#echo "-------------------------------------------------------------> "$APP_PATH_INFO
 sync
 
 mkdir -p %{_prefix}/ug/bin/
@@ -273,10 +221,6 @@ mkdir -p %{PREFIX}/shared/res
 mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/res/edje
 mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/
 
-%post ref
-rm -rf %{_datadir}/packages/org.tizen.setting.xml
-mv %{_datadir}/packages/org.tizen.setting.xml.ref %{_datadir}/packages/org.tizen.setting.xml
-
 %posttrans
 
 %files -n org.tizen.setting
@@ -285,16 +229,11 @@ mv %{_datadir}/packages/org.tizen.setting.xml.ref %{_datadir}/packages/org.tizen
 %{PREFIX}/author-signature.xml
 %{PREFIX}/signature1.xml
 
-# Firewall -------------------------------------------------------
-%{_sysconfdir}/opt/upgrade/210.org.tizen.setting.patch.sh
-
 %defattr(-,root,root,-)
-#%{_prefix}/apps/org.tizen.mode-syspopup/res/locale/*
 
 %{PREFIX}/bin/setting
 %{CONFIGDIR}/*
 %{PREFIX}/bin/setting_conf_util
-#%{PREFIX}/bin/setting_turnoff_light
 %{PREFIX}/bin/setting_volume_popup
 
 %attr(0755,root,root) %{PREFIX}/bin/setting_help_ringtone
@@ -303,19 +242,13 @@ mv %{_datadir}/packages/org.tizen.setting.xml.ref %{_datadir}/packages/org.tizen
 %{_datadir}/packages/org.tizen.setting.xml
 %{_datadir}/icons/default/small/org.tizen.setting.png
 
-#%{_datadir}/settings/*
-
 %{PREFIX}/res/*
-%{_datadir}/mime/packages/*
 
 %{TZ_SYS_SHARE}/settings/*
-#%{OPTSHAREREFIX}/*
 
 %{PREFIX}/shared/res/*
 %attr(-,app,app) %dir %{PREFIX}/shared
 
-#[  124s] error: File not found by glob: /usr/src/packages/BUILDROOT/org.tizen.setting-0.2.0-99.aarch64/usr/share/settings/*
-
 # new
 %{PREFIX}/lib/ug/*
 
@@ -335,7 +268,3 @@ mv %{_datadir}/packages/org.tizen.setting.xml.ref %{_datadir}/packages/org.tizen
 %{_includedir}/setting-common-general-func.h
 %{_includedir}/setting-common-resource.h
 %{_includedir}/setting-common-search.h
-
-%files ref
-%{_datadir}/mime/packages/mime.setting.xml
-%{_datadir}/packages/org.tizen.setting.xml.ref
diff --git a/resource/icons/00_volume_icon.png b/resource/icons/00_volume_icon.png
deleted file mode 100644 (file)
index 7cf1a0d..0000000
Binary files a/resource/icons/00_volume_icon.png and /dev/null differ
diff --git a/resource/icons/A01-1_icon_color_Audio.png b/resource/icons/A01-1_icon_color_Audio.png
deleted file mode 100755 (executable)
index 77c2192..0000000
Binary files a/resource/icons/A01-1_icon_color_Audio.png and /dev/null differ
diff --git a/resource/icons/A01-1_icon_color_applications.png b/resource/icons/A01-1_icon_color_applications.png
deleted file mode 100755 (executable)
index 0d07ec6..0000000
Binary files a/resource/icons/A01-1_icon_color_applications.png and /dev/null differ
diff --git a/resource/icons/A01-1_icon_color_available.png b/resource/icons/A01-1_icon_color_available.png
deleted file mode 100755 (executable)
index 10e43a7..0000000
Binary files a/resource/icons/A01-1_icon_color_available.png and /dev/null differ
diff --git a/resource/icons/A01-1_icon_color_miscellaneous_files.png b/resource/icons/A01-1_icon_color_miscellaneous_files.png
deleted file mode 100755 (executable)
index 3f5db7d..0000000
Binary files a/resource/icons/A01-1_icon_color_miscellaneous_files.png and /dev/null differ
diff --git a/resource/icons/A01-1_icon_color_pictures.png b/resource/icons/A01-1_icon_color_pictures.png
deleted file mode 100755 (executable)
index 0ccf640..0000000
Binary files a/resource/icons/A01-1_icon_color_pictures.png and /dev/null differ
diff --git a/resource/icons/A01-1_icon_color_system.png b/resource/icons/A01-1_icon_color_system.png
deleted file mode 100644 (file)
index dba07b0..0000000
Binary files a/resource/icons/A01-1_icon_color_system.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_notification.png b/resource/icons/B04_slider_icon_notification.png
deleted file mode 100644 (file)
index 36b7800..0000000
Binary files a/resource/icons/B04_slider_icon_notification.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_notification_mute.png b/resource/icons/B04_slider_icon_notification_mute.png
deleted file mode 100644 (file)
index 5f34ef0..0000000
Binary files a/resource/icons/B04_slider_icon_notification_mute.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_notification_vibrate.png b/resource/icons/B04_slider_icon_notification_vibrate.png
deleted file mode 100644 (file)
index 8a7e131..0000000
Binary files a/resource/icons/B04_slider_icon_notification_vibrate.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_ring.png b/resource/icons/B04_slider_icon_ring.png
deleted file mode 100644 (file)
index 4a238a0..0000000
Binary files a/resource/icons/B04_slider_icon_ring.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_system.png b/resource/icons/B04_slider_icon_system.png
deleted file mode 100644 (file)
index f28a5c5..0000000
Binary files a/resource/icons/B04_slider_icon_system.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_system_mute.png b/resource/icons/B04_slider_icon_system_mute.png
deleted file mode 100644 (file)
index 06eef2d..0000000
Binary files a/resource/icons/B04_slider_icon_system_mute.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_system_vibrate.png b/resource/icons/B04_slider_icon_system_vibrate.png
deleted file mode 100644 (file)
index de00f34..0000000
Binary files a/resource/icons/B04_slider_icon_system_vibrate.png and /dev/null differ
diff --git a/resource/icons/B04_slider_icon_vibrate.png b/resource/icons/B04_slider_icon_vibrate.png
deleted file mode 100644 (file)
index a9a3275..0000000
Binary files a/resource/icons/B04_slider_icon_vibrate.png and /dev/null differ
diff --git a/resource/icons/B04_volume_icon_Vibrat.png b/resource/icons/B04_volume_icon_Vibrat.png
deleted file mode 100644 (file)
index b25a2a9..0000000
Binary files a/resource/icons/B04_volume_icon_Vibrat.png and /dev/null differ
diff --git a/resource/icons/B04_volume_icon_mute.png b/resource/icons/B04_volume_icon_mute.png
deleted file mode 100644 (file)
index e2a1ec1..0000000
Binary files a/resource/icons/B04_volume_icon_mute.png and /dev/null differ
diff --git a/resource/icons/color-theme/colorpicker/A01-1_color_picker_palette_focus.#.png b/resource/icons/color-theme/colorpicker/A01-1_color_picker_palette_focus.#.png
deleted file mode 100644 (file)
index 6e9f003..0000000
Binary files a/resource/icons/color-theme/colorpicker/A01-1_color_picker_palette_focus.#.png and /dev/null differ
diff --git a/resource/icons/gallery-viewer.png b/resource/icons/gallery-viewer.png
deleted file mode 100644 (file)
index 37aecdc..0000000
Binary files a/resource/icons/gallery-viewer.png and /dev/null differ
diff --git a/resource/icons/motions/direct call/B15_direct_call_01.png b/resource/icons/motions/direct call/B15_direct_call_01.png
deleted file mode 100755 (executable)
index 35a9d57..0000000
Binary files a/resource/icons/motions/direct call/B15_direct_call_01.png and /dev/null differ
diff --git a/resource/icons/motions/direct call/B15_direct_call_02.png b/resource/icons/motions/direct call/B15_direct_call_02.png
deleted file mode 100755 (executable)
index fb06c1c..0000000
Binary files a/resource/icons/motions/direct call/B15_direct_call_02.png and /dev/null differ
diff --git a/resource/icons/motions/direct call/B15_direct_call_03.png b/resource/icons/motions/direct call/B15_direct_call_03.png
deleted file mode 100755 (executable)
index 409d82b..0000000
Binary files a/resource/icons/motions/direct call/B15_direct_call_03.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_bg.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_bg.png
deleted file mode 100755 (executable)
index d1c2a82..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_bg.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_01.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_01.png
deleted file mode 100755 (executable)
index 6f308d9..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_01.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_02.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_02.png
deleted file mode 100755 (executable)
index 6d9fe2a..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_02.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_03.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_03.png
deleted file mode 100755 (executable)
index 20adbb0..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_03.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_04.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_04.png
deleted file mode 100755 (executable)
index b81c071..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_04.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_05.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_05.png
deleted file mode 100755 (executable)
index 364258e..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_05.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_06.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_06.png
deleted file mode 100755 (executable)
index d413e33..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_06.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_07.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_07.png
deleted file mode 100755 (executable)
index 99a29ba..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_07.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_08.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_08.png
deleted file mode 100755 (executable)
index 1df5748..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_08.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_09.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_09.png
deleted file mode 100755 (executable)
index 132bb88..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_09.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_10.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_10.png
deleted file mode 100755 (executable)
index 053a98e..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_10.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_11.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_11.png
deleted file mode 100755 (executable)
index 9c83eb2..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_11.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_12.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_12.png
deleted file mode 100755 (executable)
index 0ca4c5a..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_12.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_13.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_13.png
deleted file mode 100755 (executable)
index ec5cbcd..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_13.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_14.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_14.png
deleted file mode 100755 (executable)
index ee592d0..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_14.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_15.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_15.png
deleted file mode 100755 (executable)
index 46737b9..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_15.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_16.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_16.png
deleted file mode 100755 (executable)
index 2db4cd9..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_16.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_17.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_17.png
deleted file mode 100755 (executable)
index bb92a04..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_17.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_18.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_18.png
deleted file mode 100755 (executable)
index 09fe5af..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_18.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_19.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_19.png
deleted file mode 100755 (executable)
index 0c7d183..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_19.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_20.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_20.png
deleted file mode 100755 (executable)
index d27ba49..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_20.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_21.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_21.png
deleted file mode 100755 (executable)
index d7ebef6..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_21.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_22.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_22.png
deleted file mode 100755 (executable)
index fa97a45..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_22.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_23.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_23.png
deleted file mode 100755 (executable)
index 71eda49..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_23.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_24.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_24.png
deleted file mode 100755 (executable)
index 37199d1..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_24.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_25.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_25.png
deleted file mode 100755 (executable)
index 806b12a..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_25.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_26.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_26.png
deleted file mode 100755 (executable)
index fc04548..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_26.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_27.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_27.png
deleted file mode 100755 (executable)
index 6c0cddb..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_27.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_28.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_28.png
deleted file mode 100755 (executable)
index 48c31e1..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_28.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_29.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_29.png
deleted file mode 100755 (executable)
index 7cc5500..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_29.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_30.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_30.png
deleted file mode 100755 (executable)
index 31284bd..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_30.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_31.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_31.png
deleted file mode 100755 (executable)
index 8a8f96c..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_31.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_32.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_32.png
deleted file mode 100755 (executable)
index e5eb6c1..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_32.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_33.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_33.png
deleted file mode 100755 (executable)
index 1cdc7ca..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_33.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_34.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_34.png
deleted file mode 100755 (executable)
index 7c9cdad..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_34.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_35.png b/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_35.png
deleted file mode 100755 (executable)
index 4e989da..0000000
Binary files a/resource/icons/savingpower/popup/battery/A01-11_popup_battery_step_35.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_01.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_01.png
deleted file mode 100755 (executable)
index 42124e4..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_01.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_02.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_02.png
deleted file mode 100755 (executable)
index ec09c8a..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_02.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_03.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_03.png
deleted file mode 100755 (executable)
index 6507311..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_03.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_04.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_04.png
deleted file mode 100755 (executable)
index 0442ac4..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_04.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_05.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_05.png
deleted file mode 100755 (executable)
index 34c07d4..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_05.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_06.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_06.png
deleted file mode 100755 (executable)
index 11b2f6a..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_06.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_07.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_07.png
deleted file mode 100755 (executable)
index 55d2d34..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_07.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_08.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_08.png
deleted file mode 100755 (executable)
index 0d18595..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_08.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_09.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_09.png
deleted file mode 100755 (executable)
index dba50ee..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_09.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_10.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_10.png
deleted file mode 100755 (executable)
index 2c49470..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_10.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_11.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_11.png
deleted file mode 100755 (executable)
index 78df363..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_11.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_12.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_12.png
deleted file mode 100755 (executable)
index 591ca6f..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_12.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_13.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_13.png
deleted file mode 100755 (executable)
index 74b4c46..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_13.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_14.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_14.png
deleted file mode 100755 (executable)
index 5cb773c..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_14.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_15.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_15.png
deleted file mode 100755 (executable)
index a2975cd..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_15.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_16.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_16.png
deleted file mode 100755 (executable)
index 80408d8..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_16.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_17.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_17.png
deleted file mode 100755 (executable)
index 0a3590c..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_17.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_18.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_18.png
deleted file mode 100755 (executable)
index ce3af2d..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_18.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_19.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_19.png
deleted file mode 100755 (executable)
index 56ab4f7..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_19.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_20.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_20.png
deleted file mode 100755 (executable)
index 94022b0..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_20.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_21.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_21.png
deleted file mode 100755 (executable)
index 20325a2..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_21.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_22.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_22.png
deleted file mode 100755 (executable)
index 24da7be..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_22.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_23.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_23.png
deleted file mode 100755 (executable)
index ecf4c8f..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_23.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_24.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_24.png
deleted file mode 100755 (executable)
index 8af5f9a..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_24.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_25.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_25.png
deleted file mode 100755 (executable)
index fdac9d3..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_25.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_26.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_26.png
deleted file mode 100755 (executable)
index 827c6ba..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_26.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_27.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_27.png
deleted file mode 100755 (executable)
index cbaccec..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_27.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_28.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_28.png
deleted file mode 100755 (executable)
index 8eca56b..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_28.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_29.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_29.png
deleted file mode 100755 (executable)
index 2739323..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_29.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_30.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_30.png
deleted file mode 100755 (executable)
index 842dc7f..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_30.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_31.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_31.png
deleted file mode 100755 (executable)
index 920f6dd..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_31.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_32.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_32.png
deleted file mode 100755 (executable)
index 80fc30b..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_32.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_33.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_33.png
deleted file mode 100755 (executable)
index 3e56129..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_33.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_34.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_34.png
deleted file mode 100755 (executable)
index bc1801b..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_34.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_35.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_35.png
deleted file mode 100755 (executable)
index c58d71e..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_35.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_36.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_36.png
deleted file mode 100755 (executable)
index c9264c1..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_36.png and /dev/null differ
diff --git a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_bg.png b/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_bg.png
deleted file mode 100755 (executable)
index 15e328b..0000000
Binary files a/resource/icons/savingpower/popup/standby_time/A01-11_popup_time_bg.png and /dev/null differ
diff --git a/resource/icons/sound_icon/00_volume_icon.png b/resource/icons/sound_icon/00_volume_icon.png
new file mode 100755 (executable)
index 0000000..7cf1a0d
Binary files /dev/null and b/resource/icons/sound_icon/00_volume_icon.png differ
diff --git a/resource/icons/sound_icon/B04_slider_icon_notification.png b/resource/icons/sound_icon/B04_slider_icon_notification.png
new file mode 100644 (file)
index 0000000..36b7800
Binary files /dev/null and b/resource/icons/sound_icon/B04_slider_icon_notification.png differ
diff --git a/resource/icons/sound_icon/B04_slider_icon_notification_mute.png b/resource/icons/sound_icon/B04_slider_icon_notification_mute.png
new file mode 100644 (file)
index 0000000..5f34ef0
Binary files /dev/null and b/resource/icons/sound_icon/B04_slider_icon_notification_mute.png differ
diff --git a/resource/icons/sound_icon/B04_slider_icon_ring.png b/resource/icons/sound_icon/B04_slider_icon_ring.png
new file mode 100644 (file)
index 0000000..4a238a0
Binary files /dev/null and b/resource/icons/sound_icon/B04_slider_icon_ring.png differ
diff --git a/resource/icons/sound_icon/B04_slider_icon_system.png b/resource/icons/sound_icon/B04_slider_icon_system.png
new file mode 100644 (file)
index 0000000..f28a5c5
Binary files /dev/null and b/resource/icons/sound_icon/B04_slider_icon_system.png differ
diff --git a/resource/icons/sound_icon/B04_slider_icon_system_mute.png b/resource/icons/sound_icon/B04_slider_icon_system_mute.png
new file mode 100644 (file)
index 0000000..06eef2d
Binary files /dev/null and b/resource/icons/sound_icon/B04_slider_icon_system_mute.png differ
diff --git a/resource/icons/sound_icon/B04_slider_icon_vibrate.png b/resource/icons/sound_icon/B04_slider_icon_vibrate.png
new file mode 100644 (file)
index 0000000..a9a3275
Binary files /dev/null and b/resource/icons/sound_icon/B04_slider_icon_vibrate.png differ
diff --git a/resource/icons/sound_icon/B04_volume_icon_mute.png b/resource/icons/sound_icon/B04_volume_icon_mute.png
new file mode 100644 (file)
index 0000000..e2a1ec1
Binary files /dev/null and b/resource/icons/sound_icon/B04_volume_icon_mute.png differ
diff --git a/resource/icons/wallpaper-viewer.png b/resource/icons/wallpaper-viewer.png
deleted file mode 100644 (file)
index 34aacd0..0000000
Binary files a/resource/icons/wallpaper-viewer.png and /dev/null differ
index e8e02a690b5a7eb95a21d39905be81080e151655..d2b1871f3e28297258b7419886bb374cfdc47e3e 100644 (file)
@@ -36,6 +36,7 @@
 #define EXCEED_MINLENGTH_LIMITATION_STR                "The content is too short"
 
 #define SETTING_ICON_PATH_CFG                                  _TZ_SYS_RO_APP"/org.tizen.setting/res/icons/"
+#define SETTING_SOUND_ICON_PATH_CFG                                    SETTING_ICON_PATH_CFG"sound_icon/"
 #define SETTING_LIST_ICON_PATH_CFG                                     SETTING_ICON_PATH_CFG"list_icon/"
 
 #define SETTING_IMAGE_PATH_CFG                         _TZ_SYS_RO_APP"/org.tizen.setting/res/images/"
index 4bee695a0d798027824b3c59e5075e07576a8ca3..a7661df33a08fbad824c29a4164f686cbc5cbaba 100755 (executable)
@@ -28,7 +28,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 ADD_LIBRARY(${SETTING_DISPLAY_UG} SHARED
        ./src/setting-display.c
        ./src/setting-display-main.c
-       ./src/setting-display-backlight.c
        ./src/setting-display-brightness.c
        )
 
diff --git a/setting-display/include/setting-display-backlight.h b/setting-display/include/setting-display-backlight.h
deleted file mode 100644 (file)
index 7137917..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef __SETTING_DISPLAY_BACKLIGHT_H__
-#define __SETTING_DISPLAY_BACKLIGHT_H__
-
-#include <setting-display.h>
-static void
-setting_display_backlight_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info);
-static void
-setting_display_backlight_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj, void *event_info);
-
-#endif /*__SETTING_DISPLAY_BACKLIGHT_H__ */
\ No newline at end of file
index 153d7d92b0b2a05b06d59decd27cd5d3b7a3dec3..4cab15c47be5af308c151732cab0bc00dde86510 100644 (file)
@@ -25,8 +25,6 @@
 #include <string.h>
 
 #include <Elementary.h>
-
-
 #include <glib-object.h>
 
 #include <setting-common-draw-widget.h>
 #include <dd-display.h>
 #include <dd-deviced.h>
 #include <dbus/dbus.h>
-/*#include <devman.h> */
-
-#define Keystr_Dynamic         "IDS_ST_BODY_DYNAMIC_T_DISPLAY_EFFECT"
-#define Keystr_Standard                "IDS_ST_BODY_STANDARD_T_DISPLAY_EFFECT"
-#define Keystr_Natural         "IDS_ST_BODY_NATURAL_T_DISPLAY_EFFECT"
-#define Keystr_Movie           "IDS_ST_BODY_MOVIE_T_DISPLAY_EFFECT"
-
-#define LAUNCH_EFFECT_STR "IDS_ST_BODY_APP_OPENING_EFFECT"
-#define LAUNCH_IMAGE_STR  "IDS_ST_BODY_APP_OPENING_IMAGE"
-
-#define LAUNCH_BATTERY_DESC     "IDS_ST_BODY_SHOWS_BATTERY_PERCENTAGE_ON_INDICATOR" /*"Increase the screen's sensitivity so you can touch it while wearing gloves" */
-
-#define SETTING_DISPLAY_TIME_15_SEC_STR "IDS_ST_BODY_15SEC"
-#define SETTING_DISPLAY_TIME_30_SEC_STR "IDS_ST_BODY_30SEC"
-#define SETTING_DISPLAY_TIME_1_MIN_STR "IDS_ST_BODY_1MINUTE"
-#define SETTING_DISPLAY_TIME_2_MIN_STR "IDS_ST_BODY_2_MINUTES"
-#define SETTING_DISPLAY_TIME_5_MIN_STR "IDS_ST_BODY_5_MINUTES"
-#define SETTING_DISPLAY_TIME_10_MIN_STR "IDS_ST_BODY_10_MINUTES"
-
-
-#define URI_SMART_STAY "tizen-help://org.tizen.setting/smartstay"
-#define URI_SMART_ROTATION "tizen-help://org.tizen.setting/smartrotation"
 
 #define SETTING_DISPLAY_ICON_PATH 12
 
-typedef enum {
-       SCREENMODE_DYNAMIC = 0,
-       SCREENMODE_STANDARD,
-       SCREENMODE_NATURAL,
-       SCREENMODE_MOVIE,
-       SCREENMODE_MAX
-} screenmode_t;
-
-typedef enum {
-       DISPLAY_EXPAND_NONE = 0,
-       DISPLAY_EXPAND_BACKLIGHT,
-       DISPLAY_EXPAND_TOUCH_KEY_LIGHT_DURATION
-} DisplayExpandState;
-
-
-typedef struct _Ctxpopup_Data {
-       Evas_Object *ctx;
-       Evas_Object *btn;
-} Ctxpopup_Data;
-
-typedef enum {
-       SETTING_DISPLAY_VIEWTYPE_MAIN,
-       SETTING_DISPLAY_VIEWTYPE_BRIGHTNESS,
-       SETTING_DISPLAY_VIEWTYPE_BACKLIGHT,
-       SETTING_DISPLAY_VIEWTYPE_SMARTSCREEN,
-       SETTING_DISPLAY_VIEWTYPE_MAX,
-} display_viewtype;
-
-typedef struct _SettingDisplayUG SettingDisplayUG;
-
 /**
  * Setting Display UG context
  * all UG function has void* as an agument. this is casted back to SettingDisplayUG
@@ -104,11 +50,6 @@ struct _SettingDisplayUG {
        Evas_Object *win_main_layout;
        Evas_Object *win_get;
 
-       ui_gadget_h ug_loading;
-       ui_gadget_h ug_font;
-       ui_gadget_h ug_passwd;
-       ui_gadget_h ug_ledindicator;
-
        Evas_Object *ly_main;   /**< link to src/setting-display-main.c */
 
        Evas_Object *navi_bar;  /*      for navigation effect */
@@ -118,59 +59,26 @@ struct _SettingDisplayUG {
        Evas_Object *screen_timeout_popup;
        Evas_Object *screen_timeout_rdg;
 
-       Setting_GenGroupItem_Data *data_screen_mode;
        Setting_GenGroupItem_Data *data_br;
        Setting_GenGroupItem_Data *data_font;
        Setting_GenGroupItem_Data *data_back;
-       /*Setting_GenGroupItem_Data *data_touchkey_light_duration; */
        Setting_GenGroupItem_Data *data_br_auto;
        Setting_GenGroupItem_Data *data_br_sli;
        Setting_GenGroupItem_Data *data_adjust;
        Setting_GenGroupItem_Data *data_overheating;
-
-       Setting_GenGroupItem_Data *data_br_adjustment;
-
        Setting_GenGroupItem_Data *data_auto_rotate;
 
-       /* smart screen */
-       Setting_GenGroupItem_Data *data_smart_stay;
-       Setting_GenGroupItem_Data *data_smart_rotation;
-       Setting_GenGroupItem_Data *data_auto_adjust_scrn_tone;
-       Setting_GenGroupItem_Data *data_dynamic;
-
-
-       Evas_Object *more_popup;
-       Ctxpopup_Data ctx_data;
-
-       Setting_GenGroupItem_Data *tilting_head;
-       Setting_GenGroupItem_Data *tilting_device;
-       Setting_GenGroupItem_Data *smart_scroll_speed;
-       Setting_GenGroupItem_Data *visual_feedback_display;
-       Setting_GenGroupItem_Data *scroll_speed_slider;
-       Setting_GenGroupItem_Data *smart_screen_help;
-       Setting_GenGroupItem_Data *try_tilting_head;
-       Setting_GenGroupItem_Data *try_tilting_device;
-       Setting_GenGroupItem_Data *data_smart_screen_image;
-       Setting_GenGroupItem_Data *data_smart_screen_rotation_image;
-
-       /*int bright_value; */
        int low_bat;
 
        setting_view *view_to_load;
 
-       Evas_Object *popup_chk;
        Evas_Object *popup;
 
        Elm_Genlist_Item_Class itc_1text_1icon;
        Elm_Genlist_Item_Class itc_1text;
-       Elm_Genlist_Item_Class itc_screen_mode;
        Elm_Genlist_Item_Class itc_2text_3;
        Elm_Genlist_Item_Class itc_1icon;
 
-
-       ui_gadget_h ug_gallery;
-       ui_gadget_h ug_imageviewer;
-       Eina_Bool isLoading;
        Setting_GenGroupItem_Data *data_backlight_always_on;
        Setting_GenGroupItem_Data *data_backlight_15sec;
        Setting_GenGroupItem_Data *data_backlight_30sec;
@@ -180,41 +88,19 @@ struct _SettingDisplayUG {
        Setting_GenGroupItem_Data *data_backlight_10min;
        /*Improve response speed */
        Ecore_Idler *set_idler;
-       Ecore_Timer *set_timer;
 
        /* genlist */
        Evas_Object *genlist;
 
        DBusConnection *bus;
-       Ecore_Event_Handler *help_event_handler;
-       Evas_Object *help_popup;
-       char *uri;
 
        /*for brightness*/
        Eina_Bool is_event_registered;
        int last_requested_level;
-       display_viewtype display_viewtype;
-
-       /*for smart screen try it*/
-       Evas_Object *smart_stay_image;
-       Evas_Object *smart_rotation_image;
-       Evas_Object *smart_stay_sublayout;
-       Evas_Object *smart_rotation_sublayout;
-       Ecore_Timer *timer_show_guide;
-
-       DisplayExpandState display_expand_state;
-
 };
 
 extern setting_view setting_view_display_main;
 extern setting_view setting_view_display_brightness;
-extern setting_view setting_view_display_backlight;
-
-void setting_display_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
-                                                                 void *priv);
-
-Eina_Bool __show_smartstay_guide_popup(void *data);
-Eina_Bool __show_smartrotation_guide_popup(void *data);
 
 extern void destruct_brightness(void *data);
 extern void construct_brightness(void *data, Evas_Object *genlist);
diff --git a/setting-display/src/setting-display-backlight.c b/setting-display/src/setting-display-backlight.c
deleted file mode 100644 (file)
index a28c331..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <setting-common-data-type.h>
-#include <setting-common-data-slp-setting.h>
-#include <setting-common-draw-widget.h>
-#include <setting-common-view.h>
-
-#include <setting-display-backlight.h>
-
-static int setting_display_backlight_create(void *cb);
-static int setting_display_backlight_destroy(void *cb);
-static int setting_display_backlight_update(void *cb);
-static int setting_display_backlight_cleanup(void *cb);
-
-setting_view setting_view_display_backlight = {
-       .create = setting_display_backlight_create,
-       .destroy = setting_display_backlight_destroy,
-       .update = setting_display_backlight_update,
-       .cleanup = setting_display_backlight_cleanup,
-};
-
-/* ***************************************************
- **
- **basic func
- **
- ****************************************************/
-static int setting_display_backlight_create(void *cb)
-{
-       SettingDisplayUG *ad = (SettingDisplayUG *) cb;
-       Evas_Object *scroller = NULL, *rgd = NULL;
-
-       SETTING_TRACE_BEGIN;
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       /* add basic layout */
-       ad->ly_main =
-               setting_create_layout_navi_bar_genlist(ad->win_main_layout,
-                                                                                          ad->win_get,
-                                                                                          _(KeyStr_BacklightTime),
-                                                                                          _("IDS_ST_BUTTON_BACK"),
-                                                                                          NULL,
-                                                                                          setting_display_backlight_click_softkey_back_cb,
-                                                                                          NULL, ad, &scroller,
-                                                                                          &(ad->navi_bar));
-
-       rgd = elm_radio_add(scroller);
-       elm_radio_value_set(rgd, -1);
-
-       evas_object_smart_callback_add(scroller, "realized", __gl_realized_cb, NULL);
-
-       /* to do : radio menu */
-       if (isEmulBin()) {
-               ad->data_backlight_always_on = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                                  &itc_1text_1icon_2,
-                                                                                                                                                  setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                                  SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                                  0,                   /* Always ON */
-                                                                                                                                                  "IDS_ST_BODY_ALWAYS_ON", NULL);
-
-               if (ad->data_backlight_always_on) {
-                       ad->data_backlight_always_on->userdata = ad;
-                       __BACK_POINTER_SET(ad->data_backlight_always_on);
-               } else {
-                       SETTING_TRACE_ERROR("ad->data_backlight_always_on is NULL");
-               }
-
-       }
-       ad->data_backlight_15sec = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                  &itc_1text_1icon_2,
-                                                                                                                                  setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                  SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                  15,                          /* 15 sec */
-                                                                                                                                  SETTING_DISPLAY_TIME_15_SEC_STR, NULL);
-       if (ad->data_backlight_15sec) {
-               ad->data_backlight_15sec->userdata = ad;
-               __BACK_POINTER_SET(ad->data_backlight_15sec);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_backlight_15sec is NULL");
-       }
-
-       ad->data_backlight_30sec = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                  &itc_1text_1icon_2,
-                                                                                                                                  setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                  SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                  30,                          /* 30 sec */
-                                                                                                                                  SETTING_DISPLAY_TIME_30_SEC_STR, NULL);
-       if (ad->data_backlight_30sec) {
-               ad->data_backlight_30sec->userdata = ad;
-               __BACK_POINTER_SET(ad->data_backlight_30sec);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_backlight_30sec is NULL");
-       }
-
-       ad->data_backlight_1min = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                 &itc_1text_1icon_2,
-                                                                                                                                 setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                 SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                 60,                           /* 60 sec */
-                                                                                                                                 SETTING_DISPLAY_TIME_1_MIN_STR, NULL);
-       if (ad->data_backlight_1min) {
-               ad->data_backlight_1min->userdata = ad;
-               __BACK_POINTER_SET(ad->data_backlight_1min);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_backlight_1min is NULL");
-       }
-
-       ad->data_backlight_2min = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                 &itc_1text_1icon_2,
-                                                                                                                                 setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                 SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                 120,                          /* 2min */
-                                                                                                                                 SETTING_DISPLAY_TIME_2_MIN_STR, NULL);
-       if (ad->data_backlight_2min) {
-               ad->data_backlight_2min->userdata = ad;
-               __BACK_POINTER_SET(ad->data_backlight_2min);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_backlight_2min is NULL");
-       }
-
-       ad->data_backlight_5min = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                 &itc_1text_1icon_2,
-                                                                                                                                 setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                 SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                 300,                          /* 5min */
-                                                                                                                                 SETTING_DISPLAY_TIME_5_MIN_STR, NULL);
-       if (ad->data_backlight_5min) {
-               ad->data_backlight_5min->userdata = ad;
-               __BACK_POINTER_SET(ad->data_backlight_5min);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_backlight_5min is NULL");
-       }
-
-       ad->data_backlight_10min = setting_create_Gendial_field_1radio(scroller,
-                                                                                                                                  &itc_1text_1icon_2,
-                                                                                                                                  setting_display_backlight_mouse_up_Gendial_list_cb, ad,
-                                                                                                                                  SWALLOW_Type_1RADIO, rgd,
-                                                                                                                                  600,                         /* 10min */
-                                                                                                                                  SETTING_DISPLAY_TIME_10_MIN_STR, NULL);
-       if (ad->data_backlight_10min) {
-               ad->data_backlight_10min->userdata = ad;
-               __BACK_POINTER_SET(ad->data_backlight_10min);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_backlight_10min is NULL");
-       }
-
-       setting_update_chk_status(rgd, INT_SLP_SETTING_LCD_TIMEOUT_NORMAL);
-
-       setting_view_display_backlight.is_create = 1;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_display_backlight_destroy(void *cb)
-{
-       SettingDisplayUG *ad = (SettingDisplayUG *) cb;
-
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       retv_if(!(setting_view_display_backlight.is_create), SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       if (ad->ly_main != NULL) {
-               evas_object_del(ad->ly_main);
-               ad->ly_main = NULL;
-       }
-
-       setting_view_display_backlight.is_create = 0;
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_display_backlight_update(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_display_backlight_cleanup(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-/* ***************************************************
- **
- **call back func
- **
- ****************************************************/
-static void
-setting_display_backlight_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
-                                                                                                  void *event_info)
-{
-       Elm_Object_Item *item = (Elm_Object_Item *) event_info;
-       Setting_GenGroupItem_Data *list_item = NULL;
-       int val, list_val, old_val;
-       int err = 0;
-
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
-
-       elm_genlist_item_selected_set(item, 0);
-
-       list_item = (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
-       setting_retm_if(NULL == list_item, "list_item is NULL");
-
-       SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
-       SETTING_TRACE("chk_status[%d]", list_item->chk_status);
-
-       list_val = list_item->chk_status;
-       old_val = elm_radio_value_get(list_item->eo_check);
-
-       setting_get_int_slp_key(INT_SLP_SETTING_LCD_TIMEOUT_NORMAL, &val, &err);
-       if (list_val == old_val && list_val == val) {
-               SETTING_TRACE_DEBUG("Selected same type");
-               return;
-       }
-
-       if (setting_set_int_slp_key(INT_SLP_SETTING_LCD_TIMEOUT_NORMAL, list_item->chk_status, &err) != 0) {
-               SETTING_TRACE_ERROR("set vconf failed");
-               elm_radio_value_set(list_item->eo_check, val);
-               return;
-       }
-
-       elm_radio_value_set(list_item->eo_check, list_item->chk_status);
-}
-
-
-
-static void
-setting_display_backlight_click_softkey_back_cb(void *data, Evas_Object *obj,
-                                                                                               void *event_info)
-{
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;
-
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "[Setting > Security] Data parameter is NULL");
-
-       /* Send destroy request */
-       ug_destroy_me(ad->ug);
-
-       return;
-}
old mode 100644 (file)
new mode 100755 (executable)
index c39c82d..789f99e
@@ -25,8 +25,6 @@
 
 #define BRIGHTNESS_MAX 100
 #define BRIGHTNESS_MIN 1
-#define BRIGHTNESS_AUTO_MAX_LEVEL 5
-#define BRIGHTNESS_AUTO_MIN_LEVEL -5
 
 static int setting_display_brightness_create(void *cb);
 static int setting_display_brightness_destroy(void *cb);
@@ -35,9 +33,7 @@ static int setting_display_brightness_cleanup(void *cb);
 
 static void setting_display_brightness_click_softkey_cancel_cb(void *data, Evas_Object *obj, void *event_info);
 static void setting_display_birghtness_bright_slider_value_change_cb(void *data, Evas_Object *obj, void *event_info);
-
 void setting_display_update_slider_icon(Setting_GenGroupItem_Data *item_data, int value);
-
 static void setting_display_set_slider_value(void *data, Evas_Object *obj, double value);
 
 setting_view setting_view_display_brightness = {
old mode 100644 (file)
new mode 100755 (executable)
index d63d43d..2976d02
@@ -39,9 +39,6 @@ setting_view setting_view_display_main = {
        .cleanup = setting_display_main_cleanup,
 };
 
-extern const char *str_in_arr[];
-extern const char *str_out_arr[];
-
 unsigned int auto_rotate_event_reg_id;
 
 /* ***************************************************
@@ -249,24 +246,7 @@ static void setting_display_main_vconf_change_cb(keynode_t *key, void *data)
 
        SETTING_TRACE("status:%d", status);
 
-       if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL)) {
-               if (ad->data_auto_rotate && ad->data_auto_rotate->eo_check) {
-                       setting_update_gl_item_chk_status(ad->data_auto_rotate, status);
-                       if (status == TRUE) {
-                               if (ad->data_smart_rotation && ad->data_smart_rotation->item) {
-                                       setting_enable_genlist_item(ad->data_smart_rotation->item);
-                               }
-                       } else if (status == FALSE) {
-                               if (ad->data_smart_rotation && ad->data_smart_rotation->item) {
-                                       setting_disable_genlist_item(ad->data_smart_rotation->item);
-                               }
-                       }
-               }
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_LCD_AUTO_DISPLAY_ADJUSTMENT)) {
-               setting_update_gl_item_chk_status(ad->data_auto_adjust_scrn_tone, status);
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_DYNAMIC_STATUS_BAR)) {
-               setting_update_gl_item_chk_status(ad->data_dynamic, status);
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL)) {
+       if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL)) {
                if (ad->data_back) {
                        G_FREE(ad->data_back->sub_desc);
                        ad->data_back->sub_desc = get_pa_backlight_time_value_str();
@@ -317,21 +297,6 @@ static int setting_display_main_create(void *cb)
        if (ret != 0)
                SETTING_TRACE_ERROR("vconf notifications Failed %d", ret);
 
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_AUTO_DISPLAY_ADJUSTMENT,
-                                                                  setting_display_main_vconf_change_cb, ad);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("vconf notifications Failed %d", ret);
-
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_DYNAMIC_STATUS_BAR,
-                                                                  setting_display_main_vconf_change_cb, ad);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("vconf notifications Failed %d", ret);
-
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SCREEN_CAPTURE_EDIT_AFTER_CAPTURE,
-                                                                  setting_display_main_vconf_change_cb, ad);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("vconf notifications Failed %d", ret);
-
        ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL,
                                                                   setting_display_main_vconf_change_cb, ad);
        if (ret != 0)
@@ -402,11 +367,6 @@ static int setting_display_main_create(void *cb)
                        setting_enable_genlist_item(ad->data_br->item);
                }
        }
-       if (ad->display_expand_state == DISPLAY_EXPAND_BACKLIGHT) {
-               if (ad->data_back && ad->data_back->item) {
-                       elm_genlist_item_expanded_set(ad->data_back->item, TRUE);
-               }
-       }
        vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_STATUS_LOW, setting_display_main_lowbat_cb, ad);
 #endif
 
@@ -446,21 +406,6 @@ static int setting_display_main_destroy(void *cb)
        if (ret != 0)
                SETTING_TRACE_ERROR("vconf ignore Failed %d", ret);
 
-       ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_LCD_AUTO_DISPLAY_ADJUSTMENT,
-                                                                  setting_display_main_vconf_change_cb);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("vconf ignore Failed %d", ret);
-
-       ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_DYNAMIC_STATUS_BAR,
-                                                                  setting_display_main_vconf_change_cb);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("vconf ignore Failed %d", ret);
-
-       ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SCREEN_CAPTURE_EDIT_AFTER_CAPTURE,
-                                                                  setting_display_main_vconf_change_cb);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("vconf ignore Failed %d", ret);
-
        ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL,
                                                                   setting_display_main_vconf_change_cb);
        if (ret != 0)
@@ -473,7 +418,6 @@ static int setting_display_main_destroy(void *cb)
        if (ad->ly_main != NULL) {
                evas_object_del(ad->ly_main);
                ad->ly_main = NULL;
-               /* if(ad->back_dialData) FREE(ad->back_dialData); */
        }
 
        setting_view_display_main.is_create = 0;
@@ -500,24 +444,6 @@ static int setting_display_main_update(void *cb)
                        elm_genlist_item_update(ad->data_br->item);
 
                }
-
-#ifdef SUPPORT_SCREEN_MODE
-               if (ad->data_screen_mode) {
-                       int i = 0;
-                       char *curmode = vconf_get_str(VCONFKEY_SETAPPL_SCREENMODE_SELNAME);
-                       SETTING_TRACE(">>> CUR SCREEN MODE : %s ", curmode);
-                       for (; i < SCREENMODE_MAX; i++) {
-                               if (0 == safeStrCmp(str_in_arr[i], curmode)) {
-                                       ad->data_screen_mode->sub_desc = (char *)g_strdup(_(str_out_arr[i]));
-                                       break;
-                               }
-                       }
-                       FREE(curmode);
-
-                       elm_object_item_data_set(ad->data_screen_mode->item, ad->data_screen_mode);
-                       elm_genlist_item_update(ad->data_screen_mode->item);
-               }
-#endif
        }
 
        return SETTING_RETURN_SUCCESS;
@@ -533,22 +459,6 @@ static int setting_display_main_cleanup(void *cb)
  *general func
  *
  ***************************************************/
-
-void setting_display_destroy_font_ug_cb(ui_gadget_h ug,
-                                                                               void *priv)
-{
-       SettingDisplayUG *ad = (SettingDisplayUG *) priv;
-       ret_if(priv == NULL);
-
-       if (ug) {
-               setting_ug_destroy(ug);
-               ad->ug_font = NULL;
-       }
-
-       elm_genlist_realized_items_update(ad->genlist);
-}
-
-
 Eina_Bool ___display_freeze_event_timer_cb(void *cb)
 {
        SettingDisplayUG *ad = (SettingDisplayUG *)cb;
@@ -582,53 +492,6 @@ gboolean setting_display_create_font_sg(void *data)
        return TRUE;
 }
 
-void setting_display_destroy_ledindicator_ug_cb(ui_gadget_h ug,
-                                                                                               void *priv)
-{
-       SettingDisplayUG *ad = (SettingDisplayUG *) priv;
-
-       ret_if(priv == NULL);
-
-       if (ug) {
-               setting_ug_destroy(ug);
-               ad->ug_ledindicator = NULL;
-       }
-}
-
-gboolean setting_display_create_ledindicator_sg(void *data)
-{
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;       /* ad is point to data */
-       struct ug_cbs *cbs = NULL;
-
-       /* error check */
-       retv_if(data == NULL, FALSE);
-
-       if (ad->ug_ledindicator) {
-               SETTING_TRACE("Font UG is already loaded.");
-               return FALSE;
-       }
-
-       cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
-       if (!cbs)
-               return FALSE;
-
-       cbs->layout_cb = setting_display_layout_ug_cb;
-       cbs->result_cb = NULL;
-       cbs->destroy_cb = setting_display_destroy_ledindicator_ug_cb;
-       cbs->priv = (void *)ad;
-
-       elm_object_tree_focus_allow_set(ad->ly_main, EINA_FALSE);
-       ad->ug_ledindicator = setting_ug_create(ad->ug, "setting-ledindicator-efl", UG_MODE_FULLVIEW, NULL, cbs);
-       if (NULL == ad->ug_ledindicator) {      /* error handling */
-               SETTING_TRACE_ERROR("NULL == ad->ug_ledindicator");
-               evas_object_show(ad->ly_main);
-       }
-
-       FREE(cbs);
-
-       return TRUE;
-}
-
 static void
 setting_display_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                                                                                          void *event_info)
@@ -647,10 +510,7 @@ setting_display_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
        setting_retm_if(NULL == list_item, "list_item is NULL");
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
 
-       if (!safeStrCmp("IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING", list_item->keyStr)) {
-               setting_view_change(&setting_view_display_main,
-                                                       &setting_view_display_brightness, ad);
-       } else if (!safeStrCmp("IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB", list_item->keyStr)) {
+       if (!safeStrCmp("IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB", list_item->keyStr)) {
                setting_update_gl_item_chk_status(list_item, !(list_item->chk_status));
                vconf_set_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, list_item->chk_status);
        } else if (!safeStrCmp(KeyStr_Font, list_item->keyStr)) {
index 265636c0f143e8f1a77159323424f4cdff5d41f1..a7e23c14e990ccd4ff47f528db823a00c415d5f6 100644 (file)
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-/**
- * view selection by service variable
- *
- * viewtype == 'brightness' --> setting_view_display_brightness
- * viewtype != NULL && viewtype --> setting_view_display_main
- */
-setting_view *__get_display_view_to_load(void *data, app_control_h service)
-{
-       char *viewtype = NULL;
-       char *uri = NULL;
-       int ret = 0;
-       SettingDisplayUG *displayUG = (SettingDisplayUG *)data;
-
-       SETTING_TRACE_BEGIN;
-       setting_retvm_if((!data), NULL, "!data");
-
-       ret = app_control_get_uri(service, &uri);
-       if (!ret && uri) {
-               SETTING_TRACE("uri:%s", uri);
-               /* DO NOTHING NOW */
-       } else {
-               app_control_get_extra_data(service, "viewtype", &viewtype);
-               if (!viewtype)
-                       return NULL;
-
-               SETTING_TRACE_DEBUG("viewtype:%s", viewtype);
-
-               if (!safeStrCmp(viewtype, "brightness")) {
-                       setting_view_node_table_register(&setting_view_display_brightness, NULL);
-                       FREE(viewtype);
-                       return &setting_view_display_brightness;
-               } else if (!safeStrCmp(viewtype, "backlight")) {
-                       setting_view_node_table_register(&setting_view_display_backlight, NULL);
-                       FREE(viewtype);
-                       return &setting_view_display_backlight;
-               } else {
-                       if (!safeStrCmp(viewtype, "frontpage_backlight")) {
-                               displayUG->display_expand_state = DISPLAY_EXPAND_BACKLIGHT;
-                       } else if (!safeStrCmp(viewtype, "frontpage_duration")) {
-                               displayUG->display_expand_state = DISPLAY_EXPAND_TOUCH_KEY_LIGHT_DURATION;
-                       } else {
-                               displayUG->display_expand_state = DISPLAY_EXPAND_NONE;
-                       }
-                       setting_view_node_table_register(&setting_view_display_main, NULL);
-                       setting_view_node_table_register(&setting_view_display_brightness,
-                                                                                        &setting_view_display_main);
-                       FREE(viewtype);
-                       return &setting_view_display_main;
-               }
-       }
-       return NULL;
-}
-
-/**
- * return view layout
- *
- * viewtype != 'wallpaper' --> ly_main
- */
-Evas_Object *__get_display_layout_to_return(app_control_h service, void *priv)
-{
-       SettingDisplayUG *displayUG = priv;
-       char *viewtype = NULL;
-       char *uri = NULL;
-       int ret = 0;
-
-       SETTING_TRACE_BEGIN;
-
-       ret = app_control_get_uri(service, &uri);
-       if (!ret && uri)
-               return displayUG->ly_main;
-
-       app_control_get_extra_data(service, "viewtype", &viewtype);
-       if (!viewtype)
-               return NULL;
-
-       SETTING_TRACE("viewtype:%s", viewtype);
-       FREE(viewtype);
-
-       return displayUG->ly_main;
-}
-
-
 static void setting_display_ug_cb_resize(void *data, Evas *e,
                                                                                 Evas_Object *obj, void *event_info)
 {
        SettingDisplayUG *ad = (SettingDisplayUG *) data;
-       setting_view_update(ad->view_to_load, ad);
-}
-
-/*help smart screen popup*/
-Eina_Bool __show_smartstay_guide_popup(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retvm_if(data == NULL, ECORE_CALLBACK_CANCEL,
-                                        "[Setting > Display] Data parameter is NULL");
-
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;
-       setting_retvm_if(ad->smart_stay_sublayout == NULL, ECORE_CALLBACK_CANCEL,
-                                        "[Setting > Display] Dad->smart_stay_sublayout parameter is NULL");
-
-       /*hide top popup*/
-       elm_object_signal_emit(ad->smart_stay_sublayout, "elm,state,top,hide", "elm");
-       /*show center popup*/
-       elm_object_signal_emit(ad->smart_stay_sublayout, "elm,state,center,show", "elm");
-
-       return ECORE_CALLBACK_CANCEL;
-}
-Eina_Bool __show_smartrotation_guide_popup(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retvm_if(data == NULL, ECORE_CALLBACK_CANCEL,
-                                        "[Setting > Display] Data parameter is NULL");
-
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;
-       setting_retvm_if(ad->smart_rotation_sublayout == NULL, ECORE_CALLBACK_CANCEL,
-                                        "[Setting > Display] ad->smart_rotation_sublayout parameter is NULL");
-       /*hide top popup*/
-       elm_object_signal_emit(ad->smart_rotation_sublayout, "elm,state,top,hide", "elm");
-       /*show center popup*/
-       elm_object_signal_emit(ad->smart_rotation_sublayout, "elm,state,center,show", "elm");
-
-       return ECORE_CALLBACK_CANCEL;
+       setting_view_update(&setting_view_display_main, ad);
 }
 
 static void *setting_display_ug_on_create(ui_gadget_h ug,
@@ -176,22 +57,17 @@ static void *setting_display_ug_on_create(ui_gadget_h ug,
        /* register view node table */
        setting_view_node_table_intialize();
 
-       setting_create_Gendial_itc("1line.top", &(displayUG->itc_1text));
        setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(displayUG->itc_1text_1icon));
        setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(displayUG->itc_1text));
-       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(displayUG->itc_2text_3));
 
        /*      creating a view. */
-       displayUG->view_to_load = __get_display_view_to_load(displayUG, service);
-       setting_retvm_if(NULL == displayUG->view_to_load, NULL,
-                                        "NULL == displayUG->view_to_load");
-       setting_view_node_set_cur_view(displayUG->view_to_load);
-       setting_view_create(displayUG->view_to_load, (void *)displayUG);
+       setting_view_node_set_cur_view(&setting_view_display_main);
+       setting_view_create(&setting_view_display_main, (void *)displayUG);
        evas_object_event_callback_add(displayUG->win_main_layout,
                                                                   EVAS_CALLBACK_RESIZE,
                                                                   setting_display_ug_cb_resize, displayUG);
 
-       return __get_display_layout_to_return(service, displayUG);
+       return displayUG->ly_main;
 }
 
 static void setting_display_ug_on_start(ui_gadget_h ug, app_control_h service,
@@ -221,22 +97,7 @@ static void setting_display_ug_on_destroy(ui_gadget_h ug, app_control_h service,
        evas_object_event_callback_del(displayUG->win_main_layout, EVAS_CALLBACK_RESIZE, setting_display_ug_cb_resize);
        displayUG->ug = ug;
 
-       FREE(displayUG->uri);
-       if (displayUG->help_popup) {
-               evas_object_del(displayUG->help_popup);
-               displayUG->help_popup = NULL;
-       }
-
-       /*      called when this shared gadget is terminated. similar with app_exit */
-       if (&setting_view_display_main == displayUG->view_to_load) {
-               setting_view_destroy(&setting_view_display_brightness, displayUG);
-               setting_view_destroy(&setting_view_display_main, displayUG);
-       } else if (&setting_view_display_brightness == displayUG->view_to_load) {
-               setting_view_destroy(&setting_view_display_brightness, displayUG);
-       } else if (&setting_view_display_backlight == displayUG->view_to_load) {
-               setting_view_destroy(&setting_view_display_backlight, displayUG);
-       }
-
+       setting_view_destroy(&setting_view_display_main, displayUG);
        if (NULL != ug_get_layout(displayUG->ug)) {
                evas_object_hide((Evas_Object *) ug_get_layout(displayUG->ug));
                evas_object_del((Evas_Object *) ug_get_layout(displayUG->ug));
@@ -295,10 +156,6 @@ static void setting_display_ug_on_key_event(ui_gadget_h ug,
                                elm_naviframe_bottom_item_get(ad->navi_bar)) {
                                ug_destroy_me(ug);
                        } else {
-                               if (&setting_view_display_brightness ==
-                                       setting_view_node_get_cur_view()) {
-                                       /* ????? */
-                               }
                                setting_view_cb_at_endKey(ad);
                        }
                }
@@ -342,283 +199,3 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
        if (displayUG)
                FREE(displayUG);
 }
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-
-void setting_display_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
-                                                                 void *priv)
-{
-       Evas_Object *base;
-
-       SETTING_TRACE_BEGIN;
-
-       base = (Evas_Object *) ug_get_layout(ug);
-       if (!base)
-               return;
-
-       switch (mode) {
-       case UG_MODE_FULLVIEW:
-               evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
-                                                                                EVAS_HINT_EXPAND);
-               evas_object_show(base);
-               break;
-       default:
-               break;
-       }
-
-       SETTING_TRACE_END;
-}
-
-#define SUBINDEX_NAME "Display"
-
-static Setting_Cfg_Node_T s_cfg_node_array[] = {
-       {"IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING", IMG_Display, "viewtype:brightness",  Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_BODY_BACKLIGHT_TIME", IMG_Display, "viewtype:frontpage_backlight", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_HEADER_TOUCH_KEY_LIGHT_DURATION", IMG_Display, "viewtype:frontpage_duration", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_MBODY_AUTO_ADJUST_SCREEN_TONE", IMG_Display, "viewtype:frontpage", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node_Toggle, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB", IMG_Display, "viewtype:frontpage", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node_Toggle, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_BODY_DYNAMIC_STATUS_BAR", IMG_Display, "viewtype:frontpage", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node_Toggle, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_MBODY_EDIT_AFTER_SCREEN_CAPTURE", IMG_Display, "viewtype:frontpage", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node_Toggle, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_BODY_ANSWERINGMODE_AUTOMATIC", IMG_Display, "viewtype:brightness", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_MBODY_SMART_STAY", IMG_SmartScreen, "viewtype:smartscreen", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node_Toggle, NULL, SUBINDEX_NAME, NULL, NULL},
-       {"IDS_ST_MBODY_SMART_ROTATION", IMG_SmartScreen, "viewtype:smartscreen", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_View_Node_Toggle, NULL, SUBINDEX_NAME, NULL, NULL},
-};
-
-UG_MODULE_API int setting_plugin_search_init(app_control_h service, void *priv, char **applocale)
-{
-       Eina_List **pplist = (Eina_List **)priv;
-       int i, size = 0;
-       Setting_Cfg_Node_T *node = NULL;
-
-       SETTING_TRACE_BEGIN;
-       SETTING_TRACE(">> setting-display-efl DB search code");
-       setting_retvm_if(!priv || !applocale, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER, "pplist/applocale is NULL");
-
-       *applocale = strdup("setting:"_TZ_SYS_RO_APP"/org.tizen.setting/res/locale");
-
-       size = sizeof(s_cfg_node_array) / sizeof(s_cfg_node_array[0]);
-       for (i = 0; i < size; i++) {
-               node = setting_plugin_search_item_subindex_add(s_cfg_node_array[i].key_name, s_cfg_node_array[i].ug_args,
-                                                                                                          s_cfg_node_array[i].icon_path, s_cfg_node_array[i].item_type, s_cfg_node_array[i].data, s_cfg_node_array[i].sub_index);
-               *pplist = eina_list_append(*pplist, node);
-       }
-       return 0;
-}
-
-EXPORT_PUBLIC
-int get_display_ug_state(Cfg_Item_State *stat, void *data)
-{
-       int value = -1;
-       int ret = vconf_get_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &value);
-
-       SETTING_TRACE_BEGIN;
-
-       if (value == 1) {
-               *stat = Cfg_Item_On;
-       } else {
-               *stat = Cfg_Item_Off;
-       }
-
-       return ret;
-}
-
-/**************************************************************
- toggle state get/set function for "auto rotate screen"
-************************************************************/
-EXPORT_PUBLIC
-int set_display_ug_state(Cfg_Item_State stat, void *item, void *data)
-{
-       int value = -1;
-
-       SETTING_TRACE_BEGIN;
-
-       if (stat == Cfg_Item_On) {
-               value = 1;
-       } else {
-               value = 0;
-       }
-
-       return vconf_set_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, value);
-}
-
-EXPORT_PUBLIC
-int set_display_ug_update_ui(Cfg_Item_State stat, void *data)
-{
-       return 0;
-}
-
-/**************************************************************
- toggle state get/set function for "auto adjust screen tone"
-************************************************************/
-EXPORT_PUBLIC
-int get_display_ug_auto_adjust_state(Cfg_Item_State *stat, void *data)
-{
-       int value = -1;
-       int ret = vconf_get_bool(VCONFKEY_SETAPPL_LCD_AUTO_DISPLAY_ADJUSTMENT, &value);
-
-       SETTING_TRACE_BEGIN;
-
-       if (value == 1) {
-               *stat = Cfg_Item_On;
-       } else {
-               *stat = Cfg_Item_Off;
-       }
-
-       return ret;
-}
-
-EXPORT_PUBLIC
-int set_display_ug_auto_adjust_state(Cfg_Item_State stat, void *item, void *data)
-{
-       int value = -1;
-
-       SETTING_TRACE_BEGIN;
-
-       if (stat == Cfg_Item_On) {
-               value = 1;
-       } else {
-               value = 0;
-       }
-
-       return vconf_set_bool(VCONFKEY_SETAPPL_LCD_AUTO_DISPLAY_ADJUSTMENT, value);
-}
-
-EXPORT_PUBLIC
-int set_display_ug_auto_adjust_update_ui(Cfg_Item_State stat, void *data)
-{
-       return 0;
-}
-
-/**************************************************************
- toggle state get/set function for "dynamic status bar"
-************************************************************/
-EXPORT_PUBLIC
-int get_display_ug_dynamic_status_state(Cfg_Item_State *stat, void *data)
-{
-       int value = -1;
-       int ret = vconf_get_bool(VCONFKEY_SETAPPL_DYNAMIC_STATUS_BAR, &value);
-
-       SETTING_TRACE_BEGIN;
-
-       if (value == 1) {
-               *stat = Cfg_Item_On;
-       } else {
-               *stat = Cfg_Item_Off;
-       }
-
-       return ret;
-}
-
-EXPORT_PUBLIC
-int set_display_ug_dynamic_status_state(Cfg_Item_State stat, void *item, void *data)
-{
-       int value = -1;
-
-       SETTING_TRACE_BEGIN;
-
-       if (stat == Cfg_Item_On) {
-               value = 1;
-       } else {
-               value = 0;
-       }
-
-       return vconf_set_bool(VCONFKEY_SETAPPL_DYNAMIC_STATUS_BAR, value);
-}
-
-EXPORT_PUBLIC
-int set_display_ug_dynamic_status_update_ui(Cfg_Item_State stat, void *data)
-{
-       return 0;
-}
-
-/**************************************************************
- toggle state get/set function for "edit after screen capture"
-************************************************************/
-EXPORT_PUBLIC
-int get_display_ug_edit_screen_state(Cfg_Item_State *stat, void *data)
-{
-       int value = -1;
-       int ret = vconf_get_bool(VCONFKEY_SETAPPL_SCREEN_CAPTURE_EDIT_AFTER_CAPTURE, &value);
-
-       SETTING_TRACE_BEGIN;
-
-       if (value == 1) {
-               *stat = Cfg_Item_On;
-       } else {
-               *stat = Cfg_Item_Off;
-       }
-
-       return ret;
-}
-
-EXPORT_PUBLIC
-int set_display_ug_edit_screen_state(Cfg_Item_State stat, void *item, void *data)
-{
-       int value = -1;
-
-       SETTING_TRACE_BEGIN;
-
-       if (stat == Cfg_Item_On) {
-               value = 1;
-       } else {
-               value = 0;
-       }
-
-       return vconf_set_bool(VCONFKEY_SETAPPL_SCREEN_CAPTURE_EDIT_AFTER_CAPTURE, value);
-}
-
-EXPORT_PUBLIC
-int set_display_ug_edit_screen_update_ui(Cfg_Item_State stat, void *data)
-{
-       return 0;
-}
-
-EXPORT_PUBLIC
-cfg_func_table opt_tab_rotation = {
-       .get_item_state = get_display_ug_state,
-       .set_item_state = set_display_ug_state,
-       .set_item_update_ui = set_display_ug_update_ui,
-};
-
-EXPORT_PUBLIC
-cfg_func_table opt_tab_auto_adjust = {
-       .get_item_state = get_display_ug_auto_adjust_state,
-       .set_item_state = set_display_ug_auto_adjust_state,
-       .set_item_update_ui = set_display_ug_auto_adjust_update_ui,
-};
-
-EXPORT_PUBLIC
-cfg_func_table opt_tab_dynamic_status = {
-       .get_item_state = get_display_ug_dynamic_status_state,
-       .set_item_state = set_display_ug_dynamic_status_state,
-       .set_item_update_ui = set_display_ug_dynamic_status_update_ui,
-};
-EXPORT_PUBLIC
-cfg_func_table opt_tab_edit_screen = {
-       .get_item_state = get_display_ug_edit_screen_state,
-       .set_item_state = set_display_ug_edit_screen_state,
-       .set_item_update_ui = set_display_ug_edit_screen_update_ui,
-};
-
-/* cfg_func_table* tfunc; */
-UG_MODULE_API int setting_plugin_search_query_ops(char *str_id, void **tfunc_obj)
-{
-       SETTING_TRACE_BEGIN;
-       SETTING_TRACE(">> get tfunc operation via plugin-model 1");
-       if (str_id && !safeStrCmp(str_id, _("IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB"))) {
-               *tfunc_obj = (void *)&opt_tab_rotation;
-       } else if (str_id && !safeStrCmp(str_id, _("IDS_ST_MBODY_AUTO_ADJUST_SCREEN_TONE"))) {
-               *tfunc_obj = (void *)&opt_tab_auto_adjust;
-       } else if (str_id && !safeStrCmp(str_id, _("IDS_ST_BODY_DYNAMIC_STATUS_BAR"))) {
-               *tfunc_obj = (void *)&opt_tab_dynamic_status;
-       }
-       if (str_id && !safeStrCmp(str_id, _("IDS_ST_MBODY_EDIT_AFTER_SCREEN_CAPTURE"))) {
-               *tfunc_obj = (void *)&opt_tab_edit_screen;
-       }
-       SETTING_TRACE(">> get tfunc operation via plugin-model 2");
-       return 0;
-}
index f6e28b32be7538b78a9844d01a78ff5b9ec95a64..c1508514a0e5bcba1a7a4ae11da62108f6208ad8 100644 (file)
 #include <unicode/ucol.h>
 
 /* Choose default programe*/
-#define Display_APP_Full_Name 1
-#define MAX_APP_NAME 1024
-#define IMAGES_MIME_TYPE "image/png"   /* temporary implement */
-#define SOUNDS_MIME_TYPE "audio/mpeg"  /* temporary implement */
-#define VIDEOS_MIME_TYPE "video/3gpp"  /* temporary implement */
-#define OTHERS_MIME_TYPE "application/pdf"     /* temporary implement */
-#define TBL_NAME "menu"
-#define MIME_FIELD_NAME "mimetype"
-#define NAME_BUF_LEN (128)
-
 #define REGION_ITEM_MAX 300
-
-#define SETTING_PHONE_REGION_RECT_SIZE_W               ((int)720 * WIDGET_SCALE_FACTOR)
-#define SETTING_PHONE_REGION_RECT_SIZE_H               ((int)1280 * WIDGET_SCALE_FACTOR)
-
-#define ASK_DEREG_PHONE "<linesize=44>Your phone is<br>already registered.<br> Are you sure you<br>wish to deregister?"
-#define REGISTRATION_GET_FAILED _("IDS_ST_POP_REGISTRATION_CODE_NOT_FOUND")
-#define REGISTRATION_INDICATOT "IDS_ST_BODY_YOUR_DEVICE_REGISTRATION_CODE_C_PS"
-#define REGISTRATION_AT "IDS_ST_BODY_REGISTER_AT"
-#define DEREGISTRATION_INDICATOT "<br><br>Your device<br>deregistration code:<br><br>"
-#define EREGISTRATION_AT "<br><br><br>Deregister at"
-#define TRANSFER_INFO "IDS_ST_BODY_EXPLANATION_FOR_TRANSACTION_TRACKING_MENU_VODA"
-
 #define REGION_FORMAT_LOWER "IDS_ST_BODY_REGION"
 
 typedef struct _SettingPhoneUG SettingPhoneUG;
index b0c48a65d8329ed404e63eb38a101e9ddad836c9..93d22c02969df9b27e65100fd580eca0c93dcc3b 100644 (file)
 #define SUPPORT_PLAYER_ASYNC 1
 
 /*Call ringtone:3 icon status */
-#define ICON_CALL_VIB          SETTING_ICON_PATH_CFG"B04_slider_icon_vibrate.png"
-#define ICON_CALL_NORMAL       SETTING_ICON_PATH_CFG"B04_slider_icon_ring.png"
-#define ICON_CALL_MUTE         SETTING_ICON_PATH_CFG"B04_volume_icon_mute.png"
+#define ICON_CALL_VIB       SETTING_SOUND_ICON_PATH_CFG"B04_slider_icon_vibrate.png"
+#define ICON_CALL_NORMAL    SETTING_SOUND_ICON_PATH_CFG"B04_slider_icon_ring.png"
+#define ICON_CALL_MUTE      SETTING_SOUND_ICON_PATH_CFG"B04_volume_icon_mute.png"
 
 /*Notification: 2 icon status */
-#define ICON_NOTI_MUTE         SETTING_ICON_PATH_CFG"B04_slider_icon_notification_mute.png"
-#define ICON_NOTI_NORMAL       SETTING_ICON_PATH_CFG"B04_slider_icon_notification.png"
+#define ICON_NOTI_MUTE      SETTING_SOUND_ICON_PATH_CFG"B04_slider_icon_notification_mute.png"
+#define ICON_NOTI_NORMAL    SETTING_SOUND_ICON_PATH_CFG"B04_slider_icon_notification.png"
 
 /*Media: 2 icon status */
-#define ICON_MEDIA_MUTE                SETTING_ICON_PATH_CFG"B04_volume_icon_mute.png"
-#define ICON_MEDIA_NORMAL      SETTING_ICON_PATH_CFG"00_volume_icon.png"
+#define ICON_MEDIA_MUTE     SETTING_SOUND_ICON_PATH_CFG"B04_volume_icon_mute.png"
+#define ICON_MEDIA_NORMAL   SETTING_SOUND_ICON_PATH_CFG"00_volume_icon.png"
 
 /*System:2 icon status */
-#define ICON_SYSTEM_MUTE       SETTING_ICON_PATH_CFG"B04_slider_icon_system_mute.png"
-#define ICON_SYSTEM_NORMAL     SETTING_ICON_PATH_CFG"B04_slider_icon_system.png"
+#define ICON_SYSTEM_MUTE    SETTING_SOUND_ICON_PATH_CFG"B04_slider_icon_system_mute.png"
+#define ICON_SYSTEM_NORMAL  SETTING_SOUND_ICON_PATH_CFG"B04_slider_icon_system.png"
 
 
 typedef enum {
index 5bfc9036dc71d49ed315a296e4173bf2ef645bb2..d42001b491049d137ee815e7dd90191d4be80a88 100644 (file)
@@ -553,7 +553,6 @@ static void storageUg_media_filesys_changed_cb(
        media_content_type_e media_type,
        char *uuid,
        char *path,
-       char *mime_type,
        void *user_data)
 {
        SETTING_TRACE_BEGIN;
index 07438959cd85845a22df54cf4710ddc9c43807b0..aae4039fff2feb9830622aed161605ca1d5c0280 100755 (executable)
@@ -217,7 +217,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/langlist.xml DESTINATION ${TZ_SYS_RO_
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.setting.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.setting.xml.ref DESTINATION /usr/share/packages/)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.png DESTINATION ${TZ_SYS_RO_ICONS}/default/small)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
@@ -240,15 +239,6 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_S
 # install changeable UI code
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/changeable/org.tizen.setting.xml DESTINATION ${TZ_SYS_RO_APP}/org.tizen.setting/shared/res/tables)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/mime.setting.xml DESTINATION /usr/share/mime/packages)
-
-
-
-#------------------------------------------------------------------
-#add setting-sfinder-plugin
-#ADD_SUBDIRECTORY(setting-sfinder-plugin)
-#------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------------
 CONFIGURE_FILE(
        setting-common-internal.pc
@@ -257,7 +247,3 @@ CONFIGURE_FILE(
 )
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc DESTINATION ${LIBDIR}/pkgconfig)
 #-----------------------------------------------------------------------------------
-
-# install firewall script for FOTA(210.org.tizen.setting.patch.sh)
-INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/210.org.tizen.setting.patch.sh DESTINATION /etc/opt/upgrade/)
-