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

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

release-request-1402554e-13f6-4a8a-ac43-0c3cb703879f-for-git_oc-dr1-release-40... 

release-request-1402554e-13f6-4a8a-ac43-0c3cb703879f-for-git_oc-dr1-release-4022446 snap-temp-L41400000065417041

Change-Id: Iddfb1d09c21870cd88daab2ea502c93e48972cfb
parents 81566288 2d6fef5e

res/xml/about_legal.xml

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

-->





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

<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

    <!-- 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.

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

res/xml/assist_gesture_settings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
    <com.android.settings.widget.SeekBarPreference

    <com.android.settings.widget.SeekBarPreference

        android:key="gesture_assist_sensitivity"

        android:key="gesture_assist_sensitivity"

        android:title="@string/assist_gesture_sensitivity_title"

        android:title="@string/assist_gesture_sensitivity_title"

        android:defaultValue="2"

        android:defaultValue="5"

        android:max="4" />

        android:max="10" />





</PreferenceScreen>
 
</PreferenceScreen>

res/xml/reset_dashboard_fragment.xml

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

<PreferenceScreen

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

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

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

    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 -->

    <!-- Network reset -->

    <com.android.settingslib.RestrictedPreference

    <com.android.settingslib.RestrictedPreference

res/xml/zen_mode_visual_interruptions_settings.xml

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




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

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

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

                  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"

    <SwitchPreference android:key="screenOn"

                      android:title="@string/zen_mode_screen_on"

                      android:title="@string/zen_mode_screen_on"

src/com/android/settings/DeviceInfoSettings.java

+9 −0
Original line number Original line 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 LOG_TAG = "DeviceInfoSettings";





    private static final String KEY_LEGAL_CONTAINER = "legal_container";



    @Override

    @Override

    public int getMetricsCategory() {

    public int getMetricsCategory() {

        return MetricsEvent.DEVICEINFO;

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

                    return buildPreferenceControllers(context, null /*activity */,

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

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

                }

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

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

                    keys.add(KEY_LEGAL_CONTAINER);

                    return keys;

                }

            };

            };

}
 
}