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

Commit f75189d2 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Quantum for text fields, buttons, radio buttons and check boxes"

parents 99b35347 db89c2d0

core/res/res/color/primary_text_disable_only_quantum_dark.xml

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

<!-- Copyright (C) 2010 The Android Open Source Project

<!-- 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.
@@ -15,6 +15,6 @@ 
-->



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

    <item android:state_enabled="false" android:color="@android:color/bright_foreground_dark_disabled"/>

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

    <item android:state_enabled="false" android:alpha="0.5" android:color="@android:color/bright_foreground_quantum_dark"/>

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

</selector>

core/res/res/color/primary_text_disable_only_quantum_light.xml

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

<!-- Copyright (C) 2010 The Android Open Source Project

<!-- 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.
@@ -15,6 +15,6 @@ 
-->



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

    <item android:state_enabled="false" android:color="@android:color/bright_foreground_light_disabled"/>

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

    <item android:state_enabled="false" android:alpha="0.5" android:color="@android:color/bright_foreground_quantum_light"/>

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

</selector>

core/res/res/color/search_url_text_quantum_dark.xml

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

<!-- Copyright (C) 2010 The Android Open Source Project

<!-- 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.

core/res/res/color/search_url_text_quantum_light.xml

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

<!-- Copyright (C) 2010 The Android Open Source Project

<!-- 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.

core/res/res/drawable-xxhdpi/ab_solid_shadow_qntm.9.png

0 → 100644
+314 B
Loading image diff...