Revert "[3.0] Add TV profile default theme"

This reverts commit 65b1078a8b7092ae488138c41fb66164c94e2929.

Change-Id: If43ef9b422ca9749c08d8882deae3744939d39f9

diff --git a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
deleted file mode 100644 (file)
index a6ded0d..0000000
--- a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * This file is part of Dali Toolkit
- *
- * 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.
- */
-
-
-//******************************************************************************
-//
-// Default Reference style theme for a 1920x1080 resolution, The values determined by UX design specification.
-// This file can be copied to a new folder within the styles/ directory and amended with new default values.
-// Can be overriden if StyleManager applies another style sheet.
-//
-//******************************************************************************
-
-{
-  "styles":
-  {
-    "textlabel":
-    {
-      "pointSize":108,
-      "enableAutoScroll":false,
-      "autoScrollLoopCount":2,
-      "autoScrollGap":50,
-      "autoScrollSpeed":80
-    },
-
-    "textlabelFontSize0":
-    {
-      "pointSize":84
-    },
-    "textlabelFontSize1":
-    {
-      "pointSize":96
-    },
-    "textlabelFontSize2":
-    {
-      "pointSize":108
-    },
-    "textlabelFontSize3":
-    {
-      "pointSize":120
-    },
-    "textlabelFontSize4":
-    {
-      "pointSize":132
-    },
-
-    "textfield":
-    {
-      "pointSize":120,
-      "primaryCursorColor":[0.0,0.72,0.9,1.0],
-      "secondaryCursorColor":[0.0,0.72,0.9,1.0],
-      "cursorWidth":6,
-      "selectionHighlightColor":[0.75,0.96,1.0,1.0],
-      "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
-      "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
-      "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
-    },
-
-    "textfieldFontSize0":
-    {
-      "pointSize":120
-    },
-    "textfieldFontSize1":
-    {
-      "pointSize":120
-    },
-    "textfieldFontSize2":
-    {
-      "pointSize":120
-    },
-    "textfieldFontSize3":
-    {
-      "pointSize":120
-    },
-    "textfieldFontSize4":
-    {
-      "pointSize":120
-    },
-    "textselectionpopup":
-    {
-      "popupMaxSize":[1700,100],
-      "optionDividerSize":[2,0],
-      "popupDividerColor":[0.23,0.72,0.8,0.11],
-      "popupIconColor":[1.0,1.0,1.0,1.0],
-      "popupPressedColor":[0.24,0.72,0.8,0.11],
-      "background": {
-        "rendererType": "image",
-        "url": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
-        },
-      "popupFadeInDuration":0.25,
-      "popupFadeOutDuration":0.25
-    },
-    "textselectionpopupbutton":
-    {
-      "label":
-      {
-        "pointSize":120,
-        "fontStyle":"{\"weight\":\"light\"}"
-      }
-    },
-    "textselectiontoolbar":
-    {
-      "enableOvershoot":true,
-      "scrollView":
-      {
-        "overshootAnimationSpeed":360.0,
-        "overshootSize":[1920.0,130.0]
-      }
-    },
-    "scrollview":
-    {
-      "overshootEffectColor":"B018",
-      "overshootAnimationSpeed":960.0,
-      "overshootSize":[1920.0,130.0]
-    },
-    "itemview":
-    {
-      "overshootEffectColor":"B018",
-      "overshootAnimationSpeed":960.0,
-      "overshootSize":[1920.0,130.0]
-    },
-    "texteditor":
-    {
-      "pointSize":120,
-      "primaryCursorColor":[0.0,0.72,0.9,1.0],
-      "secondaryCursorColor":[0.0,0.72,0.9,1.0],
-      "cursorWidth":6,
-      "selectionHighlightColor":[0.75,0.96,1.0,1.0],
-      "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
-      "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
-      "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
-    }
-  }
-}

diff --git a/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png b/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png
deleted file mode 100644 (file)
index 15c937a..0000000
Binary files a/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png and /dev/null differ

diff --git a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png b/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png
deleted file mode 100644 (file)
index 149becb..0000000
Binary files a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png and /dev/null differ

diff --git a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png b/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png
deleted file mode 100644 (file)
index 75035bc..0000000
Binary files a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png and /dev/null differ

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 150f775c9bed88e65482b2a437d0a8bc8c94c5e0..3da38ddf830491a7eb7e8bc44b6d78c8d841e31b 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -30,25 +30,19 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 # profile setup
 #############################
 
-%if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1}
-%define profile %{tizen_profile_name}
-%endif
-
-%if "%{profile}" == "mobile"
 %define dali_toolkit_profile MOBILE
 %define dali_style_folder 720x1280
 # dali_style to be provided by build system as with dali_toolkit_profile or by passing --define 'dali_style 470x800' to the rpm build command
-%endif
-
-%if "%{profile}" == "tv"
-%define dali_toolkit_profile TV
-%define dali_style_folder 1920x1080
-%endif
 
 %if "%{?dali_style}"
   %define dali_style_folder %{dali_style}
 %endif
 
+# Further resource locations profiles can be provided here otherwise MOBILE will be used
+%if "%{tizen_profile_name}" == "mobile"
+  %define dali_toolkit_profile MOBILE
+%endif
+
 %description
 The OpenGLES Canvas Core Library Toolkit - a set of controls that provide
 user interface functionality.