shortcuts: changed the shortcut for Power function

According to the version of OS or Platform, the previous shortcut
for Power function(Ctrl+Shift+F7) did not work well.
After performing tests on MacOS 10.10, 10.11, Ubuntu, Windows 7 and Windows 10,
I confirmed the new shorcut(Ctrl+shift+F8) operates correctly.

Change-Id: I0a12216a066cd46a604a5060ed88a75dda29c3bc
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
(cherry picked from commit afbc265908c2319d03e596bd9f568a5d96e56004)

diff --git a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
index f5973b20e4a5ff38696c81c483756d245a0e71fd..5dd11d01226ab163d219b027a43f20747b2491d0 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile-320x480-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="362" top="487" width="15" height="70"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="362" top="63" width="15" height="70"/>
@@ -79,7 +79,7 @@
                     <region left="486" top="3" width="70" height="15"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="63" top="3" width="70" height="15"/>
@@ -125,7 +125,7 @@
                     <region left="3" top="64" width="15" height="70"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="3" top="488" width="15" height="70"/>
@@ -171,7 +171,7 @@
                     <region left="64" top="362" width="70" height="15"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="488" top="362" width="70" height="15"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
index 4aa43a8b0f066399bffe3f535534c02a2550fd64..3c13b91b7ce57364c34a035d6f11b14c9e95d6d7 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="536" top="814" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="536" top="76" width="20" height="74"/>
@@ -79,7 +79,7 @@
                     <region left="813" top="0" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="75" top="0" width="74" height="20"/>
@@ -125,7 +125,7 @@
                     <region left="0" top="79" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="0" top="816" width="20" height="74"/>
@@ -171,7 +171,7 @@
                     <region left="78" top="534" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="816" top="534" width="74" height="20"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
index 0283978a072ef9ebf8360b4cd3fe5cd98973db3c..4b7a4f1d57d679366a4101a7b3ed9ecfed8143c5 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="595" top="974" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="595" top="75" width="20" height="74"/>
@@ -79,7 +79,7 @@
                     <region left="973" top="0" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="75" top="0" width="74" height="20"/>
@@ -125,7 +125,7 @@
                     <region left="0" top="79" width="20" height="74"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="0" top="976" width="20" height="74"/>
@@ -171,7 +171,7 @@
                     <region left="79" top="595" width="74" height="20"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="975" top="595" width="74" height="20"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
index 148e01d6dd4f121cdcd4af7763a41af4ca441f45..ad27c9d79ba34c2cbcf154a986b38b469941557c 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml
@@ -33,7 +33,7 @@
                     <region left="836" top="1304" width="24" height="96"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="836" top="103" width="24" height="96"/>
@@ -79,7 +79,7 @@
                     <region left="1303" top="0" width="96" height="24"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="103" top="0" width="96" height="24"/>
@@ -125,7 +125,7 @@
                     <region left="0" top="105" width="24" height="96"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="0" top="1305" width="24" height="96"/>
@@ -171,7 +171,7 @@
                     <region left="104" top="836" width="96" height="24"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
                 <key name="Volume +">
                     <region left="1304" top="836" width="96" height="24"/>

diff --git a/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml
index d47eb2052686e0fe2287d42c606d0295308d2ff9..f65a9e872fda020c297608d06a305f16ed8bd91f 100644 (file)
--- a/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml
+++ b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml
@@ -19,7 +19,7 @@
 
             <key name="Power">
                 <keycode>116</keycode>
-                <shortcut>Ctrl+Shift+F7</shortcut>
+                <shortcut>Ctrl+Shift+F8</shortcut>
             </key>
             <key name="Volume +">
                 <keycode>115</keycode>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
index 1f531823c67151138be51c3370eb8502f84275a1..1d7478d98e1e4b509ac24c05d2eb57609af8e744 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml
@@ -15,7 +15,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -31,7 +31,7 @@
                     <region left="116" top="0" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="0" top="244" width="12" height="80"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -63,7 +63,7 @@
                     <region left="244" top="372" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
index c21e56db72fee423a794364198f220067ee53e30..3ed2cbe14fae2c0b3252b889019dcec76d9336ae 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-360x360-1btn/layout.xml
@@ -15,7 +15,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -31,7 +31,7 @@
                     <region left="243" top="0" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="0" top="243" width="28" height="58"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -63,7 +63,7 @@
                     <region left="243" top="396" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
index d09e6f587d529c6c83f7dc5ef60e89e3b3a3b078..7cc78576b9b97f8bb13b9d4b130e06d074f689de 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml
@@ -15,7 +15,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -31,7 +31,7 @@
                     <region left="116" top="0" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="0" top="404" width="12" height="80"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -63,7 +63,7 @@
                     <region left="403" top="411" width="80" height="12"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/controller/key-window/layout.xml
index b542f0f848b69fcea18d878ac9328f2b64f437c9..67e4fe101763489e4f47aacd907c1e8b5f45bf14 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/controller/key-window/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/controller/key-window/layout.xml
@@ -6,7 +6,7 @@
             <key name="Power">
                 <keycode>116</keycode>
                 <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                <shortcut>Ctrl+Shift+F7</shortcut>
+                <shortcut>Ctrl+Shift+F8</shortcut>
             </key>
         </keyList>
     </form>

diff --git a/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
index c3af850d2f927aaec349e4adcdae5aa5e274eed2..81e0688a62e09fa99adcd626281c5c86ee1f3d82 100644 (file)
--- a/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearable/wearableO-360x360-2btn/layout.xml
@@ -23,7 +23,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -47,7 +47,7 @@
                     <region left="363" top="0" width="36" height="32"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -71,7 +71,7 @@
                     <region left="0" top="145" width="32" height="36"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -95,7 +95,7 @@
                     <region left="145" top="368" width="36" height="32"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>

diff --git a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
index 0d44b5bed8754caaf4fac6f60bae95e546613c21..a1129761b8907134e0fb9a1524df644ad4f23879 100644 (file)
--- a/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
+++ b/tizen/src/ui/resource/skins/wearableO-360x360-1btn/layout.xml
@@ -17,7 +17,7 @@
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
                     <!-- shortcut: on MacOSX, "Ctrl" means not Command key but Control key -->
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -35,7 +35,7 @@
                     <region left="243" top="0" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -53,7 +53,7 @@
                     <region left="0" top="243" width="28" height="58"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>
@@ -71,7 +71,7 @@
                     <region left="243" top="396" width="58" height="28"/>
                     <keycode>116</keycode>
                     <tooltip>Power</tooltip>
-                    <shortcut>Ctrl+Shift+F7</shortcut>
+                    <shortcut>Ctrl+Shift+F8</shortcut>
                 </key>
             </keyList>
         </form>