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

Commit 3c7dd22e authored by Alan Viverette's avatar Alan Viverette
Browse files

Implement latest Material focus states spec 

- Remove some dependencies on legacy styles
- Add resources for highlight alphas
- Update tab indicator text and background
- Update list selector and activated background
- Update text highlight color to use themed CSL

Bug: 19370157
Change-Id: I873cb4c509ceeb1e8d48d8af30030c3842f6034a
parent bc26d2ea

core/res/res/color/control_highlight_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_checked="true"

          android:state_enabled="true"

          android:alpha="?attr/disabledAlpha"

          android:alpha="@dimen/highlight_alpha_material_colored"

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

    <item android:color="?attr/colorControlHighlight" />

</selector>

core/res/res/color/highlighted_text_material.xml

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

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

-->



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

    <item android:alpha="0.4"

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

</selector>

core/res/res/color/list_highlight_material.xml

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

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

-->



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

    <item android:state_activated="true"

          android:alpha="@dimen/highlight_alpha_material_colored"

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

    <item android:color="?attr/colorControlHighlight" />

</selector>

core/res/res/color/tab_highlight_material.xml

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

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

-->



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

    <item android:alpha="@dimen/highlight_alpha_material_colored"

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

</selector>

core/res/res/color/tab_indicator_text_material.xml

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

<!-- Copyright (C) 2008 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_selected="true"

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

    <item android:color="?attr/textColorSecondary" />

</selector>