Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c8c71f authored by Yvonne Jiang's avatar Yvonne Jiang
Browse files

Initial skeleton of new "Supervision" settings screen with top-level entry point. 

Intake bug: b/379312924

Test: atest SupervisionDashboardScreenTest
Test: atest SupervisionMainSwitchPreferenceTest
Test: manually on real device
Bug: 383568136
Change-Id: I6bb8aa432c1b4527cec0f4c2593fd1494975503d
Flag: android.app.supervision.flags.enable_supervision_settings_screen
parent 968807c3

res/drawable/ic_account_child_invert.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2025 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M480,80Q530,80 565,115Q600,150 600,200Q600,250 565,285Q530,320 480,320Q430,320 395,285Q360,250 360,200Q360,150 395,115Q430,80 480,80ZM480,360Q527,360 573,371Q619,382 656,402Q694,421 717,447Q740,473 740,504L740,736Q740,753 732,769.5Q724,786 710,800Q696,814 677.5,826Q659,838 636,848L636,758Q636,720 583.5,696Q531,672 480,672Q430,672 383.5,692.5Q337,713 326,746Q364,761 404,767Q444,773 486,774Q494,774 502.5,774Q511,774 520,774L520,878Q513,880 505.5,880Q498,880 490,880Q454,880 407.5,872Q361,864 319,847Q277,830 248.5,802.5Q220,775 220,736L220,504Q220,473 243,447Q266,421 303,402Q341,382 387,371Q433,360 480,360ZM480,600Q513,600 536.5,576.5Q560,553 560,520Q560,487 536.5,463.5Q513,440 480,440Q447,440 423.5,463.5Q400,487 400,520Q400,553 423.5,576.5Q447,600 480,600Z"/>

</vector>
 
 No newline at end of file

res/values/menu_keys.xml

+1 −0
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ 
    <string name="menu_key_system" translatable="false">top_level_system</string>

    <string name="menu_key_about_device" translatable="false">top_level_about_device</string>

    <string name="menu_key_support" translatable="false">top_level_support</string>

    <string name="menu_key_supervision" translatable="false">top_level_supervision</string>



</resources>

res/values/strings.xml

+13 −0
Original line number Diff line number Diff line
@@ -14075,4 +14075,17 @@ 








    <!-- Content description for device details icon on Connected device page [CHAR LIMIT=NONE] -->









    <string name="device_detail_icon_content_description"><xliff:g id="device_name">%1$s</xliff:g>. Configure device detail.</string>

















    <!-- Supervision settings -->

















    <!-- Title for Supervision settings menu entry [CHAR LIMIT=60] -->









    <string name="supervision_settings_title">Supervision</string>









    <!-- Description for Supervision settings menu entry [CHAR LIMIT=NONE] -->









    <string name="supervision_settings_summary">Content restrictions &amp; other limits</string>









    <!-- Title of toggle to enable or disable device supervision [CHAR LIMIT=60] -->









    <string name="device_supervision_switch_title">Use device supervision</string>









    <!-- Description of device supervision toggle when PIN has never been set up [CHAR LIMIT=NONE] -->









    <string name="device_supervision_switch_no_pin_summary">Set up PIN to get started</string>









    <!-- Search keywords for supervision settings [CHAR LIMIT=NONE] -->









    <string name="keywords_supervision_settings">supervision, parental supervision, parental controls</string>









</resources>

























res/xml/top_level_settings_v2.xml



+10
−0






























Original line number
Diff line number
Diff line







@@ -220,6 +220,16 @@







            settings:highlightableMenuKey="@string/menu_key_accounts"









            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>



















        <com.android.settings.widget.HomepagePreference









            android:key="top_level_supervision"









            android:title="@string/supervision_settings_title"









            android:summary="@string/supervision_settings_summary"









            android:icon="@drawable/ic_account_child_invert"









            android:order="5"









            android:fragment="com.android.settings.supervision.SupervisionDashboardFragment"









            settings:highlightableMenuKey="@string/menu_key_supervision"









            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"/>



















        <com.android.settings.widget.HomepagePreference









            android:key="top_level_emergency"









            android:title="@string/emergency_settings_preference_title"
































src/com/android/settings/supervision/OWNERS
0 → 100644



+5
−0






























Original line number
Diff line number
Diff line









# Bug component: 1680938



















jparks@google.com









sonnyf@google.com









yvonnejiang@google.com