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

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

release-request-0520ccd3-e696-4d2d-993b-af952b2dd6bd-for-git_oc-mr1-release-40... 

release-request-0520ccd3-e696-4d2d-993b-af952b2dd6bd-for-git_oc-mr1-release-4022446 snap-temp-L69600000065417142

Change-Id: Ief4cbeaf7111b2dbb002b662fb827c8a74325bdd
parents 66208da9 2d6fef5e

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/assist_gesture_settings.xml

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

        android:key="gesture_assist_sensitivity"

        android:title="@string/assist_gesture_sensitivity_title"

        android:defaultValue="2"

        android:max="4" />

        android:defaultValue="5"

        android:max="10" />



</PreferenceScreen>

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

                }

            };

}