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

Commit 3ffdef62 authored by Ats Jenk's avatar Ats Jenk
Browse files

Use theme colors for bubble bar drop target 

Using colorPrimaryContainer for the background.

Bug: 313661121
Test: manual, change theme and observe the drop target color is updated
Change-Id: I9929b49d1e9750551cf552800265601cd8f9ac4d
parent feaaf00a

libs/WindowManager/Shell/res/color/bubble_drop_target_background_color.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

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

    <item android:alpha="0.35" android:color="?androidprv:attr/materialColorPrimaryContainer" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/bubble_drop_target_background.xml

+8 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +13,12 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<shape android:shape="rectangle"

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

    <solid android:color="#bf309fb5" />

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

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

    android:shape="rectangle">

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

    <stroke android:width="1dp" android:color="#A00080FF"/>

    <solid android:color="@color/bubble_drop_target_background_color" />

    <stroke

        android:width="1dp"

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

</shape>