Merge lp:~jonas-drange/gsettings-ubuntu-touch-schemas/orientation-lock into lp:gsettings-ubuntu-touch-schemas

[Jonas G. Drange]

[system] swap boolean rotation-lock for enumerated type orientation-lock

[system] swap boolean rotation-lock for enumerated type orientation-lock

[Sebastien Bacher (seb128)]

looks fine, thanks

review: Approve

[Sebastien Bacher (seb128)]

in fact the key you are dropping is used in ubuntu-system-settings, it should either be kept for the transition, or should do the setting side of the changes as well and land them together with updated depends

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

>
> in fact the key you are dropping is used in ubuntu-system-settings, it
> should either be kept for the transition, or should do the setting side of
> the changes as well and land them together with updated depends
>
> ​The latter was the plan. I am working on the branch in USS that points at
the new setting.​

[Sebastien Bacher (seb128)]

ok, setting as approved then, please make sure they go in the same silo though

review: Approve

[Iain Lane (laney)]

On Tue, Aug 12, 2014 at 03:26:55PM -0000, Sebastien Bacher wrote:
> Review: Needs Fixing
>
> in fact the key you are dropping is used in ubuntu-system-settings, it should either be kept for the transition, or should do the setting side of the changes as well and land them together with updated depends

You should Breaks: u-s-s (<= current-version) otherwise people can
upgrade the schemas while having a version of u-s-s which needs them.

Otherwise I'd just keep the old one for now and mark it as deprecated in
its description.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Sebastien Bacher (seb128)]

Note that we don't display that UI at the moment, so in might not create issue even on partial update (not sure if it tries to load/init it though, in which case it would make things unhappy)

[lp:~jonas-drange/gsettings-ubuntu-touch-schemas/orientation-lock]

43. By Jonas G. Drange on 2014-08-12

reinstate lock-rotation, describe it as deprecated

=== modified file 'schemas/com.ubuntu.touch.system.gschema.xml.in.in'
--- schemas/com.ubuntu.touch.system.gschema.xml.in.in	2014-01-27 10:37:56 +0000
+++ schemas/com.ubuntu.touch.system.gschema.xml.in.in	2014-08-12 18:00:22 +0000
@@ -1,12 +1,25 @@
 <schemalist gettext-domain="gsettings-ubuntu-touch-schemas">
+    <enum id="com.ubuntu.system.ScreenOrientation">
+      <value value="0" nick="none"/>
+      <value value="1" nick="PrimaryOrientation"/>
+      <value value="2" nick="LandscapeOrientation"/>
+      <value value="3" nick="PortraitOrientation"/>
+      <value value="4" nick="InvertedLandscapeOrientation"/>
+      <value value="5" nick="InvertedPortraitOrientation"/>
+    </enum>
     <schema id="com.ubuntu.touch.system" path="/com/ubuntu/touch/system/">
     <key name="rotation-lock" type="b">
       <default>false</default>
       <_summary>Lock rotation</_summary>
       <_description>
-	Whether the device should change orientation when it is rotated.
+    Deprecated.
       </_description>
     </key>
+    <key name="orientation-lock" enum="com.ubuntu.system.ScreenOrientation">
+      <default>"none"</default>
+      <_summary>Orientation lock</_summary>
+      <_description>Locks orientation to a specific value.</_description>
+    </key>
     <key name="auto-brightness" type="b">
       <default>false</default>
       <_summary>Automatic brightness</_summary>