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

Commit a2781721 authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge "Allow overriding of strings referenced in XML files."

parents a190aef9 269f97d9

res/layout/forgot_password_activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


        <TextView

            style="@style/SudDescription.Glif"

            android:id="@+id/forgot_password_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

res/xml/interact_across_profiles_permissions_details.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ 
            android:key="interact_across_profiles_settings_switch" />



        <Preference

            android:key="interact_across_profiles_summary_1"

            android:summary="@string/interact_across_profiles_summary_1"

            android:selectable="false" />



        <Preference

            android:key="interact_across_profiles_summary_2"

            android:summary="@string/interact_across_profiles_summary_2"

            android:selectable="false" />

src/com/android/settings/accounts/ManagedProfileSettings.java

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.settings.accounts;



import static android.app.admin.DevicePolicyResources.Strings.Settings.CROSS_PROFILE_CALENDAR_SUMMARY;

import static android.app.admin.DevicePolicyResources.Strings.Settings.CROSS_PROFILE_CALENDAR_TITLE;

import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONTACT_SEARCH_SUMMARY;

import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONTACT_SEARCH_TITLE;

import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SETTING;



import android.app.settings.SettingsEnums;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -78,6 +84,17 @@ public class ManagedProfileSettings extends DashboardFragment { 
        super.onCreate(icicle);

        mManagedProfileBroadcastReceiver = new ManagedProfileBroadcastReceiver();

        mManagedProfileBroadcastReceiver.register(getActivity());

        replaceEnterpriseStringTitle("work_mode",

                WORK_PROFILE_SETTING, R.string.work_mode_label);

        replaceEnterpriseStringTitle("contacts_search",

                WORK_PROFILE_CONTACT_SEARCH_TITLE, R.string.managed_profile_contact_search_title);

        replaceEnterpriseStringSummary("contacts_search",

                WORK_PROFILE_CONTACT_SEARCH_SUMMARY,

                R.string.managed_profile_contact_search_summary);

        replaceEnterpriseStringTitle("cross_profile_calendar",

                CROSS_PROFILE_CALENDAR_TITLE, R.string.cross_profile_calendar_title);

        replaceEnterpriseStringSummary("cross_profile_calendar",

                CROSS_PROFILE_CALENDAR_SUMMARY, R.string.cross_profile_calendar_summary);

    }



    @Override

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.applications.appinfo;



import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.app.Activity;
@@ -238,6 +240,8 @@ public class AppInfoDashboardFragment extends DashboardFragment 
        startListeningToPackageRemove();



        setHasOptionsMenu(true);

        replaceEnterpriseStringTitle("interact_across_profiles",

                CONNECTED_WORK_AND_PERSONAL_APPS_TITLE, R.string.interact_across_profiles_title);

    }



    @Override

src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java

+13 −0
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ 


package com.android.settings.applications.specialaccess;



import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE;

import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGE_DEVICE_ADMIN_APPS;



import android.app.settings.SettingsEnums;

import android.os.Bundle;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;
@@ -33,6 +37,15 @@ public class SpecialAccessSettings extends DashboardFragment { 
        return TAG;

    }



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        replaceEnterpriseStringTitle("interact_across_profiles",

                CONNECTED_WORK_AND_PERSONAL_APPS_TITLE, R.string.interact_across_profiles_title);

        replaceEnterpriseStringTitle("device_administrators",

                MANAGE_DEVICE_ADMIN_APPS, R.string.manage_device_admin);

    }



    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.special_access;