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

Commit f50ae086 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Add textColorOnAccent" into sc-dev

parents a5e777f9 2f9e0663
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 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.
  -->
<!-- Please see primary_text_material_light.xml -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false"
          android:color="@color/system_neutral1_400"/>
    <item android:color="@color/system_neutral1_900"/>
</selector>
+3 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,9 @@
        <!-- Darker accent color used on Material NEXT buttons. @hide -->
        <attr name="colorAccentPrimaryVariant" format="color" />
        <!-- Text color used on top of Material NEXT accent colors. @hide -->
        <attr name="textColorOnAccent" format="color" />
        <!-- Secondary darker accent color used on Material NEXT buttons. @hide -->
        <attr name="colorAccentSecondaryVariant" format="color" />
+1 −0
Original line number Diff line number Diff line
@@ -4274,6 +4274,7 @@
  <java-symbol type="attr" name="colorSurfaceHighlight" format="color" />
  <java-symbol type="attr" name="colorSurfaceVariant" format="color" />
  <java-symbol type="attr" name="colorSurfaceHeader" format="color" />
  <java-symbol type="attr" name="textColorOnAccent" format="color" />

  <!-- CEC Configuration -->
  <java-symbol type="bool" name="config_cecHdmiCecEnabled_userConfigurable" />
+43 −0

File changed.

Preview size limit exceeded, changes collapsed.