commit f9d818d2eb40df93fc078eef0894c889639f86b1
author Dees Troy <dees_troy@teamw.in> Fri Jan 09 23:10:49 2015 +0100
committer Gerrit Code Review <gerrit2@gerrit> Fri Jan 09 23:10:49 2015 +0100
tree fac27a67963ccb2b9c7bd9431225799ce1cf5e76
parent 0d47eb5686d60003759d93165fcadb5f3dfb6b6a
parent 8360a3438487f70cd78896a09a4ac5ff458b5f09

Merge "Use power button to go back in watch themes" into android-5.0

gui/devices/240x240/res/ui.xml

diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml
index 7448ae5..f1cd461 100644
--- a/gui/devices/240x240/res/ui.xml
+++ b/gui/devices/240x240/res/ui.xml
@@ -273,7 +273,7 @@
 
 			<object type="action">
 				<touch key="power" />
-				<action function="overlay">lock</action>
+				<action function="key">back</action>
 			</object>
 
 			<object type="action">

gui/devices/280x280/res/ui.xml

diff --git a/gui/devices/280x280/res/ui.xml b/gui/devices/280x280/res/ui.xml
index ae8c27d..24e6e4c 100644
--- a/gui/devices/280x280/res/ui.xml
+++ b/gui/devices/280x280/res/ui.xml
@@ -273,7 +273,7 @@
 
 			<object type="action">
 				<touch key="power" />
-				<action function="overlay">lock</action>
+				<action function="key">back</action>
 			</object>
 
 			<object type="action">

gui/devices/320x320/res/ui.xml

diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
index 4a03855..6558d0b 100644
--- a/gui/devices/320x320/res/ui.xml
+++ b/gui/devices/320x320/res/ui.xml
@@ -273,7 +273,7 @@
 
 			<object type="action">
 				<touch key="power" />
-				<action function="overlay">lock</action>
+				<action function="key">back</action>
 			</object>
 
 			<object type="action">