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

Proposed by Jonas G. Drange
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 42
Merged at revision: 40
Proposed branch: lp:~jonas-drange/gsettings-ubuntu-touch-schemas/orientation-lock
Merge into: lp:gsettings-ubuntu-touch-schemas
Diff against target: 30 lines (+14/-1)
1 file modified
schemas/com.ubuntu.touch.system.gschema.xml.in.in (+14/-1)
To merge this branch: bzr merge lp:~jonas-drange/gsettings-ubuntu-touch-schemas/orientation-lock
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
Review via email: mp+230499@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine, thanks

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

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
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

>
> 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.​

Revision history for this message
Sebastien Bacher (seb128) wrote :

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

review: Approve
Revision history for this message
Iain Lane (laney) wrote :

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> ]

Revision history for this message
Sebastien Bacher (seb128) wrote :

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)

43. By Jonas G. Drange

reinstate lock-rotation, describe it as deprecated

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1<schemalist gettext-domain="gsettings-ubuntu-touch-schemas">1<schemalist gettext-domain="gsettings-ubuntu-touch-schemas">
2 <enum id="com.ubuntu.system.ScreenOrientation">
3 <value value="0" nick="none"/>
4 <value value="1" nick="PrimaryOrientation"/>
5 <value value="2" nick="LandscapeOrientation"/>
6 <value value="3" nick="PortraitOrientation"/>
7 <value value="4" nick="InvertedLandscapeOrientation"/>
8 <value value="5" nick="InvertedPortraitOrientation"/>
9 </enum>
2 <schema id="com.ubuntu.touch.system" path="/com/ubuntu/touch/system/">10 <schema id="com.ubuntu.touch.system" path="/com/ubuntu/touch/system/">
3 <key name="rotation-lock" type="b">11 <key name="rotation-lock" type="b">
4 <default>false</default>12 <default>false</default>
5 <_summary>Lock rotation</_summary>13 <_summary>Lock rotation</_summary>
6 <_description>14 <_description>
7 Whether the device should change orientation when it is rotated.15 Deprecated.
8 </_description>16 </_description>
9 </key>17 </key>
18 <key name="orientation-lock" enum="com.ubuntu.system.ScreenOrientation">
19 <default>"none"</default>
20 <_summary>Orientation lock</_summary>
21 <_description>Locks orientation to a specific value.</_description>
22 </key>
10 <key name="auto-brightness" type="b">23 <key name="auto-brightness" type="b">
11 <default>false</default>24 <default>false</default>
12 <_summary>Automatic brightness</_summary>25 <_summary>Automatic brightness</_summary>

Subscribers

People subscribed via source and target branches