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

Commit 7d6ca0fc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-60f55d52-4657-4714-89dc-b6443475d767-for-git_oc-release-402237... 

release-request-60f55d52-4657-4714-89dc-b6443475d767-for-git_oc-release-4022373 snap-temp-L45500000065414617

Change-Id: If6d2b0b308fe55b960fc515e4929ef755be4da10
parents fcf4e62c 2b030aeb

res/xml/about_legal.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
-->



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

                  android:title="@string/legal_information">

                  android:title="@string/legal_information"

                  android:key="legal_screen">



    <!-- Note: The titles given here probably won't be used.  Instead, we programmatically

       fill the title with the label of the activity with the corresponding action.

res/xml/reset_dashboard_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
<PreferenceScreen

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

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

    android:title="@string/reset_dashboard_title">

    android:title="@string/reset_dashboard_title"

    android:key="reset_dashboard_fragment_screen">



    <!-- Network reset -->

    <com.android.settingslib.RestrictedPreference

res/xml/zen_mode_visual_interruptions_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


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

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

                  android:title="@string/zen_mode_visual_interruptions_settings_title" >

                  android:title="@string/zen_mode_visual_interruptions_settings_title"

                  android:key="zen_mode_visual_interruptions_screen">



    <SwitchPreference android:key="screenOn"

                      android:title="@string/zen_mode_screen_on"

src/com/android/settings/ChooseLockGeneric.java

+7 −6
Original line number Diff line number Diff line
@@ -722,15 +722,16 @@ public class ChooseLockGeneric extends SettingsActivity { 
                                @Override

                                public void onRemovalError(Fingerprint fp, int errMsgId,

                                        CharSequence errString) {

                                    Log.v(TAG, "Fingerprint removed: " + fp.getFingerId());

                                    if (fp.getFingerId() == 0) {

                                        removeManagedProfileFingerprintsAndFinishIfNecessary(userId);

                                    }

                                    Log.e(TAG, String.format(

                                            "Can't remove fingerprint %d in group %d. Reason: %s",

                                            fp.getFingerId(), fp.getGroupId(), errString));

                                    // TODO: need to proceed with the removal of managed profile

                                    // fingerprints and finish() gracefully.

                                }



                                @Override

                                public void onRemovalSucceeded(Fingerprint fingerprint) {

                                    if (fingerprint.getFingerId() == 0) {

                                public void onRemovalSucceeded(Fingerprint fp, int remaining) {

                                    if (remaining == 0) {

                                        removeManagedProfileFingerprintsAndFinishIfNecessary(userId);

                                    }

                                }

src/com/android/settings/DeviceInfoSettings.java

+9 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 


    private static final String LOG_TAG = "DeviceInfoSettings";



    private static final String KEY_LEGAL_CONTAINER = "legal_container";



    @Override

    public int getMetricsCategory() {

        return MetricsEvent.DEVICEINFO;
@@ -151,5 +153,12 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
                    return buildPreferenceControllers(context, null /*activity */,

                            null /* fragment */, null /* lifecycle */);

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    List<String> keys = super.getNonIndexableKeys(context);

                    keys.add(KEY_LEGAL_CONTAINER);

                    return keys;

                }

            };

}