From e26d6a3c4be76e8111f8fa19c60b3e0880ad69be Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 2 Dec 2020 11:20:26 -0600
Subject: [PATCH] Correct PictureInPicture policies. Fixes #713

---
 README.md                     | 21 ++++++++++++++++-----
 mac/org.mozilla.firefox.plist |  7 ++++++-
 windows/de-DE/firefox.adml    |  9 +++++++--
 windows/en-US/firefox.adml    |  9 +++++++--
 windows/es-ES/firefox.adml    |  9 +++++++--
 windows/firefox.admx          | 17 +++++++++++++++--
 windows/fr-FR/firefox.adml    |  9 +++++++--
 windows/it-IT/firefox.adml    | 10 ++++++++--
 windows/zh-TW/firefox.adml    |  9 +++++++--
 9 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 87c4516..0e1cfb0 100644
--- a/README.md
+++ b/README.md
@@ -3803,7 +3803,7 @@ Value (string):
 ```
 ### PictureInPicture
 
-Enable or disable Picture-in-Picture.
+Enable or disable Picture-in-Picture as well as lock it.
 
 **Compatibility:** Firefox 78, Firefox ESR 78\
 **CCK2 Equivalent:** N/A\
@@ -3811,12 +3811,15 @@ Enable or disable Picture-in-Picture.
 
 #### Windows (GPO)
 ```
-Software\Policies\Mozilla\Firefox\PictureInPicture = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\PictureInPicture\Enabled = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\PictureInPicture\Locked = 0x1 | 0x0
+
 ```
 #### Windows (Intune)
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PictureInPicture
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~PictureInPicture/PictureInPicture_Enabled
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~PictureInPicture/PictureInPicture_Locked
 ```
 Value (string):
 ```
@@ -3826,14 +3829,22 @@ Value (string):
 ```
 <dict>
   <key>PictureInPicture</key>
-  <true/> | <false/>
+  <dict>
+    <key>Enabled</key>
+    <true/> | <false/>
+    <key>Locked</key>
+    <true/> | <false/>
+  </dict>
 </dict>
 ```
 #### policies.json
 ```
 {
   "policies": {
-    "PictureInPicture": true | false
+    "PictureInPicture": {
+      "Enabled": true | false,
+      "Locked": true, false
+    }
   }
 }
 ```
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 3070383..d14eb7c 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -497,7 +497,12 @@
 		</dict>
 	</dict>
 	<key>PictureInPicture</key>
-	<false/>
+	<dict>
+		<key>Enabled</key>
+		<false/>
+		<key>Locked</key>
+		<true/>
+	</dict>
 	<key>PopupBlocking</key>
 	<dict>
 		<key>Allow</key>
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 3ebb0d9..81b5b4d 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">DRM-Medien Erweiterungen</string>
       <string id="PDFjs_group">PDFjs</string>
+      <string id="PictureInPicture_group">Bild in Bild</string>
       <string id="Allow">Erlaubte Seiten</string>
       <string id="AllowSession">Erlaubte Seiten (Session Only)</string>
       <string id="Block">Gesperrte Seiten</string>
@@ -793,10 +794,14 @@ Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird de
       <string id="PDFjs_EnablePermissions_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, werden Berechtigungen des PDF-Dokuments (wie z.B. Markieren und Kopieren von Text verhindern) angewendet.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Berechtigungen im PDF-Dokument ignoriert.</string>
-      <string id="PictureInPicture">Bild in Bild</string>
-      <string id="PictureInPicture_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Bild-in-Bild Funktion deaktiviert.
+      <string id="PictureInPicture_Enabled">Aktiviert</string>
+      <string id="PictureInPicture_Enabled_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Bild-in-Bild Funktion deaktiviert.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, ist die Bild-in-Bild Funktion verfügbar.</string>
+      <string id="PictureInPicture_Locked">Gesperrt</string>
+      <string id="PictureInPicture_Locked_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Bild-in-Bild-Einstellungen vom Benutzer nicht geändert werden.
+
+Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, können die Bild-in-Bild-Einstellungen vom Benutzer geändert werden.</string>
       <string id="PrimaryPassword">Masterpasswort</string>
       <string id="PrimaryPassword_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist das Setzen eines Masterpasswortes erforderlich.
 
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6e0dc3e..313931f 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
       <string id="PDFjs_group">PDFjs</string>
+      <string id="PictureInPicture_group">Picture-in-Picture</string>
       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>
@@ -795,10 +796,14 @@ If this policy is enabled or not configured, the built-in PDF viewer is used.</s
       <string id="PDFjs_EnablePermissions_Explain">If this policy is enabled, the built-in PDF viewer will honor document permissions like preventing the copying of text.
 
 If this policy is not disabled or not configured, document permissions are ignored.</string>
-      <string id="PictureInPicture">Picture-in-Picture</string>
-      <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
+      <string id="PictureInPicture_Enabled">Enabled</string>
+      <string id="PictureInPicture_Enabled_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
+      <string id="PictureInPicture_Locked">Locked</string>
+      <string id="PictureInPicture_Locked_Explain">If this policy is enabled, Picture-in-Picture settings cannot be changed by the user.
+
+If this policy is disabled or not configured,Picture-in-Picture settings can be changed by the user.</string>
       <string id="PrimaryPassword">Primary (Master) Password</string>
       <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.
 
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index c06adb4..1a283ca 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">Cifrados deshabilitados</string>
       <string id="EncryptedMediaExtensions_group">Extensiones de medios cifrados</string>
       <string id="PDFjs_group">PDFjs</string>
+      <string id="PictureInPicture_group">Picture-in-Picture</string>
       <string id="Allow">Sitios permitidos</string>
       <string id="AllowSession">Sitios permitidos (Session Only)</string>
       <string id="Block">Sitios bloqueados</string>
@@ -795,10 +796,14 @@ Si esta política está habilitada o no configurada, se utilizará el visor de P
       <string id="PDFjs_EnablePermissions_Explain">Si esta política está habilitada, el visor de PDF incorporado respetará los permisos del documento, como evitar la copia de texto.
 
 Si esta política no está deshabilitada o no está configurada, se ignorarán los permisos del documento.</string>
-      <string id="PictureInPicture">Picture-in-Picture</string>
-      <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
+      <string id="PictureInPicture_Enabled">Enabled</string>
+      <string id="PictureInPicture_Enabled_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
+      <string id="PictureInPicture_Locked">Locked</string>
+      <string id="PictureInPicture_Locked_Explain">If this policy is enabled, Picture-in-Picture settings cannot be changed by the user.
+
+If this policy is disabled or not configured,Picture-in-Picture settings can be changed by the user.</string>
       <string id="PrimaryPassword">Primary (Master) Password</string>
       <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index bcca2d1..5cf986d 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -120,6 +120,9 @@
     <category displayName="$(string.PDFjs_group)" name="PDFjs">
       <parentCategory ref="firefox"/>
     </category>
+    <category displayName="$(string.PictureInPicture_group)" name="PictureInPicture">
+      <parentCategory ref="firefox"/>
+    </category>
   </categories>
   <policies>
     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
@@ -3666,8 +3669,18 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="PictureInPicture" class="Both" displayName="$(string.PictureInPicture)" explainText="$(string.PictureInPicture_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="PictureInPicture">
-      <parentCategory ref="firefox"/>
+    <policy name="PictureInPicture_Enabled" class="Both" displayName="$(string.PictureInPicture_Enabled)" explainText="$(string.PictureInPicture_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\PictureInPicture" valueName="Enabled">
+      <parentCategory ref="PictureInPicture"/>
+      <supportedOn ref="SUPPORTED_FF78"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="PictureInPicture_Locked" class="Both" displayName="$(string.PictureInPicture_Locked)" explainText="$(string.PictureInPicture_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\PictureInPicture" valueName="Locked">
+      <parentCategory ref="PictureInPicture"/>
       <supportedOn ref="SUPPORTED_FF78"/>
       <enabledValue>
         <decimal value="1"/>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 3a3599d..27f9678 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
       <string id="PDFjs_group">PDFjs</string>
+      <string id="PictureInPicture_group">Picture-in-Picture</string>
       <string id="Allow">Sites autorisés</string>
       <string id="AllowSession">Sites autorisés (Session Only)</string>
       <string id="Block">Sites bloqués</string>
@@ -794,10 +795,14 @@ If this policy is enabled or not configured, the built-in PDF viewer is used.</s
       <string id="PDFjs_EnablePermissions_Explain">If this policy is enabled, the built-in PDF viewer will honor document permissions like preventing the copying of text.
 
 If this policy is not disabled or not configured, document permissions are ignored.</string>
-      <string id="PictureInPicture">Picture-in-Picture</string>
-      <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
+      <string id="PictureInPicture_Enabled">Enabled</string>
+      <string id="PictureInPicture_Enabled_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
+      <string id="PictureInPicture_Locked">Locked</string>
+      <string id="PictureInPicture_Locked_Explain">If this policy is enabled, Picture-in-Picture settings cannot be changed by the user.
+
+If this policy is disabled or not configured,Picture-in-Picture settings can be changed by the user.</string>
       <string id="PrimaryPassword">Primary (Master) Password</string>
       <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.
 
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 64fde92..50e946f 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">Cifrari disabilitati</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
       <string id="PDFjs_group">PDFjs</string>
+      <string id="PictureInPicture_group">Picture-in-Picture</string>
       <string id="Allow">Siti consentiti</string>
       <string id="AllowSession">Siti consentiti (solo sessione)</string>
       <string id="Block">Siti bloccati</string>
@@ -795,10 +796,15 @@ Se questo criterio è abilitato o non configurato, viene utilizzato il visualizz
       <string id="PDFjs_EnablePermissions_Explain">Se questo criterio è abilitato, il visualizzatore PDF integrato rispetterà i permessi del documento (ad esempio, l'impedire la copia del testo).
 
 Se questo criterio è disabilitato o non configurato, i permessi del documento sono ignorati.</string>
-      <string id="PictureInPicture">Picture-in-Picture</string>
-      <string id="PictureInPicture_Explain">Se questo criterio è disabilitato, l'interruttore Picture-in-Picture non appare nei video.
+      <string id="PictureInPicture_Enabled">Abilitato</string>
+      <string id="PictureInPicture_Enabled_Explain">Se questo criterio è disabilitato, l'interruttore Picture-in-Picture non appare nei video.
 
 Se questo criterio è abilitato o non configurato, l'interruttore Picture-in-Picture è disponibile per i video.</string>
+      <string id="PictureInPicture_Locked">Bloccato</string>
+      <string id="PictureInPicture_Locked_Explain">Se questo criterio è abilitato, le impostazioni Picture-in-Picture non possono essere modificate dall'utente.
+
+Se questo criterio è disabilitato o non configurato, le impostazioni Picture-in-Picture possono essere modificate dall'utente.</string>
+
       <string id="PrimaryPassword">Password principale</string>
       <string id="PrimaryPassword_Explain">Se questo criterio è abilitato, è richiesto impostare una password principale.
 
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index bada551..22d5a7a 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">停用加密演算法</string>
       <string id="EncryptedMediaExtensions_group">加密媒體擴充功能</string>
       <string id="PDFjs_group">PDFjs</string>
+      <string id="PictureInPicture_group">子母畫面</string>
       <string id="Allow">允許的網站</string>
       <string id="AllowSession">允許的網站（僅當次瀏覽階段）</string>
       <string id="Block">封鎖的網站</string>
@@ -793,10 +794,14 @@ Starting with Firefox 83, Firefox ESR 78.5, you can also specify multiple URLS s
       <string id="PDFjs_EnablePermissions_Explain">若啟用此原則，將會遵循文件權限設定（例如防止文字複製）。
 
 若停用或不設定此原則，就會忽略文件權限。</string>
-      <string id="PictureInPicture">子母畫面</string>
-      <string id="PictureInPicture_Explain">若停用此原則，將不會在影片上顯示切換進入子母畫面的按鈕。
+      <string id="PictureInPicture_Enabled">啟用</string>
+      <string id="PictureInPicture_Enabled_Explain">若停用此原則，將不會在影片上顯示切換進入子母畫面的按鈕。
 
 若啟用或不設定此原則，則會在影片上顯示子母畫面按鈕。</string>
+      <string id="PictureInPicture_Locked">鎖定</string>
+      <string id="PictureInPicture_Locked_Explain">若啟用此原則，使用者將無法更改 子母畫面 設定。
+
+若停用或不設定此原則，則允許使用者更改 子母畫面 設定。</string>
       <string id="PrimaryPassword">主控密碼</string>
       <string id="PrimaryPassword_Explain">若啟用此原則，將必須輸入主控密碼。
 
-- 
2.43.0