From 8d739e4bf4813e52ac7ffa3814f043a999e29a98 Mon Sep 17 00:00:00 2001 From: Editor Lionbridge Date: Wed, 13 Sep 2017 12:56:43 +0300 Subject: [PATCH] Unmerge table cells in Studio This is a manual cheryr pick from change #149055 in the tizen_3.0 branch. Also synched table information with tizen_3.0. Change-Id: I3f05128e18945c373c01d53bb8cb4e0976fb6b45 --- org.tizen.studio/html/common_tools/da_advanced.htm | 33 +- org.tizen.studio/html/common_tools/emulator.htm | 3 +- .../html/common_tools/emulator_control_panel.htm | 112 +++++-- .../html/native_tools/component_attributes_n.htm | 4 +- .../html/native_tools/manifest_text_editor_n.htm | 334 +++++++++++---------- .../html/native_tools/multiple_screen_n.htm | 2 +- 6 files changed, 272 insertions(+), 216 deletions(-) diff --git a/org.tizen.studio/html/common_tools/da_advanced.htm b/org.tizen.studio/html/common_tools/da_advanced.htm index 1913e54..5223aed 100644 --- a/org.tizen.studio/html/common_tools/da_advanced.htm +++ b/org.tizen.studio/html/common_tools/da_advanced.htm @@ -145,63 +145,53 @@ File - New - + New Ctrl + N Command + N - Load - + Load Ctrl + O Command + O - Save - + Save Ctrl + S Command + S - Exit - + Exit Ctrl + Q Command + Q Analyze - Start or stop trace - + Start or stop trace F5 Fn + F5 - Search - + Search Ctrl + F Command + F - Target - + Target Ctrl + T Command + T - Screenshot - + Screenshot F9 Fn + F9 - Preferences - + Preferences F10 Fn + F10 - Detail - + Detail Ctrl + H Command + H @@ -238,8 +228,7 @@ Help - How to use Dynamic Analyzer - + How to use Dynamic Analyzer F1 Fn + F1 diff --git a/org.tizen.studio/html/common_tools/emulator.htm b/org.tizen.studio/html/common_tools/emulator.htm index e163f22..d8bf7cd 100644 --- a/org.tizen.studio/html/common_tools/emulator.htm +++ b/org.tizen.studio/html/common_tools/emulator.htm @@ -623,12 +623,11 @@ $egrep -c '(vmx|svm)' /proc/cpuinfo - Category + Category Physical target Emulator - Telephony Call Calls and video calls are supported. Call waiting, outgoing call barring, and voice calls with the Emulator Control Panel are supported. diff --git a/org.tizen.studio/html/common_tools/emulator_control_panel.htm b/org.tizen.studio/html/common_tools/emulator_control_panel.htm index 6b2edfb..583ee04 100644 --- a/org.tizen.studio/html/common_tools/emulator_control_panel.htm +++ b/org.tizen.studio/html/common_tools/emulator_control_panel.htm @@ -645,211 +645,273 @@ timestamp, x, y, z telephony call dial - Yes - Yes + Yes + Yes telephony call dial <number> call hidden-dial + Yes + Yes telephony call hidden-dial <number> call connect + Yes + Yes telephony call connect call disconnect + Yes + Yes telephony call disconnect <call id> sms send + Yes + Yes telephony sms send <number> <text> sms set + Yes + Yes telephony sms set <available | unavailable> sms status + Yes + Yes telephony sms status sms mms_status + Yes + Yes telephony sms mms_status location set - Yes - Yes + Yes + Yes location set <longitude> <latitude> status + Yes + Yes location status stop + Yes + Yes location stop file + Yes + Yes location file <file-path> battery level - Yes - Yes + Yes + Yes battery level <percent> charger + Yes + Yes battery charger <on | off> status + Yes + Yes battery status earjack set - Yes - No + Yes + No earjack set <3wire | 4wire | off> status + Yes + No earjack status usb set - Yes - Yes + Yes + Yes usb set <on | off> status + Yes + Yes usb status rssi set - Yes - No + Yes + No rssi set <0~4> status + Yes + No rssi status sdcard attach - Yes - No + Yes + No sdcard attach <sdcard_[ 4 | 8 | 16 | 32 ]G> detach + Yes + No sdcard detach <sdcard_[ 4 | 8 | 16 | 32 ]G> status + Yes + No sdcard status - nfc + nfc tag attach - Yes - Yes + Yes + Yes nfc tag attach <tag type> <NDEF message> tag detach + Yes + Yes nfc tag detach p2p attach + Yes + Yes nfc p2p attach p2p send + Yes + Yes nfc p2p send <NDEF message> p2p detach + Yes + Yes nfc p2p detach status + Yes + Yes nfc status sensor accelerometer - Yes - Yes + Yes + Yes sensor accelerometer <x> <y> <z> gyroscope + Yes + Yes sensor gyroscope <x> <y> <z> magnetic + Yes + Yes sensor magnetic <x> <y> <z> proximity + Yes + Yes sensor proximity <value> light + Yes + Yes sensor light <value> pressure + Yes + Yes sensor pressure <level> uv + Yes + Yes sensor uv <level> hrm + Yes + Yes sensor hrm <level> pedometer + Yes + Yes sensor pedometer <state> status + Yes + Yes sensor status [sensor] file + Yes + Yes sensor file <sensor> <path> low_memory set - Yes - Yes + Yes + Yes low_memory set <hard-warning | soft-warning | normal> status + Yes + Yes low_memory status - - - - diff --git a/org.tizen.studio/html/native_tools/component_attributes_n.htm b/org.tizen.studio/html/native_tools/component_attributes_n.htm index bf95b0c..655e164 100644 --- a/org.tizen.studio/html/native_tools/component_attributes_n.htm +++ b/org.tizen.studio/html/native_tools/component_attributes_n.htm @@ -2009,15 +2009,17 @@ inverted - true or false + true or false elm_progressbar_inverted_set() disable + true or false elm_object_disabled_set() visible + true or false evas_object_show() diff --git a/org.tizen.studio/html/native_tools/manifest_text_editor_n.htm b/org.tizen.studio/html/native_tools/manifest_text_editor_n.htm index 1dbe20e..9cfa30d 100644 --- a/org.tizen.studio/html/native_tools/manifest_text_editor_n.htm +++ b/org.tizen.studio/html/native_tools/manifest_text_editor_n.htm @@ -366,55 +366,54 @@

  • 1

    • Expected children (in the following order):

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    Child elementOccurrences
    <author>1 (optional)
    <description>1 or more (optional)
    <profile>1 or more (optional)
    <ui-application>1 (optional)
    <service-application>1 (optional)
    <watch-application>1 (optional)
    <widget-application>1 (optional)
    <shortcut-list>1 (optional)
    <account>1 (optional)
    <privileges>1 (optional)
    <feature>1 or more (optional)
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Child elementOccurrences
    <author>1 (optional)
    <description>1 or more (optional)
    <profile>1 or more (optional)
    <ui-application>1 (optional)
    <service-application>1 (optional)
    <watch-application>1 (optional)
    <widget-application>1 (optional)
    <shortcut-list>1 (optional)
    <account>1 (optional)
    <privileges>1 (optional)
    <feature>1 or more (optional)

    Figure: Editing the <manifest> element in the manifest editor

    @@ -544,30 +543,29 @@ Occurrences -<label> + <label> 1 or more (optional) - + -<icon> + <icon> 1 or more (optional) - + -<app-control> + <app-control> 1 or more (optional) - + -<metadata> + <metadata> 1 or more (optional) - + -<datacontrol> + <datacontrol> 1 or more (optional) - + <background-category> 1 or more (optional) - - +

    Attributes:

    Expected children (in the following order):

    - - - - - - - +
    Child elementOccurrences
    <label>
    + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - +
    Child elementOccurrences
    <label> 1 or more (optional)
    <icon>
    <icon> 1 or more (optional)
    <app-control>
    <app-control> 1 or more (optional)
    <metadata>
    <metadata> 1 or more (optional)
    <datacontrol>
    <datacontrol> 1 or more (optional)
    <background-category>
    <background-category> 1 or more (optional)
    +

    Attributes:

    Expected children:

    - + +
    - - - + + + - + - + - + - + - - - + + + - - - - + + +
    Child elementOccurrences
    Child elementOccurrences
    <label><label> 1 or more
    <icon><icon> 1 or more
    <support-size>1
    <support-size>1
    <widget-class>1 or more (optional)
    <widget-class>1 or more (optional)
    +

    Attributes:

    Expected children:

    - - - - - - - + +
    Child elementOccurrences
    <label>
    + + + + + + - - - + + + - - - - - - + + + + +
    Child elementOccurrences
    <label> 1 or more
    <icon>
    <icon> 1 or more
    <support-size>1
    <support-size>1
    +

    Attributes:

    Expected children:

    - - - - - - - - - + +
    Child elementOccurrences
    <shortcut>1 or more
    + + + + + + + +
    Child elementOccurrences
    <shortcut>1 or more

    For example:

    @@ -994,20 +995,22 @@
  • 1 (optional)

    • Expected children:

    - - - - - - - + +
    Child elementOccurrences
    <icon>
    + + + + + + - - - + + + - +
    Child elementOccurrences
    <icon> 1 or more
    <label>
    <label> 1 or more
    +

    Attributes:

    Expected children:

    - - - - - - - - - +
    Child elementOccurrences
    <account-provider>1 or more
    + + + + + + + +
    Child elementOccurrences
    <account-provider>1 or more

    For example:

    @@ -1060,24 +1063,25 @@

    This element contains specific service provider or user account protocol-related information.

    Expected children:

    - - - - - - - +
    Child elementOccurrences
    <icon>
    + + + + + + - - - + + + - - - - - + + + + +
    Child elementOccurrences
    <icon> 1 or more
    <label>
    <label> 1 or more
    <capability>1 or more (optional)
    <capability>1 or more (optional)
    +

    Attributes:

    Expected children:

    - - - - - - - - - +
    Child elementOccurrences
    <privilege>1 or more (optional)
    + + + + + + + +
    Child elementOccurrences
    <privilege>1 or more (optional)

    For example:

    diff --git a/org.tizen.studio/html/native_tools/multiple_screen_n.htm b/org.tizen.studio/html/native_tools/multiple_screen_n.htm index e75ca60..2d28c97 100644 --- a/org.tizen.studio/html/native_tools/multiple_screen_n.htm +++ b/org.tizen.studio/html/native_tools/multiple_screen_n.htm @@ -96,7 +96,7 @@ Screen orientation Portrait - + - -- 2.7.4