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

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

Snap for 6412615 from 9674276b to rvc-release 

Change-Id: I23ed0f23f64e25617c12f7f2d518301a5d853aff
parents 69abba8a 9674276b

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,8 @@ 


        <activity

            android:name=".notification.history.NotificationHistoryActivity"

            android:label="@string/notification_history_title">

            android:label="@string/notification_history_title"

            android:taskAffinity="com.android.settings.notification">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NOTIFICATION_HISTORY" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -2530,6 +2531,7 @@ 
        <activity

            android:name="Settings$ConfigureNotificationSettingsActivity"

            android:label="@string/configure_notification_settings"

            android:taskAffinity="com.android.settings.notification"

            android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NOTIFICATION_SETTINGS" />

res/layout/admin_support_details_dialog.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
                android:layout_height="wrap_content"

                android:paddingStart="@dimen/admin_details_dialog_padding"

                android:text="@string/disabled_by_policy_title"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title" />

                android:textAppearance="@style/TextAppearance.HeadLineFontFamily"/>

    </LinearLayout>



    <ScrollView
@@ -48,7 +48,7 @@ 
            <TextView android:id="@+id/admin_support_msg"

                      android:layout_width="match_parent"

                      android:layout_height="wrap_content"

                      android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"

                      android:textAppearance="@style/TextAppearance.HeadLineFontFamily.Subhead"

                      android:text="@string/default_admin_support_msg"

                      android:maxLength="200"

                      android:autoLink="email|phone|web"

res/values/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -8137,8 +8137,12 @@ 
    <string name="bubbles_feature_education">Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen.</string>

    <!-- Title for the toggle shown on the app-level bubbles page  [CHAR LIMIT=60] -->

    <string name="bubbles_app_toggle_title">Bubbles</string>

    <!-- Title on the conversation level screen; links back to the app level setting -->

    <string name="bubbles_conversation_app_link">All Bubble settings</string>

    <!-- Title for bubbles option on the conversation level screen -->

    <string name="bubbles_conversation_toggle_title">Bubble this conversation</string>

    <!-- Summary for bubbles option on the conversation level screen -->

    <string name="bubbles_conversation_toggle_summary">New messages will appear on screen</string>

    <string name="bubbles_conversation_toggle_summary">Show floating icon on top of apps</string>

    <!-- Description for the toggle shown on the app-level bubbles page  [CHAR LIMIT=NONE] -->

    <string name="bubbles_app_toggle_summary">Allow <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> to show some notifications as bubbles</string>

    <!-- Title of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=NONE] -->

res/values/styles.xml

+10 −0
Original line number Diff line number Diff line
@@ -733,4 +733,14 @@ 
        <item name="android:fontFamily">sans-serif</item>

        <item name="android:gravity">start</item>

    </style>



    <style name="TextAppearance.HeadLineFontFamily"

           parent="@*android:style/TextAppearance.DeviceDefault.Title">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>



    <style name="TextAppearance.HeadLineFontFamily.Subhead"

           parent="@*android:style/TextAppearance.DeviceDefault.Subhead">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>

</resources>

res/xml/conversation_notification_settings.xml

+17 −7
Original line number Diff line number Diff line
@@ -32,14 +32,24 @@ 
        settings:allowDividerAbove="true"

        settings:allowDividerBelow="true"/>



    <PreferenceCategory

        android:key="bubbles"

        android:title="@string/notification_bubbles_title">



        <!-- bubbles -->

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="bubble_pref"

        android:title="@string/notification_bubbles_title"

            android:title="@string/bubbles_conversation_toggle_title"

            android:summary="@string/bubbles_conversation_toggle_summary"

            android:icon="@drawable/ic_create_bubble"

            settings:restrictedSwitchSummary="@string/enabled_by_admin" />



        <Preference

            android:key="notification_bubbles"

            android:title="@string/bubbles_conversation_app_link"

        />

    </PreferenceCategory>



    <!-- demote -->

    <Preference

        android:key="demote"