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

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

release-request-f3bcfb00-8080-4b95-b497-7457f544b4f6-for-git_oc-mr1-release-41... 

release-request-f3bcfb00-8080-4b95-b497-7457f544b4f6-for-git_oc-mr1-release-4116097 snap-temp-L44400000075746008

Change-Id: Id31121157b2ef6e76ab9c5f4d703cbf7cbd237ea
parents dbb40a1e c97e9bc3

res/values/strings.xml

+3 −2
Original line number Diff line number Diff line
@@ -6233,6 +6233,7 @@ 
    <string name="help_url_system_dashboard" translatable="false"></string>

    <string name="help_url_double_tap_screen" translatable="false"></string>

    <string name="help_url_account_detail" translatable="false"></string>

    <string name="help_url_icc_lock" translatable="false"></string>















    <!-- User account title [CHAR LIMIT=30] -->















    <string name="user_account_title">Account for content</string>










@@ -8598,8 +8599,8 @@













    <!-- Preference menu title for accessing the deletion helper from the storage manager settings. [CHAR LIMIT=30]-->















    <string name="deletion_helper_preference_title">Free up space now</string>



























    <!-- Preference title for gesture settings [CHAR LIMIT=40]-->













    <string name="gesture_preference_title">Gesture shortcuts</string>













    <!-- Preference title for gesture settings [CHAR LIMIT=40 BACKUP_MESSAGE_ID:5280023307132819052]-->













    <string name="gesture_preference_title">Gesture</string>





























    <!-- Preference summary for gesture settings (phone) [CHAR LIMIT=NONE]-->















    <string name="gesture_preference_summary" product="default">Quick gestures to control your phone</string>

























res/xml/bluetooth_settings.xml



+7
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























<PreferenceScreen















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













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















    android:title="@string/bluetooth_settings">































    <Preference









@@ -25,6 +26,12 @@













        android:key="paired_devices"















        android:title="@string/bluetooth_paired_device_title"/>





























    <com.android.settings.DividerPreference













        android:key="bt_received_files"













        android:title="@string/bluetooth_show_received_files"













        settings:allowDividerAbove="true"













        settings:allowDividerBelow="true"/>





























    <com.android.settingslib.widget.FooterPreference/>































</PreferenceScreen>
























res/xml/upgraded_channel_notification_settings.xml



+21
−15




























Original line number
Diff line number
Diff line








@@ -37,6 +37,9 @@













        android:title="@string/notification_vibrate_title"















        settings:useAdditionalSummary="true" />





























    <PreferenceCategory













        android:title="@string/advanced_apps">





























        <!-- Show badge -->















        <com.android.settingslib.RestrictedSwitchPreference















            android:key="badge"









@@ -61,4 +64,7 @@













            android:title="@string/app_notification_override_dnd_title"















            android:summary="@string/app_notification_override_dnd_summary"















            settings:useAdditionalSummary="true" />



























    </PreferenceCategory>





























</PreferenceScreen>
























src/com/android/settings/IccLockSettings.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -287,6 +287,11 @@ public class IccLockSettings extends SettingsPreferenceFragment













        getContext().unregisterReceiver(mSimStateReceiver);















    }





























    @Override













    protected int getHelpResource() {













        return R.string.help_url_icc_lock;













    }





























    @Override















    public void onSaveInstanceState(Bundle out) {















        // Need to store this state for slider open/close

































src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -107,6 +107,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends













                    videoView.setLayoutParams(videoLp);















                    videoView.invalidate();















                    videoView.start();













                    mVideoBackgroundView.getViewTreeObserver()













                            .removeOnGlobalLayoutListener(mLayoutListener);















                }















            };