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

Commit fbbb5011 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10353861 from bd74e47e to udc-release 

Change-Id: I7d994d93eee12e416a49f2963ba07a7f121e26d3
parents 123dd375 bd74e47e

res-product/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -692,6 +692,12 @@ 
    <!-- Description for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->

    <string name="reset_internet_text" product="tablet">This will end your phone call</string>



    <!-- Help URI, battery saver page [DO NOT TRANSLATE] -->

    <string name="help_url_battery_saver_settings" translatable="false" product="default"></string>



    <!-- Help URI, app usage page [DO NOT TRANSLATE] -->

    <string name="help_url_app_usage_settings" translatable="false" product="default"></string>



    <!-- An explanation text that the pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->

    <string name="lockpassword_confirm_your_pattern_details_frp" product="default">Your phone was reset to factory settings. To use this phone, enter your previous pattern.</string>

    <!-- An explanation text that the pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->

res/drawable/button_border_unselected.xml→res/drawable/notification_importance_button_background_selected.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ 
  limitations under the License.

  -->

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

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

       android:shape="rectangle">

    <solid

        android:color="?attr/notification_importance_button_background_color_selected"/>

    <stroke

        android:width="1dp"

        android:color="?androidprv:attr/materialColorOutlineVariant"/>

        android:color="?attr/notification_importance_button_border_color_selected"/>

    <corners android:radius="@dimen/rect_button_radius" />

</shape>

res/drawable/button_border_selected.xml→res/drawable/notification_importance_button_background_unselected.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,12 +15,11 @@ 
  limitations under the License.

  -->

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

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

       android:shape="rectangle">

    <solid

        android:color="?androidprv:attr/materialColorSecondaryContainer" />

        android:color="?attr/notification_importance_button_background_color_unselected"/>

    <stroke

        android:width="1dp"

        android:color="?androidprv:attr/materialColorOnSecondaryContainer"/>

        android:color="?attr/notification_importance_button_border_color_unselected"/>

    <corners android:radius="@dimen/rect_button_radius" />

</shape>

res/values-night/themes.xml

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ 
        <item name="android:colorBackground">@*android:color/surface_dark</item>

    </style>



    <style name="Theme.Panel.Material" parent="Theme.Panel" >

        <item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>

        <item name="notification_importance_button_border_color_unselected">@android:color/system_outline_variant_dark</item>

        <item name="notification_importance_button_foreground_color_unselected">@android:color/system_on_surface_variant_dark</item>



        <item name="notification_importance_button_background_color_selected">@android:color/system_secondary_container_dark</item>

        <item name="notification_importance_button_border_color_selected">@android:color/system_on_secondary_container_dark</item>

        <item name="notification_importance_button_foreground_color_selected">@android:color/system_on_secondary_container_dark</item>

    </style>



    <!-- Material theme for the pages containing TabLayout and ViewPager -->

    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>

res/values/attrs.xml

+8 −0
Original line number Diff line number Diff line
@@ -194,4 +194,12 @@ 
        <attr name="biometricsEnrollProgressHelp" format="reference|color" />

        <attr name="biometricsEnrollProgressHelpWithTalkback" format="reference|color" />

    </declare-styleable>



    <attr name="notification_importance_button_background_color_unselected" format="color" />

    <attr name="notification_importance_button_border_color_unselected" format="color" />

    <attr name="notification_importance_button_foreground_color_unselected" format="color" />



    <attr name="notification_importance_button_background_color_selected" format="color" />

    <attr name="notification_importance_button_border_color_selected" format="color" />

    <attr name="notification_importance_button_foreground_color_selected" format="color" />

</resources>