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

Commit 6dece79f authored by Alan Viverette's avatar Alan Viverette
Browse files

Add activated text colors, update Material preference header 

Addresses contrast issues when using activated background.

BUG: 17521147
Change-Id: Ia242c6d7bd0c1b5ca545a81fe515f15320b14d67
parent b27d43a8

core/res/res/color/primary_text_activated_material_dark.xml

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

<!-- Copyright (C) 2014 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">

    <item android:state_activated="true"

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

    <item android:color="@color/primary_text_default_material_dark"/>

</selector>

core/res/res/color/primary_text_activated_material_light.xml

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

<!-- Copyright (C) 2014 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">

    <item android:state_activated="true"

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

    <item android:color="@color/primary_text_default_material_light"/>

</selector>

core/res/res/color/secondary_text_activated_material_dark.xml

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

<!-- Copyright (C) 2014 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">

    <item android:state_activated="true"

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

    <item android:color="@color/secondary_text_default_material_dark"/>

</selector>

core/res/res/color/secondary_text_activated_material_light.xml

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

<!-- Copyright (C) 2014 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">

    <item android:state_activated="true"

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

    <item android:color="@color/secondary_text_default_material_light"/>

</selector>

core/res/res/layout/preference_header_item_material.xml

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

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:textColor="?android:attr/textColorPrimaryActivated"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />
@@ -55,6 +56,7 @@ 
            android:layout_below="@android:id/title"

            android:layout_alignStart="@android:id/title"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondaryActivated"

            android:ellipsize="end"

            android:maxLines="2" />