From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 23 Jun 2020 22:08:33 +0000 (-0500)
Subject: Merge pull request #625 from mozilla/PictureInPicture
X-Git-Tag: v2.0~10
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/cc0bada4298da8a689850dd9f20a6b6dde7b4a2f?ds=sidebyside;hp=-c

Merge pull request #625 from mozilla/PictureInPicture

Picture in picture
---

cc0bada4298da8a689850dd9f20a6b6dde7b4a2f
diff --combined README.md
index 90c901f,9cd4d11..0bbe393
--- a/README.md
+++ b/README.md
@@@ -71,6 -71,7 +71,7 @@@ Policies can be specified using the [Gr
  | **[`PasswordManagerEnabled`](#passwordmanagerenabled)** | Remove (some) access to the password manager.
  | **[`PDFjs`](#pdfjs)** | Disable or configure PDF.js, the built-in PDF viewer.
  | **[`Permissions`](#permissions)** | Set permissions associated with camera, microphone, location, and notifications.
+ | **[`PictureInPicture`](#pictureinpicture)** | Enable or disable Picture-in-Picture.
  | **[`PopupBlocking`](#popupblocking)** | Configure the default pop-up window policy as well as origins for which pop-up windows are allowed.
  | **[`Preferences`](#preferences)** | Set and lock some preferences.
  | **[`PromptForDownloadLocation`](#promptfordownloadlocation)** | Ask where to save each file before downloading.
@@@ -2479,9 -2480,7 +2480,9 @@@ Configure the default homepage and how 
  
  `StartPage` is how Firefox starts. The choices are no homepage, the default homepage or the previous session.
  
 -**Compatibility:** Firefox 60, Firefox ESR 60 (StartPage was added in Firefox 60, Firefox ESR 60.4)\
 +With Firefox 78, an additional option as added for `Startpage`, `homepage-locked`. This allows for locking the homepage, but still allowing the user to choose whether or not they want to restore their session.
 +
 +**Compatibility:** Firefox 60, Firefox ESR 60 (StartPage was added in Firefox 60, Firefox ESR 60.4, homepage-locked added in Firefox 78)\
  **CCK2 Equivalent:** `homePage`,`lockHomePage`\
  **Preferences Affected:** `browser.startup.homepage`,`browser.startup.page`
  
@@@ -2491,7 -2490,7 +2492,7 @@@ Software\Policies\Mozilla\Firefox\Homep
  Software\Policies\Mozilla\Firefox\Homepage\Locked = 0x1 | 0x0
  Software\Policies\Mozilla\Firefox\Homepage\Additional\1 = "https://example.org"
  Software\Policies\Mozilla\Firefox\Homepage\Additional\2 = "https://example.edu"
 -Software\Policies\Mozilla\Firefox\Homepage\StartPage = "none" | "homepage" |  "previous-session"
 +Software\Policies\Mozilla\Firefox\Homepage\StartPage = "none" | "homepage" | "previous-session" | "homepage-locked"
  ```
  #### Windows (Intune)
  OMA-URI:
@@@ -2540,7 -2539,7 +2541,7 @@@ Value (string)
        <string>http://example.edu</string>
      </array>
      <key>StartPage</key>
 -    <string>none | homepage | previous-session</string>
 +    <string>none | homepage | previous-session | homepage-locked</string>
    </dict>
  </dict>
  ```
@@@ -2553,7 -2552,7 +2554,7 @@@
        "Locked": true | false,
        "Additional": ["http://example.org/",
                       "http://example.edu/"],
 -      "StartPage": "none" | "homepage" | "previous-session"
 +      "StartPage": "none" | "homepage" | "previous-session" | "homepage-locked"
      }
    }
  }
@@@ -3258,6 -3257,42 +3259,42 @@@ Value (string)
    }
  }
  ```
+ ### PictureInPicture
+ 
+ Enable or disable Picture-in-Picture.
+ 
+ **Compatibility:** Firefox 78, Firefox ESR 78\
+ **CCK2 Equivalent:** N/A\
+ **Preferences Affected:** `media.videocontrols.picture-in-picture.video-toggle.enabled`
+ 
+ #### Windows (GPO)
+ ```
+ Software\Policies\Mozilla\Firefox\PictureInPicture = 0x1 | 0x0
+ ```
+ #### Windows (Intune)
+ OMA-URI:
+ ```
+ ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PictureInPicture
+ ```
+ Value (string):
+ ```
+ <enabled/> or <disabled/>
+ ```
+ #### macOS
+ ```
+ <dict>
+   <key>PictureInPicture</key>
+   <true/> | <false/>
+ </dict>
+ ```
+ #### policies.json
+ ```
+ {
+   "policies": {
+     "PictureInPicture": true | false
+   }
+ }
+ ```
  ### PopupBlocking
  Configure the default pop-up window policy as well as origins for which pop-up windows are allowed.
  
diff --combined windows/de-DE/firefox.adml
index ec916a3,63cb963..a0ac3e4
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@@ -599,7 -599,6 +599,7 @@@ Wenn diese Richtlinieneinstellung deakt
        <string id="None">Leere Seite</string>
        <string id="Homepage">Startseite</string>
        <string id="PreviousSession">Letzte Sitzung</string>
 +      <string id="HomepageLocked">Homepage (Locked)</string>
        <string id="PasswordManagerEnabled">Passwort-Manager</string>
        <string id="PasswordManagerEnabled_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist der Passwort-Manager nicht über die Einstellungen verfügbar.
  
@@@ -784,6 -783,10 +784,10 @@@ If this policy is enabled or not config
        <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.
+ 
+ If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
        <string id="Preferences_Boolean_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist die Einstellung auf true gesperrt. Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Einstellung auf false gesperrt.
  
  Für eine Beschreibung der Einstellung, siehe:
diff --combined windows/en-US/firefox.adml
index 580a998,4377035..5c18963
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -601,7 -601,6 +601,7 @@@ If this policy is disabled or not confi
        <string id="None">None</string>
        <string id="Homepage">Homepage</string>
        <string id="PreviousSession">Previous Session</string>
 +      <string id="HomepageLocked">Homepage (Locked)</string>
        <string id="PasswordManagerEnabled">Password Manager</string>
        <string id="PasswordManagerEnabled_Explain">If this policy is disabled, the password manager is not available via preferences.
  
@@@ -786,6 -785,10 +786,10 @@@ If this policy is enabled or not config
        <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.
+ 
+ If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
        <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
  
  For a description of the preference, see:
diff --combined windows/es-ES/firefox.adml
index ae49eb3,138c750..94552c5
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@@ -601,7 -601,6 +601,7 @@@ Si esta política está deshabilitada 
        <string id="None">Ninguno</string>
        <string id="Homepage">Página de inicio</string>
        <string id="PreviousSession">Sesión anterior</string>
 +      <string id="HomepageLocked">Homepage (Locked)</string>
        <string id="PasswordManagerEnabled">Administrador de contraseñas</string>
        <string id="PasswordManagerEnabled_Explain">Si esta política está deshabilitada, el administrador de contraseñas no estará disponible a través de las preferencias.
  
@@@ -786,6 -785,10 +786,10 @@@ Si esta política está habilitada o n
        <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.
+ 
+ If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
        <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
  
  Para una descripción de la preferencia, visita:
diff --combined windows/firefox.admx
index e891014,2ba4c6c..5af5baa
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -1274,11 -1274,6 +1274,11 @@@
                <string>previous-session</string>
              </value>
            </item>
 +          <item displayName="$(string.HomepageLocked)">
 +            <value>
 +              <string>homepage-locked</string>
 +            </value>
 +          </item>
          </enum>
        </elements>
      </policy>
@@@ -3587,5 -3582,15 +3587,15 @@@
          <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"/>
+       <supportedOn ref="SUPPORTED_FF78"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
    </policies>
  </policyDefinitions>
diff --combined windows/fr-FR/firefox.adml
index 6f102dc,bb88e20..18b555f
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@@ -600,7 -600,6 +600,7 @@@ Si cette stratégie est désactivée o
        <string id="None">Page vierge</string>
        <string id="Homepage">Page d'accueil</string>
        <string id="PreviousSession">Session précédente</string>
 +      <string id="HomepageLocked">Homepage (Locked)</string>
        <string id="PasswordManagerEnabled">Gestionnaire de mots de passe</string>
        <string id="PasswordManagerEnabled_Explain">Si cette stratégie est désactivée, le gestionnaire de mots de passe n'est pas disponible via les préférences.
  
@@@ -785,6 -784,10 +785,10 @@@ If this policy is enabled or not config
        <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.
+ 
+ If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
        <string id="Preferences_Boolean_Explain">Si cette stratégie est activée, la préférence est verrouillée sur true. Si cette stratégie est désactivée, la préférence est verrouillée sur false.
  
  Pour une description de la préférence, voir:
diff --combined windows/it-IT/firefox.adml
index ae88b86,6cc07ea..c71c82c
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@@ -601,7 -601,6 +601,7 @@@ Se questo criterio è disabilitato o no
        <string id="None">Nessuna</string>
        <string id="Homepage">Pagina iniziale</string>
        <string id="PreviousSession">Sessione precedente</string>
 +      <string id="HomepageLocked">Homepage (Locked)</string>
        <string id="PasswordManagerEnabled">Gestore password</string>
        <string id="PasswordManagerEnabled_Explain">Se questo criterio è disabilitato, il gestore password non è disponibile nelle Preferenze.
  
@@@ -786,6 -785,10 +786,10 @@@ Se questo criterio è abilitato o non c
        <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">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="Preferences_Boolean_Explain">Se questo criterio è abilitato, la preferenza è impostata a Vero e resa non modificabile. Se questo criterio è disabilitato, la preferenza è impostata a Falso e resa non modificabile.
  
  Per una descrizione della preferenza, si veda:
diff --combined windows/zh-TW/firefox.adml
index 9fcc3aa,c515c2a..10d4669
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@@ -599,7 -599,6 +599,7 @@@ Mozilla 建議您不要停用 Telemetry
        <string id="None">無</string>
        <string id="Homepage">首頁</string>
        <string id="PreviousSession">先前的瀏覽狀態</string>
 +      <string id="HomepageLocked">Homepage (Locked)</string>
        <string id="PasswordManagerEnabled">密碼管理員</string>
        <string id="PasswordManagerEnabled_Explain">若停用此原則，將無法於偏好設定中使用密碼管理員。
  
@@@ -784,6 -783,10 +784,10 @@@
        <string id="PDFjs_EnablePermissions_Explain">若啟用此原則，將會遵循文件權限設定（例如防止文字複製）。
  
  若停用或不設定此原則，就會忽略文件權限。</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.
+ 
+ If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
        <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
  
  若需要偏好設定的詳細說明，請參考：