[ACR-1068, ACR-1077] feature key related part updated(app_history, contextual_trigger...

PS2: Reviewed

Change-Id: I05ee70aabdc40296ec78541310544275215ffd8c
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/org.tizen.guides/html/native/device/system_n.htm b/org.tizen.guides/html/native/device/system_n.htm
index 4e0e56e..45f32a5 100644 (file)
--- a/org.tizen.guides/html/native/device/system_n.htm
+++ b/org.tizen.guides/html/native/device/system_n.htm
@@ -85,58 +85,58 @@
 </tr>
  <tr>
  <td><a href="#account">Account</a></td>
+ <td><a href="#fido">FIDO</a></td>
+ <td><a href="#media">Media</a></td>
+ <td><a href="#screen">Screen</a></td>
+ </tr>
+ <tr>
+ <td><a href="#apphistory">Application history</a></td>
+ <td><a href="#fmradio">FM radio</a></td>
+ <td><a href="#microphone">Microphone</a></td>
+ <td><a href="#sensor">Sensor</a></td>
+ </tr>
+ <tr>
+ <td><a href="#battery">Battery</a></td>
  <td><a href="#graphics">Graphics</a></td>
  <td><a href="#multimedia">Multimedia</a></td>
  <td><a href="#shell">Shell</a></td>
  </tr>
  <tr>
- <td><a href="#battery">Battery</a></td>
+ <td><a href="#camera">Camera</a></td>
  <td><a href="#ham">Human activity monitor</a></td>
  <td><a href="#multipoint">Multi-point touch</a></td>
  <td><a href="#sip">Sip</a></td>
  </tr>
  <tr>
- <td><a href="#camera">Camera</a></td>
+ <td><a href="#consumer">Consumer IR</a></td>
  <td><a href="#input">Input</a></td>
  <td><a href="#network">Network</a></td>
  <td><a href="#speech">Speech</a></td>
  </tr>
-  <tr>
- <td><a href="#consumer">Consumer IR</a></td>
+ <tr>
+ <td><a href="#trigger">Contextual trigger</a></td>
  <td><a href="#iot">IOT</a></td>
  <td><a href="#oauth2">OAuth 2.0</a></td>
  <td><a href="#systemsetting">System setting</a></td>
  </tr>
-  <tr>
+ <tr>
  <td><a href="#convergence">Convergence D2D</a></td>
  <td><a href="#led">LED</a></td>
  <td><a href="#opengl">OpenGL&reg; ES</a></td>
  <td><a href="#usb">USB</a></td>
  </tr>
-  <tr>
+ <tr>
  <td><a href="#database">Database</a></td>
  <td><a href="#location">Location</a></td>
  <td><a href="#platformfeat">Platform</a></td>
  <td><a href="#vision">Vision</a></td>
  </tr>
-  <tr>
+ <tr>
  <td><a href="#download">Download</a></td>
  <td><a href="#maps">Maps</a></td>
  <td><a href="#profile_feat">Profile</a></td>
  <td><a href="#web">Web</a></td>
  </tr>
-  <tr>
- <td><a href="#fido">FIDO</a></td>
- <td><a href="#media">Media</a></td>
- <td><a href="#screen">Screen</a></td>
- <td>-</td>
- </tr>
-  <tr>
- <td><a href="#fmradio">FM radio</a></td>
- <td><a href="#microphone">Microphone</a></td>
- <td><a href="#sensor">Sensor</a></td>
- <td>-</td>
- </tr>
 <tr>
  <th colspan="4"><a href="#system">System keys</a></th>
 </tr>
@@ -242,6 +242,23 @@ func(void)
    </tbody>
   </table>
 
+<p>The following table lists the application history feature keys.</p>
+ <p align="center" class="Table"><strong>Table: Application history feature keys</strong></p>
+ <table id="apphistory" border="1">
+   <tbody>
+    <tr>
+     <th>Key</th>
+        <th>Type</th>
+        <th>Description</th>
+    </tr>
+    <tr>
+       <td><code>http://tizen.org/feature/app_history</code></td>
+     <td><code>bool</code></td>
+        <td>The platform returns <code>true</code> for this key, if the device supports the application history feature.</td>
+    </tr>
+   </tbody>
+  </table>
+
 <p>The following table lists the battery feature keys.</p>
  <p align="center" class="Table"><strong>Table: Battery feature keys</strong></p>
 
@@ -312,6 +329,24 @@ func(void)
     </tr>
    </tbody>
   </table>
+
+<p>The following table lists the contextual trigger feature keys.</p>
+<p align="center" class="Table"><strong>Table: Contextual trigger feature keys</strong></p>
+<table id="trigger" border="1">
+   <tbody>
+    <tr>
+     <th>Key</th>
+        <th>Type</th>
+        <th>Description</th>
+    </tr>
+    <tr>
+       <td><code>http://tizen.org/feature/contextual_trigger</code></td>
+     <td><code>bool</code></td>
+        <td>The platform returns <code>true</code> for this key, if the device supports the contextual trigger feature.</td>
+    </tr>
+   </tbody>
+  </table>
+
 <p>The following table lists the convergence D2D feature keys.</p>
 <p align="center" class="Table"><strong>Table: Convergence D2D feature keys</strong></p>
 <table id="convergence" border="1">

diff --git a/org.tizen.training/html/native/details/app_filtering_n.htm b/org.tizen.training/html/native/details/app_filtering_n.htm
index 5e499a2..6ca7bce 100644 (file)
--- a/org.tizen.training/html/native/details/app_filtering_n.htm
+++ b/org.tizen.training/html/native/details/app_filtering_n.htm
@@ -186,6 +186,11 @@
         <th>Since</th>
     </tr>
 <tr>
+<td><code>http://tizen.org/feature/app_history</code></td>
+     <td>Specify this key, if the application requires the application history feature.</td>
+        <td>4.0</td>
+    </tr>
+<tr>
 <td><code>http://tizen.org/feature/camera</code></td>
      <td>Specify this key, if the application requires any kind of a camera.</td>
         <td>2.2.1</td>
@@ -216,6 +221,11 @@
         <td>3.0</td>
     </tr>
 <tr>
+<td><code>http://tizen.org/feature/contextual_trigger</code></td>
+     <td>Specify this key, if the application requires the contextual trigger feature.</td>
+        <td>4.0</td>
+    </tr>
+<tr>
 <td><code>http://tizen.org/feature/convergence.d2d</code></td>
      <td>Specify this key, if the application requires the Device-to-Device (D2D) Convergence feature, which provides the service to discover near-by devices and to communicate information and data to the remote devices.</td>
         <td>3.0</td>
@@ -906,6 +916,11 @@
         <th>Since</th>
     </tr>
 <tr>
+<td><code>http://tizen.org/feature/app_history</code></td>
+     <td>Specify this key, if the application requires the application history feature.</td>
+        <td>4.0</td>
+    </tr>
+<tr>
 <td><code>http://tizen.org/feature/camera</code></td>
      <td>Specify this key, if the application requires any kind of a camera.</td>
         <td>2.2.1</td>
@@ -936,6 +951,11 @@
         <td>3.0</td>
     </tr>
 <tr>
+<td><code>http://tizen.org/feature/contextual_trigger</code></td>
+     <td>Specify this key, if the application requires the contextual trigger feature.</td>
+        <td>4.0</td>
+    </tr>
+<tr>
 <td><code>http://tizen.org/feature/convergence.d2d</code></td>
      <td>Specify this key, if the application requires the Device-to-Device (D2D) Convergence feature, which provides the service to discover near-by devices and to communicate information and data to the remote devices.</td>
         <td>3.0</td>