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

Commit ff30cfe2 authored by Marcelo Arteiro's avatar Marcelo Arteiro
Browse files

Updating text selection popup to dynamic color 

Bug: 220944688
Test: Manual
Flag: None bug fix
Change-Id: I9842834f43dee03aba18cd7e76c48acc227a3c94
parent e1616d9b

core/res/res/drawable/floating_popup_background_dark.xml→core/res/res/drawable/floating_popup_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
*/

-->

<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="@color/background_floating_material_dark" />

    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>

    <corners android:radius="?android:attr/dialogCornerRadius" />

</shape>

core/res/res/drawable/floating_popup_background_light.xml

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

<!--

/* Copyright 2015, 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.

*/

-->

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

    android:shape="rectangle">

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

    <corners android:radius="?android:attr/dialogCornerRadius" />

</shape>

core/res/res/layout/floating_popup_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ 
    android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:background="?attr/floatingToolbarPopupBackgroundDrawable"/>
 
    android:background="@drawable/floating_popup_background"/>

core/res/res/layout/floating_popup_menu_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
*/

-->

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

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="horizontal"
@@ -53,7 +54,7 @@ 
        android:ellipsize="end"

        android:fontFamily="@*android:string/config_bodyFontFamily"

        android:textSize="@dimen/floating_toolbar_text_size"

        android:textColor="?attr/floatingToolbarForegroundColor"

        android:textColor="?androidprv:attr/materialColorOnSurface"

        android:background="@null"

        android:focusable="false"

        android:focusableInTouchMode="false"

core/res/res/layout/floating_popup_overflow_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
*/

-->

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

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

    android:id="@+id/overflow"

    android:layout_width="@dimen/floating_toolbar_menu_image_button_width"

    android:layout_height="@dimen/floating_toolbar_height"
@@ -25,4 +26,4 @@ 
    android:paddingBottom="@dimen/floating_toolbar_menu_image_button_vertical_padding"

    android:scaleType="centerInside"

    android:background="?attr/actionBarItemBackground"

    android:tint="?attr/floatingToolbarForegroundColor" />
 
    android:tint="?androidprv:attr/materialColorOnSurface" />