PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 am: 0aeda894f3 am: 7a5c9cbfb2

Browse Source 
Change-Id: Ib9fd01710ccad4d86e671165295543d73aa7e477
This commit is contained in:
TreeHugger Robot
2020-03-31 18:38:31 +00:00
committed by Automerger Merge Worker
parent b8cf21d704 7a5c9cbfb2
commit ac9e47e275
6 changed files with 0 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -10547,9 +10547,6 @@
<string name="cross_profile_calendar_title">Cross-profile calendar</string>
<!-- [CHAR LIMIT=NONE] Setting description. If the user turns on this setting, they can see their work events on their personal calendar. -->
<string name="cross_profile_calendar_summary">Show work events on your personal calendar</string>
<!-- [CHAR LIMIT=NONE] The preference summary when cross-profile calendar is restricted. -->
<string name="cross_profile_calendar_restricted_summary">Your organization doesn\u2019t allow personal apps to access your work calendar</string>
<!-- Time in hours -->
<plurals name="hours">

8
res/xml/managed_profile_settings.xml
View File

@@ -32,18 +32,10 @@
settings:useAdditionalSummary="true"
settings:controller="com.android.settings.accounts.ContactSearchPreferenceController"/>
<!-- Only one of these preferences will be visible at a time, depending on
CrossProfileCalendarPreferenceController#isCrossProfileCalendarDisallowedByAdmin -->
<SwitchPreference
android:key="cross_profile_calendar"
android:summary="@string/cross_profile_calendar_summary"
android:title="@string/cross_profile_calendar_title"
settings:controller="com.android.settings.accounts.CrossProfileCalendarPreferenceController"/>
<Preference
android:key="cross_profile_calendar_disabled"
android:summary="@string/cross_profile_calendar_restricted_summary"
android:title="@string/cross_profile_calendar_title"
android:enabled="false"
settings:controller="com.android.settings.accounts.CrossProfileCalendarDisabledPreferenceController"/>
</PreferenceScreen>