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

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

Snap for 4807121 from 8c60fc69 to pi-release 

Change-Id: Ic7648d7b9e99e2adc9b0b33e5013e1504f590928
parents fb5eba62 8c60fc69

res/layout/storage_summary_donut.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorSecondary"

    android:background="?android:attr/colorPrimary"

    android:gravity="center_vertical"

    android:orientation="horizontal" >

res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -134,4 +134,9 @@ 
    <!-- Whether or not to show the night light suggestion. -->

    <bool name="config_night_light_suggestion_enabled">true</bool>



    <!-- Whether or not the device is capable of multiple levels of vibration intensity.

         Note that this is different from whether it can control the vibration amplitude as some

         devices will be able to vary their amplitude but do not possess enough dynamic range to

         have distinct intensity levels -->

    <bool name="config_vibration_supports_multiple_intensities">false</bool>

</resources>

res/xml/connected_devices_advanced.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ 
        android:title="@string/nfc_quick_toggle_title"

        android:icon="@drawable/ic_nfc"

        android:summary="@string/nfc_quick_toggle_summary"

        settings:controller="com.android.settings.nfc.NfcPreferenceController"

        android:order="-7"/>



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.nfc.AndroidBeam"

        android:key="android_beam_settings"

        android:title="@string/android_beam_settings_title"

        settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"

        android:icon="@drawable/ic_android"

        android:order="-6"/>

res/xml/my_device_info.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:key="my_device_info_pref_screen"

    android:title="@string/about_settings"

    settings:initialExpandedChildrenCount="7">

    android:title="@string/about_settings">



    <com.android.settings.applications.LayoutPreference

        android:key="my_device_info_header"

res/xml/smart_battery_detail.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:key="smart_battery"

        android:title="@string/smart_battery_title"

        android:summary="@string/smart_battery_summary"

        settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"

        settings:allowDividerAbove="true"/>



    <SwitchPreference