From 9cccc7029981e1fd5b621c64246430491d85bb05 Mon Sep 17 00:00:00 2001 From: "taekeun.kang" Date: Tue, 15 Mar 2016 16:30:09 +0900 Subject: [PATCH] [WebDeviceAPI] Fix wrong links Change-Id: I7fe14913962339cdbc047980b200db135edb71d2 Signed-off-by: taekeun.kang --- org.tizen.guides/html/index.htm | 40 +++++++-------- .../web/tizen/multimedia/media_controller_w.htm | 3 +- .../web/tizen/multimedia/multimedia_guide_w.htm | 7 ++- .../tizen/{multimedia => system}/media_key_w.htm | 0 .../html/web/tizen/system/system_guide_w.htm | 3 +- org.tizen.guides/index.xml | 34 ++++++------ org.tizen.tutorials/html/index.htm | 60 +++++++++++----------- .../multimedia/media_controller_tutorial_w.htm | 3 +- .../tizen/multimedia/multimedia_tutorials_w.htm | 7 ++- .../media_key_tutorial_w.htm | 0 .../html/web/tizen/system/system_tutorials_w.htm | 3 +- org.tizen.tutorials/index.xml | 34 ++++++------ .../html/device_api/mobile/index.html | 16 +++--- .../html/device_api/wearable/index.html | 22 ++++---- org.tizen.web.apireference/html/index.htm | 12 +++-- org.tizen.web.apireference/index.xml | 6 +-- 16 files changed, 127 insertions(+), 123 deletions(-) rename org.tizen.guides/html/web/tizen/{multimedia => system}/media_key_w.htm (100%) rename org.tizen.tutorials/html/web/tizen/{multimedia => system}/media_key_tutorial_w.htm (100%) diff --git a/org.tizen.guides/html/index.htm b/org.tizen.guides/html/index.htm index 2774d6e..811be71 100644 --- a/org.tizen.guides/html/index.htm +++ b/org.tizen.guides/html/index.htm @@ -34,6 +34,7 @@
  • Tizen
    • +
  • Account
  • Application Framework -
    • +
  • Content
    • -
  • Messaging +
  • Messaging
  • Multimedia
  • Network @@ -79,9 +79,19 @@
  • Secure Element
    • +
  • Social + +
  • System
    • -
  • Account
    • -
  • Social - -
  • Localization
  • Service Application
  • IME Application
    • - +
  • W3C/HTML5/Supplementary Features
      diff --git a/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm b/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm index 9626314..e03fb94 100644 --- a/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm +++ b/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm @@ -16,7 +16,7 @@ diff --git a/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm b/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm index b6dd38c..1f2e807 100644 --- a/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm +++ b/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm @@ -31,18 +31,17 @@

      Multimedia

      -

      Multimedia features include managing the EXIF information, media keys, device sound volume, FM radio, and media controller.

      +

      Multimedia features include managing the EXIF information, device sound volume, FM radio, and media controller.

      The main multimedia features are:

        -
      • Exif

        Enables you to access and modify EXIF information in a JPEG file.

        • -
      • Media Key

        Enables you to handle media keys in your application.

        • +
      • Exif

        Enables you to access and modify EXIF information in a JPEG file.

        • +
      • Media Controller

        Enables you to communicate between the media controller server and client.

      • Sound

        Enables you to control the volume level of several sound types and get information about the current sound mode and the state of the current sound devices.

      The following guides apply in mobile applications only:

      • FM Radio

        Enables you to access and control the device FM radio.

        • -
      • Media Controller

        Enables you to communicate between the media controller server and client.

      diff --git a/org.tizen.guides/html/web/tizen/multimedia/media_key_w.htm b/org.tizen.guides/html/web/tizen/system/media_key_w.htm similarity index 100% rename from org.tizen.guides/html/web/tizen/multimedia/media_key_w.htm rename to org.tizen.guides/html/web/tizen/system/media_key_w.htm diff --git a/org.tizen.guides/html/web/tizen/system/system_guide_w.htm b/org.tizen.guides/html/web/tizen/system/system_guide_w.htm index d00e9ca..3cd82a3 100644 --- a/org.tizen.guides/html/web/tizen/system/system_guide_w.htm +++ b/org.tizen.guides/html/web/tizen/system/system_guide_w.htm @@ -36,7 +36,8 @@

      The main system features are:

      • Human Activity Monitor

        Enables you to access the human activity data from various sensors on the device.

        • -
      • Power

        Enables you to access the state of the device power resource.

        • +
      • Media Key

        Enables you to handle media keys in your application.

        • +
      • Power

        Enables you to access the state of the device power resource.

      • Sensor

        Enables you to manage sensor data from various sensors on the device.

      • System Information

        Enables you to access and monitor various device details, such as battery level, available device storage, version number, model name, and the cellular network being used.

      • System Setting

        Enables you to access the device wallpaper settings, such as the home screen and lock screen wallpaper image, incoming call ringtone, and email notification tone.

        • diff --git a/org.tizen.guides/index.xml b/org.tizen.guides/index.xml index 2e733b1..42fbc42 100644 --- a/org.tizen.guides/index.xml +++ b/org.tizen.guides/index.xml @@ -11,6 +11,7 @@ + @@ -18,34 +19,41 @@ + + - - - + - - + + - - - + + - + + + + + + + + + @@ -53,14 +61,6 @@ - - - - - - - - diff --git a/org.tizen.tutorials/html/index.htm b/org.tizen.tutorials/html/index.htm index f0aebbe..a9dce99 100644 --- a/org.tizen.tutorials/html/index.htm +++ b/org.tizen.tutorials/html/index.htm @@ -37,19 +37,20 @@
      • Tizen
      +
    • Account
    • Application Framework -
      • +
    • Content
    • Multimedia
    • Network @@ -89,7 +89,7 @@ -
      • +
    • NFC
      • +
    • Social + +
    • System
      • diff --git a/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm b/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm index fc96b62..d9122ca 100644 --- a/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm +++ b/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm @@ -18,7 +18,7 @@ diff --git a/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm b/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm index 128b0f7..0992d0f 100644 --- a/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm +++ b/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm @@ -35,15 +35,14 @@

      The multimedia tutorials demonstrate how to use the following features in creating Tizen Web applications:

      -

      The following tutorials apply in mobile applications only:

      +

      The following tutorials apply in mobile applications only:

      diff --git a/org.tizen.tutorials/html/web/tizen/multimedia/media_key_tutorial_w.htm b/org.tizen.tutorials/html/web/tizen/system/media_key_tutorial_w.htm similarity index 100% rename from org.tizen.tutorials/html/web/tizen/multimedia/media_key_tutorial_w.htm rename to org.tizen.tutorials/html/web/tizen/system/media_key_tutorial_w.htm diff --git a/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm b/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm index 54f5d14..6815944 100644 --- a/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm +++ b/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm @@ -35,7 +35,8 @@

      The system tutorials demonstrate how to use the following features in creating Tizen Web applications:

        -
      • Human Activity Monitor: Retrieving User Activity Data from the Various Device Sensors

        Demonstrates how you can monitor user activity.

        • +
      • Human Activity Monitor: Retrieving User Activity Data from the Various Device Sensors

        Demonstrates how you can monitor user activity.

        • +
      • Media Key: Controlling Multimedia Playback

        Demonstrates how you can control multimedia playback.

      • Power: Controlling Power Resources

        Demonstrates how you can manage the minimum power state of a power resource.

      • Sensor: Getting Sensor Data from the Various Device Sensors

        Demonstrates how you can use the data from the device sensors.

      • System Information: Providing Information about the Device Display, Network, Storage, and Other Capabilities

        Demonstrates how you can retrieve and monitor device information and state.

        • diff --git a/org.tizen.tutorials/index.xml b/org.tizen.tutorials/index.xml index a5fc38c..0e34829 100644 --- a/org.tizen.tutorials/index.xml +++ b/org.tizen.tutorials/index.xml @@ -12,6 +12,7 @@ + @@ -32,17 +33,16 @@ - + - - + @@ -53,20 +53,6 @@ - - - - - - - - - - - - - - @@ -78,6 +64,20 @@ + + + + + + + + + + + + + + diff --git a/org.tizen.web.apireference/html/device_api/mobile/index.html b/org.tizen.web.apireference/html/device_api/mobile/index.html index 325bc04..1e6092b 100644 --- a/org.tizen.web.apireference/html/device_api/mobile/index.html +++ b/org.tizen.web.apireference/html/device_api/mobile/index.html @@ -160,7 +160,7 @@ This API provides interfaces and methods for manipulating Exif data from JPEG file. 2.3 Mandatory - Yes + Yes FM Radio @@ -177,13 +177,6 @@ Mandatory Yes - - Media Key - This API provides a way to get notified when a media key has been pressed or released. - 2.3 - Optional - No - Sound This API provides a way to control the volume level for several sound types and to check whether a specified sound device type is connected. @@ -271,6 +264,13 @@ Optional Yes
        Only HRM
        + + Media Key + This API provides a way to get notified when a media key has been pressed or released. + 2.3 + Optional + No + Power This API provides interfaces and methods for controlling power resources. diff --git a/org.tizen.web.apireference/html/device_api/wearable/index.html b/org.tizen.web.apireference/html/device_api/wearable/index.html index 516c280..26281d2 100644 --- a/org.tizen.web.apireference/html/device_api/wearable/index.html +++ b/org.tizen.web.apireference/html/device_api/wearable/index.html @@ -133,9 +133,9 @@ Exif This API provides interfaces and methods for manipulating Exif data from JPEG file. 2.3.1 - Mandatory Yes + Media Controller This API provides functions for communication between the media controller server and the media controller client. @@ -144,15 +144,7 @@ Yes - - Media Key - This API provides a way to get notified when a media key has been pressed or released. - 2.3 - - Optional - No - - + Sound This API provides a way to control the volume level for several sound types and to check whether a specified sound device type is connected. 2.3 @@ -192,7 +184,15 @@ Optional Yes
        Only HRM
        - + + Media Key + This API provides a way to get notified when a media key has been pressed or released. + 2.3 + + Optional + No + + Power This API provides interfaces and methods for controlling power resources. 2.0 diff --git a/org.tizen.web.apireference/html/index.htm b/org.tizen.web.apireference/html/index.htm index 5a337da..16ae5c5 100644 --- a/org.tizen.web.apireference/html/index.htm +++ b/org.tizen.web.apireference/html/index.htm @@ -45,7 +45,7 @@
      • Application
      • Badge
      • Data Control
        • -
      • Input Device
        • +
      • Input Device
      • Message Port
      • Notification
      • Package
        • @@ -76,7 +76,6 @@
      • Exif
      • FM Radio
      • Media Controller
        • -
      • Media Key
      • Sound
      @@ -92,6 +91,7 @@
    • System +
  • Application Framework
    • @@ -128,14 +130,13 @@
  • Messaging
  • Multimedia
    • @@ -149,6 +150,7 @@
  • System
    • Human Activity Monitor
      • +
    • Media Key
    • Power
    • Sensor
    • System Information
      • diff --git a/org.tizen.web.apireference/index.xml b/org.tizen.web.apireference/index.xml index 767af78..6366bda 100644 --- a/org.tizen.web.apireference/index.xml +++ b/org.tizen.web.apireference/index.xml @@ -39,10 +39,9 @@ - + - @@ -63,6 +62,7 @@ + @@ -102,7 +102,6 @@ - @@ -114,6 +113,7 @@ + -- 2.7.4