From: Andrey Klimenko <and.klimenko@samsung.com>
Date: Mon, 30 Nov 2015 09:35:37 +0000 (-0800)
Subject: Revert "TizenRefApp-5010 make "Do not disturb" view visible in settings"
X-Git-Tag: accepted/tizen/mobile/20151130.224148^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76c1973d9294bf41d29b31d1dfb1b6ca7c04316d;p=profile%2Fmobile%2Fapps%2Fnative%2Fug-setting-notification-efl.git

Revert "TizenRefApp-5010 make "Do not disturb" view visible in settings"

This reverts commit f7cd0b5e28df4a6ae1092fbfa36b12f7627c641c.

Change-Id: I1559f942c5e6b9e33ac7d8a3630d17d0f6613d7a
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
---

diff --git a/packaging/ug-setting-notification-efl.spec b/packaging/ug-setting-notification-efl.spec
index 38917ad..008a72b 100755
--- a/packaging/ug-setting-notification-efl.spec
+++ b/packaging/ug-setting-notification-efl.spec
@@ -43,6 +43,7 @@ This package will be loaded into a Settings Application.
 User can control the behaviour of notification of each application individually.
 
 
+
 %description
 ug-setting-notification-do-not-disturb-efl.
 %package -n ug-setting-notification-do-not-disturb-efl
@@ -57,10 +58,8 @@ Description: do not disturb efl
 cp %{SOURCE1001} .
 
 
+
 %build
-%define bin_path /usr/apps/%{name}/bin
-%define lib_path /usr/apps/%{name}/lib/ug
-%define link_path /home/owner/apps_rw/%{name}/lib/ug
 
 export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
@@ -77,16 +76,16 @@ make -j2
 
 %install
 %make_install
-mkdir -p %{buildroot}%{bin_path}
-mkdir -p %{buildroot}%{link_path}
-mkdir -p /etc/smack/accesses.d/
-ln -sf /usr/bin/ug-client %{buildroot}%{bin_path}/ug-setting-notification-efl
-ln -sf /usr/bin/ug-client %{buildroot}%{bin_path}/ug-setting-notification-do-not-disturb-efl
-ln -sf /usr/bin/ug-client %{buildroot}%{bin_path}/ug-setting-notification-app-notifications-efl
-ln -sf %{lib_path}/libug-setting-notification-do-not-disturb-efl.so %{buildroot}%{link_path}/libug-setting-notification-do-not-disturb-efl.so
+mkdir -p %{buildroot}/usr/apps/ug-setting-notification-efl/bin
+ln -sf /usr/bin/ug-client %{buildroot}/usr/apps/ug-setting-notification-efl/bin/ug-setting-notification-efl
+ln -sf /usr/bin/ug-client %{buildroot}/usr/apps/ug-setting-notification-efl/bin/ug-setting-notification-do-not-disturb-efl
+ln -sf /usr/bin/ug-client %{buildroot}/usr/apps/ug-setting-notification-efl/bin/ug-setting-notification-app-notifications-efl
+
 
+#mkdir -p %{buildroot}/usr/ug/bin
+#ln -sf /usr/bin/ug-client %{buildroot}/usr/ug/bin/ug-setting-notification-efl
 
-mkdir -p %{buildroot}/usr/apps/%{name}/res
+mkdir -p %{buildroot}/usr/apps/ug-setting-notification-efl/res
 
 %post -n %{name} -p /sbin/ldconfig
 
@@ -97,11 +96,9 @@ mkdir -p %{buildroot}/usr/apps/%{name}/res
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_prefix}/apps/%{name}/*
-%{link_path}/*
 %{_prefix}/share/packages/%{name}.xml
-/etc/smack/accesses.d/%{name}.efl
 %{_datarootdir}/license/%{name}
-%{_datadir}/icons/default/small/%{name}.png
+%{_datadir}/icons/default/small/ug-setting-notification-efl.png
 
-/usr/apps/%{name}/res/locale/*/LC_MESSAGES/*
+/usr/apps/ug-setting-notification-efl/res/locale/*/LC_MESSAGES/*
 
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 1212b5c..0000000
--- a/run.sh
+++ /dev/null
@@ -1,377 +0,0 @@
-#!/bin/bash
-
-usage()
-{
-echo "
-usage: sh run.sh [-h] [-b] [-i] [-r] [-t] [-d] [-A ARCH]
-                 [--help] [--build] [--install] [--run] [--test] [--debug] [--arch ARCH]
-
-optional arguments:
-  -h, --help             show this help message and exit
-
-action:
-  -b  --build           build project
-  -i, --install         install to device or emulator
-  -r, --run             run application. Don't use with -t option
-  -t, --test            builds unit-tests as well, ignored without -b option
-  -d, --debug           install debuginfo and debugsource packages
-  -l, --local		local incremental build(with --noinit --incremental kwys)
-
-build configuration options:
-  -A ARCH, --arch ARCH   build target arch. Default - armv7l
-  -b 'Keys', --build 'Keys'  build project with additional gbs build keys
-
-  examples:
-  'run.sh -b -t -i -A armv7l' will build application and try to install it to target-device, unit-tests will be also built
-  'run.sh -i -A armv7l[i586|aarch64]' will install latest build for tizen-2.4 device [emulator|tizen-3.0 device]
-"
-}
-
-##-------------- check options --------------##
-
-if [ -z "$1" ]; then usage; exit 0; fi
-
-BUILDOPTION=false
-BUILDKEYS=""
-INSTALLOPTION=false
-RUNOPTION=false
-DEBUGOPTION=false
-TESTOPTION=false
-PLATFORM=armv7l
-LOCALBUILD=false
-
-SHORTOPTS="hA:b::irdtl"
-LONGOPTS="arch:,build::,install,run,debug,test,help,local"
-SCRIPTNAME=`basename $0`
-
-ARGS=$(getopt -q --options "$SHORTOPTS" --longoptions "$LONGOPTS" --name $SCRIPTNAME -- "$@")
-
-while true; do
-   case $1 in
-      -h|--help)
-         usage
-         exit 0
-         ;;
-      -A|--arch)
-         val=`echo $2 | sed -e "s/-//g"`
-         if echo "$SHORTOPTS$LONGOPTS" | grep -q "$val"; then
-           echo "Wrong ARCH"
-           usage
-           exit 0;
-         fi
-         PLATFORM=$2
-         shift
-         ;;
-      -b|--build)
-         BUILDOPTION=true
-         key=`echo $2 | sed -e "s/-//g"`
-         if ! echo "$SHORTOPTS$LONGOPTS" | grep -q "$key"; then
-           BUILDKEYS=$2
-           shift
-         fi
-         ;;
-      -i|--install)
-         INSTALLOPTION=true
-         ;;
-      -r|--run)
-         RUNOPTION=true
-         ;;
-      -d|--debug)
-         DEBUGOPTION=true
-         ;;
-      -t|--test)
-         TESTOPTION=true
-         ;;
-      -l|--local)
-         LOCALBUILD=true
-         ;;
-      --)
-         break
-         ;;
-      *)
-         if [ ! -z "$1" ]; then usage; exit 0; fi
-         break
-         ;;
-   esac
-   shift
-done
-
-echo "BUILDOPTION=$BUILDOPTION"
-echo "BUILDKEYS=$BUILDKEYS"
-echo "INSTALLOPTION=$INSTALLOPTION"
-echo "RUNOPTION=$RUNOPTION"
-echo "DEBUGOPTION=$DEBUGOPTION"
-echo "TESTOPTION=$TESTOPTION"
-echo "PLATFORM=$PLATFORM"
-
-##------------- project config -------------##
-
-PREFIX="org.tizen"
-INSTALLDIR=/usr/apps
-SDB=~/tizen-sdk/tools/sdb
-TEMPDIR=/home/rpms # for keeping rpm packages on device
-GBSROOT=~/GBS-ROOT
-
-##------------------ spec ------------------##
-
-spec_file=`find -name *.spec`
-
-# org.tizen.message
-APPNAME=`cat "$spec_file" | grep ^Name    | awk '{print $2}'`
-# 0.8.52
-VERSION=`cat "$spec_file" | grep ^Version | awk '{print $2}'`
-# 1
-RELEASE=`cat "$spec_file" | grep ^Release | awk '{print $2}'`
-# message
-BINNAME=`echo $APPNAME | sed "s/$PREFIX\.//"`
-
-RPMSPATH=$GBSROOT/local/BUILD-ROOTS/scratch.$PLATFORM.0/home/abuild/rpmbuild/RPMS/$PLATFORM
-
-DEBUGSOURCEPKGNAME=$APPNAME-debugsource-$VERSION-$RELEASE.$PLATFORM
-DEBUGINFOPKGNAME=$APPNAME-debuginfo-$VERSION-$RELEASE.$PLATFORM
-
-##-----------------------------------------##
-
-hasPrefix()
-{
-  if echo "$1" | grep -q "$PREFIX"; then
-    return 0;
-  else
-    return 1;
-  fi
-}
-
-##--------------- sdb shell ---------------##
-
-SdbShell()
-{
-  ShowMessage "$1" yellow
-  $SDB shell su -c "$1"
-}
-
-##--------------- color echo --------------##
-
-# arguments:
-# $1 - message text
-# $2 - text color (red, green, blue, yellow). Default value - blue
-
-ShowMessage()
-{
-    case "$2" in
-    "green")
-      color="32m"
-      ;;
-    "red")
-      color="31m"
-      ;;
-    "blue")
-      color="34m"
-      ;;
-    "yellow")
-      color="33m"
-      ;;
-    *)
-      color="34m"
-      ;;
-    esac
-
-  echo "\033[1;"$color$1"\033[0m"
-}
-
-##----------- check connection ------------##
-
-checkConnection()
-{
-    sdbstate=$($SDB get-state)
-    if [ $sdbstate = "unknown" ]
-      then
-        ShowMessage "Connection error. Make sure that only one device or emulator is connected." red
-        exit 0
-    fi
-}
-
-##---------------- build ------------------##
-
-build()
-{
-    ShowMessage "Building application..."
-
-    gbsoutput="gbsoutput.log"
-
-    if [ $LOCALBUILD = "true" ];
-    then
-      BUILDKEYS="$BUILDKEYS --noinit --incremental"
-    fi
-
-    if [ $TESTOPTION = "true" ];
-    then
-      BUILDKEYS+=" --define 'TEST%20ON'"
-    fi
-
-    ShowMessage "gbs -v -d build -B $GBSROOT -A $PLATFORM --include-all --keep-packs $BUILDKEYS"
-    gbs -v -d build -B $GBSROOT -A $PLATFORM --include-all --keep-packs $BUILDKEYS 2>&1 | tee $gbsoutput
-
-    if cat "$gbsoutput" | grep -q "gbs:info: Done"; then
-      ShowMessage "Build successfull!" green
-      rm -f $gbsoutput;
-    else
-      ShowMessage "Build failed!" red
-      rm -f $gbsoutput
-      exit 0;
-    fi
-}
-
-##-----------------------------------------##
-
-# figure out which packages need to be installed
-
-initPackageList()
-{
-    packages_count=`cat "$spec_file" | grep -c %package`
-
-    # if packages count more then 1
-    if [ $packages_count -gt 1 ]
-      then
-        ShowMessage "When building the project is generated $packages_count (+ debuginfo and debugsource) RPM packages"
-        # case of multipackage project
-        PACKAGELIST=`cat "$spec_file" | grep %package | sed 's/-n//' |awk '{print $2}'`
-      else
-        ShowMessage "one package"
-        # only one package into package list
-        PACKAGELIST=$APPNAME
-    fi
-}
-
-##------------ Uninstalling ---------------##
-
-uninstall()
-{
-    ShowMessage "Stopping old application..."
-    SdbShell "pkill -f $APPNAME"
-
-    for current_package in $PACKAGELIST
-    do
-      ShowMessage "Uninstalling old application $current_package..."
-      if hasPrefix $current_package; then
-        # uninstall with pkgcmd
-        SdbShell "pkgcmd -q -u -n $current_package"
-      else
-        # uninstall with rpm
-        SdbShell "rpm -e --nodeps $current_package-*"
-      fi
-    done
-
-    if [ $DEBUGOPTION = "true" ]
-      then
-        SdbShell "rpm -e --nodeps $APPNAME-debugsource-*"
-        SdbShell "rpm -e --nodeps $APPNAME-debuginfo-*"
-    fi
-}
-
-##-------------- Pushing ------------------##
-
-push()
-{
-    SdbShell "mkdir -p $TEMPDIR/"
-
-    for current_package_name in $PACKAGELIST
-    do
-      current_package=$current_package_name-$VERSION-$RELEASE.$PLATFORM.rpm
-      ShowMessage "Pushing the package $current_package to device ..."
-      $SDB push $RPMSPATH/$current_package $TEMPDIR/
-    done
-
-    if [ $DEBUGOPTION = "true" ]
-      then
-        $SDB push $RPMSPATH/$DEBUGSOURCEPKGNAME.rpm $TEMPDIR/
-        $SDB push $RPMSPATH/$DEBUGINFOPKGNAME.rpm $TEMPDIR/
-    fi
-}
-
-##------------- Installing ----------------##
-
-install()
-{
-    for current_package_name in $PACKAGELIST
-    do
-      current_package=$current_package_name-$VERSION-$RELEASE.$PLATFORM.rpm
-      ShowMessage "Installing the package $current_package ..."
-      #$SDB install $RPMSPATH/$current_package
-      #if hasPrefix $current_package; then
-        # install with pkgcmd
-        #SdbShell "pkgcmd -q -i -t rpm -p $TEMPDIR/$current_package"
-      #else
-        # uninstall with rpm
-        SdbShell "rpm -ivh --force --nodeps $TEMPDIR/$current_package"
-      #fi
-    done
-
-    if [ $DEBUGOPTION = "true" ]
-      then
-        ShowMessage "Installing the package $DEBUGINFOPKGNAME.rpm ..."
-        SdbShell "rpm -i $TEMPDIR/$DEBUGINFOPKGNAME.rpm"
-        ShowMessage "Installing the package $DEBUGSOURCEPKGNAME.rpm ..."
-        SdbShell "rpm -i $TEMPDIR/$DEBUGSOURCEPKGNAME.rpm"
-    fi
-
-    SdbShell "pkg_initdb"
-}
-
-##--------------- Running ----------------##
-
-run()
-{
-  if hasPrefix $APPNAME; then
-    ABSOLUTEPATHTOAPP=$INSTALLDIR/$APPNAME/bin/$BINNAME
-  else
-    fullappname=`echo $APPNAME | sed "s/^/$PREFIX\./"`
-    ABSOLUTEPATHTOAPP=$INSTALLDIR/$fullappname/bin/$BINNAME
-  fi
-
-  if  [ $1 = "tests" ]
-    then
-      TESTAPP=$ABSOLUTEPATHTOAPP-test
-      # todo: stop old test-run
-      ShowMessage "running the $TESTAPP..."
-      SdbShell "$TESTAPP"
-    else
-      SdbShell "pkill -f $APPNAME"
-      ShowMessage "running the $ABSOLUTEPATHTOAPP..."
-      SdbShell "$ABSOLUTEPATHTOAPP"
-  fi
-}
-
-##-----------------------------------------##
-
-installApp()
-{
-  checkConnection
-  initPackageList
-
-  $SDB root on
-  #uninstall
-  push
-  install
-
-  $SDB root off
-}
-
-runApp()
-{
-  checkConnection
-  run
-}
-
-runTest()
-{
-  checkConnection
-  run tests
-}
-
-##------------------ main -----------------##
-
-if [ $BUILDOPTION = "true" ]; then build; fi
-if [ $INSTALLOPTION = "true" ]; then installApp; fi
-if [ $RUNOPTION = "true" ]; then runApp; fi
-
-##-----------------------------------------##
diff --git a/ug-setting-notification-efl.efl b/ug-setting-notification-efl.efl
deleted file mode 100755
index ed15be0..0000000
--- a/ug-setting-notification-efl.efl
+++ /dev/null
@@ -1,57 +0,0 @@
-org.tizen.ug-setting-notification-efl system::use_internet r----l ------
-org.tizen.ug-setting-notification-efl org.tizen.pwlock rwx--l ------
-org.tizen.ug-setting-notification-efl org.tizen.oma-dm r-x--l ------
-org.tizen.ug-setting-notification-efl notification::db rw---l ------
-org.tizen.ug-setting-notification-efl dbus rwx--l ------
-org.tizen.ug-setting-notification-efl immvibed rw---l ------
-org.tizen.ug-setting-notification-efl svi-data r-x--l ------
-org.tizen.ug-setting-notification-efl sound_server rw---- ------
-org.tizen.ug-setting-notification-efl email-service --x--- ------
-org.tizen.ug-setting-notification-efl xorg rw---- ------
-org.tizen.ug-setting-notification-efl isf r-x--- ------
-org.tizen.ug-setting-notification-efl stest-service -w---- ------
-org.tizen.ug-setting-notification-efl libslp-alarm::db rw---- ------
-org.tizen.ug-setting-notification-efl data-provider-master::notification rw---l ------
-org.tizen.ug-setting-notification-efl data-provider-master::notification.client -w---- ------
-org.tizen.ug-setting-notification-efl data-provider-master rw---l ------
-org.tizen.ug-setting-notification-efl device::app_logging rw---l ------
-org.tizen.ug-setting-notification-efl device::sys_logging rw---l ------
-dbus org.tizen.ug-setting-notification-efl rwx--- ------
-org.tizen.ug-setting-notification-efl felicalock r----l ------
-org.tizen.ug-setting-notification-efl org.tizen.music-player r----l ------
-org.tizen.ug-setting-notification-efl org.tizen.voicerecorder r----l ------
-org.tizen.ug-setting-notification-efl csc-feature r----l ------
-org.tizen.ug-setting-notification-efl tts-server rwx--l ------
-org.tizen.ug-setting-notification-efl pkgmgr::db rw---l ------
-org.tizen.ug-setting-notification-efl aul::launch --x--- ------
-org.tizen.ug-setting-notification-efl bt-service::admin -wx--- ------
-org.tizen.ug-setting-notification-efl org.tizen.music-live-share r----l ------
-org.tizen.ug-setting-notification-efl app-svc::db rw---l ------
-org.tizen.ug-setting-notification-efl media-data::db rw---- ------
-org.tizen.ug-setting-notification-efl org.tizen.videos r----l ------
-org.tizen.ug-setting-notification-efl org.tizen.setting::default-resources rwx--l ------
-org.tizen.ug-setting-notification-efl system::media rwxat- ------
-org.tizen.ug-setting-notification-efl system::ext_storage rwxat- ------
-org.tizen.ug-setting-notification-efl lockscreen_setting::resources rwx--- ------
-org.tizen.ug-setting-notification-efl alarm-server::alarm rwx--l ------
-org.tizen.ug-setting-notification-efl system::homedir rwxat- ------
-org.tizen.ug-setting-notification-efl system::share rwxat- ------
-org.tizen.ug-setting-notification-efl pulseaudio rwxat- ------
-e17 org.tizen.ug-setting-notification-efl -w---- ------
-org.tizen.ug-setting-notification-efl sys-assert::core rwxat- ------
-org.tizen.ug-setting-notification-efl privacy-manager::db r----l ------
-org.tizen.ug-setting-notification-efl ecore::lock rwxat- ------
-ug-image-viewer-efl org.tizen.ug-setting-notification-efl rwx--- ------
-org.tizen.lockscreen org.tizen.ug-setting-notification-efl rwx--- ------
-org.tizen.homescreen org.tizen.ug-setting-notification-efl rwx--- ------
-org.tizen.ug-setting-notification-efl connman rw---- ------
-org.tizen.ug-setting-notification-efl connman::get rw---- ------
-org.tizen.ug-setting-notification-efl deviced::haptic rwx--- ------
-org.tizen.ug-setting-notification-efl org.tizen.indicator rwx--- ------
-org.tizen.ug-setting-notification-efl tizen::vconf::public::r rw---l ------
-org.tizen.ug-setting-notification-efl tizen::vconf::public::r::platform::rw rw---l ------
-org.tizen.ug-setting-notification-efl tizen::vconf::public::rw rw---l ------
-org.tizen.ug-setting-notification-efl tizen::vconf::platform::rw rw---l ------
-org.tizen.ug-setting-notification-efl tizen::vconf::setting rw---- ------
-User::App::org.tizen.setting User::Pkg::ug-setting-notification-efl::RO r-x--- ------
-User::App::org.tizen.setting ug-setting-notification-efl --x--- ------
\ No newline at end of file
diff --git a/ug-setting-notification-efl/CMakeLists.txt b/ug-setting-notification-efl/CMakeLists.txt
index d181b55..3450559 100755
--- a/ug-setting-notification-efl/CMakeLists.txt
+++ b/ug-setting-notification-efl/CMakeLists.txt
@@ -53,7 +53,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "${PROJECT_NAME}")
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PROJECT_NAME}.png DESTINATION /usr/share/icons/default/small/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.efl DESTINATION /etc/smack/accesses.d)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/ug-setting-notification-efl/lib/ug)