Merge lp:~jonas-drange/gsettings-ubuntu-touch-schemas/phone-settings into lp:gsettings-ubuntu-touch-schemas

[Jonas G. Drange]

[touch/phone] add new schema for phone settings, populated with sim name and default settings

Hi,

this schema will let USS, Messaging app and Dialer app know what SIM to use for calls and messages. It will also let the user name each SIM.

Thanks

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/31/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

So what will the consumers do if the user empties the key or removes the ril_whatever entries?

[Jonas G. Drange (jonas-drange)]

On Thu, Jul 31, 2014 at 10:00 AM, Iain Lane <email address hidden>
wrote:

> So what will the consumers do if the user empties the key or removes the
> ril_whatever entries?
>
> I would ​show the subscriber number(s) or SIMS number.

And you mean what happens if the user fiddles with the schema itself? ​

[Iain Lane (laney)]

No, I was getting at the defaults thing. You called them immutable but any code will have to handle the empty or missing case anyway so I wonder why you don't make the default be empty - the current default seems kind of arbitrary.

[Jonas G. Drange (jonas-drange)]

On Thu, Jul 31, 2014 at 12:23 PM, Iain Lane <email address hidden>
wrote:

> No, I was getting at the defaults thing. You called them immutable but any
> code will have to handle the empty or missing case anyway so I wonder why
> you don't make the default be empty - the current default seems kind of
> arbitrary.

​True. I think my understanding of defaults is a bit too narrow. Let's
leave it out of the schema.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/32/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Thanks. I should have noticed earlier (Seb reminded me today). We're trying to move away from 'touch' in the namespaces (see sound). Could you call this com.ubuntu.phone please?

[Jonas G. Drange (jonas-drange)]

Yep, done.

[Sebastien Bacher (seb128)]

Thanks, there is a small spacing issue, looks fine otherwise

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/33/rebuild

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Fixed spacing issue.

[Iain Lane (laney)]

This looks good to me now, thanks

review: Approve

[Sebastien Bacher (seb128)]

Looks fine, ideally the description format would be consistent on the use of a "." but I'm not going to block on that (still if you want to change it, please do)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/34/rebuild

review: Approve (continuous-integration)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-02-24 12:01:25 +0000
+++ po/POTFILES.in	2014-07-31 14:19:31 +0000
@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this list in alphabetic order.
+schemas/com.ubuntu.phone.gschema.xml.in.in
 schemas/com.ubuntu.touch.network.gschema.xml.in.in
 schemas/com.ubuntu.touch.sound.gschema.xml.in.in
 schemas/com.ubuntu.touch.system.gschema.xml.in.in

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2014-02-24 12:01:58 +0000
+++ po/POTFILES.skip	2014-07-31 14:19:31 +0000
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings that should not be
 # translated.
 # Please keep this file sorted alphabetically.
+schemas/com.ubuntu.phone.gschema.xml.in
 schemas/com.ubuntu.touch.network.gschema.xml.in
 schemas/com.ubuntu.touch.sound.gschema.xml.in
 schemas/com.ubuntu.touch.system.gschema.xml.in

=== modified file 'schemas/Makefile.am'
--- schemas/Makefile.am	2014-02-24 11:36:24 +0000
+++ schemas/Makefile.am	2014-07-31 14:19:31 +0000
@@ -1,4 +1,5 @@
-desktop_gschemas_in_in = \ 
+desktop_gschemas_in_in = \
+	com.ubuntu.phone.gschema.xml.in.in         \
 	com.ubuntu.touch.network.gschema.xml.in.in \
 	com.ubuntu.touch.sound.gschema.xml.in.in   \
 	com.ubuntu.touch.system.gschema.xml.in.in  \
@@ -19,7 +20,7 @@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =				\
-	$(desktop_gschemas_in_in)	
+	$(desktop_gschemas_in_in)
 
 CLEANFILES =					\
 	$(gsettings_SCHEMAS)			\

=== added file 'schemas/com.ubuntu.phone.gschema.xml.in.in'
--- schemas/com.ubuntu.phone.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ schemas/com.ubuntu.phone.gschema.xml.in.in	2014-07-31 14:19:31 +0000
@@ -0,0 +1,17 @@
+<schemalist gettext-domain="gsettings-ubuntu-touch-schemas">
+    <schema id="com.ubuntu.phone" path="/com/ubuntu/phone/">
+        <key name="sim-names" type="a{ss}">
+            <_summary>Name per modem path</_summary>
+            <default>{}</default>
+            <_description>Mapping of modem paths to SIM names.</_description>
+        </key>
+        <key name="default-sim-for-calls" type="s">
+            <default>"ask"</default>
+            <_description>Default sim card to use for calls, defined by a modem path or "ask".</_description>
+        </key>
+        <key name="default-sim-for-messages" type="s">
+            <default>"ask"</default>
+            <_description>Default sim card to use for messages, defined by a modem path or "ask".</_description>
+        </key>
+    </schema>
+</schemalist>