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

Commit 7313fcd0 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "User management screens"

parents 6f72c206 b810a0dd
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@
-keep class com.android.settings.MasterClearConfirm
-keep class com.android.settings.accounts.*
-keep class com.android.settings.fuelgauge.*
-keep class com.android.settings.users.*

# Keep click responders
-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
+18 −0
Original line number Diff line number Diff line
@@ -724,4 +724,22 @@
        <!-- Status message when VPN is failed. -->
        <item>Unsuccessful</item>
    </string-array>

    <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
    <string-array name="user_content_ratings_entries">
        <item>Ascended being</item>
        <item>Human</item>
        <item>Neanderthal</item>
        <item>Chimp</item>
        <item>Monkey</item>
    </string-array>

    <!-- Values for user content ratings for restricted users -->
    <string-array name="user_content_ratings_values" translatable="false">
        <item>5</item>
        <item>4</item>
        <item>3</item>
        <item>2</item>
        <item>1</item>
    </string-array>
</resources>
+3 −0
Original line number Diff line number Diff line
@@ -29,4 +29,7 @@
    <!-- Whether the bluetooth activation confirmation dialogs should be auto dismissed.
         Can be overridden for specific product builds. -->
    <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>

    <!-- Whether User management screen is available -->
    <bool name="enable_user_management">false</bool>
</resources>
+39 −0
Original line number Diff line number Diff line
@@ -3854,4 +3854,43 @@
    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
    <string name="additional_system_update_settings_list_item_title">Additional system updates</string>

    <!-- User settings -->
    <skip/>

    <!-- User settings screen title [CHAR LIMIT=25] -->
    <string name="user_settings_title">Users &amp; restrictions</string>
    <!-- User settings user list section header [CHAR LIMIT=30] -->
    <string name="user_list_title">Users</string>
    <!-- User settings add user menu [CHAR LIMIT=20] -->
    <string name="user_add_user_menu">Add user</string>

    <!-- User details -->
    <skip/>

    <!-- User details screen title [CHAR LIMIT=25] -->
    <string name="user_details_title">Edit details</string>
    <!-- User information section title [CHAR LIMIT=30] -->
    <string name="user_information_heading">User information</string>
    <!-- User name title [CHAR LIMIT=25] -->
    <string name="user_name_title">Name</string>
    <!-- User restrictions section title [CHAR LIMIT=30] -->
    <string name="user_restrictions_heading">Content restrictions</string>
    <!-- User restrictions, does market require PIN protection [CHAR LIMIT=25] -->
    <string name="user_market_requires_pin">Downloads require PIN</string>
    <!-- User restrictions, maximum content rating for apps [CHAR LIMIT=25] -->
    <string name="user_max_content_rating">Content rating</string>
    <!-- Section title for list of system apps [CHAR LIMIT=30] -->
    <string name="user_system_apps_heading">System apps to enable</string>
    <!-- Section title for list of downloaded apps [CHAR LIMIT=30] -->
    <string name="user_market_apps_heading">Installed apps to enable</string>
    <!-- User details discard user menu [CHAR LIMIT=20] -->
    <string name="user_discard_user_menu">Discard</string>
    <!-- User details remove user menu [CHAR LIMIT=20] -->
    <string name="user_remove_user_menu">Remove user</string>
    <!-- User details new user name [CHAR LIMIT=30] -->
    <string name="user_new_user_name">Pesky kid</string>
    <!-- User removal confirmation title [CHAR LIMIT=25] -->
    <string name="user_confirm_remove_title">Remove user?</string>
    <!-- User removal confirmation message [CHAR LIMIT=none] -->
    <string name="user_confirm_remove_message">Are you sure you want to remove the user and all associated data from the device?</string>
</resources>
+7 −0
Original line number Diff line number Diff line
@@ -106,6 +106,13 @@
    <!-- PERSONAL -->
    <header android:title="@string/header_category_personal" />

    <!-- Manage users -->
    <header
        android:fragment="com.android.settings.users.UserSettings"
        android:icon="@drawable/ic_settings_sync"
        android:title="@string/user_settings_title"
        android:id="@+id/user_settings" />

    <!-- Data Sync. The settings activity will ensure this is resolved to an
         activity on the system image, otherwise it will remove this
         preference. -->
Loading