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

Commit f2772361 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab47841 am: 19c2f617 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739



Change-Id: Id39f2abef660120d8dfd2904af5b27d41ac5b38e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a035dfae 19c2f617

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3728,7 +3728,7 @@ 
        <!-- Show channel-level notification settings (channel passed in as extras) -->

        <activity android:name=".notification.app.ChannelPanelActivity"

                  android:label="@string/notification_channel_title"

                  android:theme="@style/Theme.Panel.Material"

                  android:theme="@style/Theme.Panel"

                  android:excludeFromRecents="true"

                  android:configChanges="keyboardHidden|screenSize"

                  android:exported="true">

res/drawable/button_border_selected.xml

+3 −0
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ 
  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/materialColorSurfaceContainer" />

    <stroke

        android:width="2dp"

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

res/drawable/button_border_unselected.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
       android:shape="rectangle">

    <stroke

        android:width="1dp"

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

        android:color="@color/notification_importance_button_unselected"/>



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

</shape>

res/values/themes.xml

+0 −3
Original line number Diff line number Diff line
@@ -227,9 +227,6 @@ 
        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

    </style>



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

        <item name="android:switchStyle">@style/Switch.SettingsLib</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_light</item>