diff options
| author | Garrett Brown <themagnificentmrb@gmail.com> | 2017-02-22 09:03:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 09:03:13 -0800 |
| commit | 12d383e44a219c05560b721cb9680e8628af5f5a (patch) | |
| tree | 707cf6bcb59d677c3567ddc661779b2f14a03fde | |
| parent | d877b8317567dfd956361e2e1bbfe3a3f4aa1e49 (diff) | |
| parent | 5bfcba368b62e1874cabb3d0b4131d37018779ee (diff) | |
Merge pull request #11692 from garbear/darwin-input-settings
[Darwin] Separate Apple Remote settings into new group
| -rw-r--r-- | system/settings/darwin.xml | 4 | ||||
| -rw-r--r-- | system/settings/darwin_ios.xml | 8 | ||||
| -rw-r--r-- | system/settings/darwin_osx.xml | 2 | ||||
| -rw-r--r-- | system/settings/settings.xml | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml index ea70c1aa8b..b948ed843d 100644 --- a/system/settings/darwin.xml +++ b/system/settings/darwin.xml @@ -23,7 +23,7 @@ </group> </category> <category id="input"> - <group id="2"> + <group id="3"> <setting id="input.appleremotemode" type="integer" label="13600" help="36416"> <level>1</level> <default>1</default> <!-- APPLE_REMOTE_STANDARD --> @@ -35,7 +35,7 @@ <option label="13613">3</option> <!-- APPLE_REMOTE_MULTIREMOTE --> </options> </constraints> - <control type="spinner" format="string"/> + <control type="list" format="string"/> </setting> <setting id="input.appleremotealwayson" type="boolean" label="13602" help="36417"> <level>4</level> diff --git a/system/settings/darwin_ios.xml b/system/settings/darwin_ios.xml index 0b561c305b..e7c41543ce 100644 --- a/system/settings/darwin_ios.xml +++ b/system/settings/darwin_ios.xml @@ -54,13 +54,15 @@ </setting> </group> <group id="2"> - <setting id="input.appleremotemode" type="integer" label="13600" help="36416"> + <setting id="input.enablemouse"> <visible>false</visible> </setting> - <setting id="input.appleremotesequencetime" type="integer" label="13603" help="36418"> + </group> + <group id="3"> + <setting id="input.appleremotemode" type="integer" label="13600" help="36416"> <visible>false</visible> </setting> - <setting id="input.enablemouse"> + <setting id="input.appleremotesequencetime" type="integer" label="13603" help="36418"> <visible>false</visible> </setting> </group> diff --git a/system/settings/darwin_osx.xml b/system/settings/darwin_osx.xml index c94ea80fc8..a81fe9a80a 100644 --- a/system/settings/darwin_osx.xml +++ b/system/settings/darwin_osx.xml @@ -9,7 +9,7 @@ </group> </category> <category id="input"> - <group id="2"> + <group id="3"> <setting id="input.appleremotealwayson"> <level>1</level> </setting> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index f07a0ff064..bfbc512a96 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2767,6 +2767,8 @@ <control type="toggle" /> </setting> </group> + <group id="3" label="13600"> + </group> </category> <category id="network" label="798" help="36379"> <group id="1" label="16000"> |