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

Commit bf2ee6b4 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Automerger Merge Worker
Browse files

Merge "Adding Missing theme attributes on DeviceDefault" into udc-dev am: 2dfbd12a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22574238



Change-Id: Ib9ac696fcab76a53dca42de0b98977757eab6f2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c51d4e7d 2dfbd12a

core/res/res/values/attrs.xml

+9 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,15 @@ 
        <!-- The container color of surface, which replaces the previous surface at elevation level

             2. @hide -->

        <attr name="materialColorSurfaceContainer" format="color"/>













         <!-- The primary branding color for the app. By default, this is the color applied to the













             action bar background. @hide -->













        <attr name="materialColorPrimary" format="color"/>













        <!-- The secondary branding color for the app, usually a bright complement to the primary













             branding color. @hide -->













        <attr name="materialColorSecondary" format="color"/>













        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top













             of tertiary. @hide -->













        <attr name="materialColorTertiary" format="color"/>















    </declare-styleable>





























    <!-- **************************************************************** -->

































core/res/res/values/symbols.xml



+3
−3




























Original line number
Diff line number
Diff line








@@ -5035,11 +5035,9 @@













  <java-symbol name="materialColorOnTertiary" type="attr"/>















  <java-symbol name="materialColorSurfaceDim" type="attr"/>















  <java-symbol name="materialColorSurfaceBright" type="attr"/>













  <java-symbol name="materialColorSecondary" type="attr"/>















  <java-symbol name="materialColorOnError" type="attr"/>















  <java-symbol name="materialColorSurface" type="attr"/>















  <java-symbol name="materialColorSurfaceContainerHigh" type="attr"/>













  <java-symbol name="materialColorTertiary" type="attr"/>















  <java-symbol name="materialColorSurfaceContainerHighest" type="attr"/>















  <java-symbol name="materialColorOnSurfaceVariant" type="attr"/>















  <java-symbol name="materialColorOutline" type="attr"/>









@@ -5047,7 +5045,9 @@













  <java-symbol name="materialColorOnPrimary" type="attr"/>















  <java-symbol name="materialColorOnSurface" type="attr"/>















  <java-symbol name="materialColorSurfaceContainer" type="attr"/>













  <java-symbol name="materialColorSurfaceContainer" type="attr"/>













  <java-symbol name="materialColorPrimary" type="attr"/>













  <java-symbol name="materialColorSecondary" type="attr"/>













  <java-symbol name="materialColorTertiary" type="attr"/>































  <java-symbol type="attr" name="actionModeUndoDrawable" />















  <java-symbol type="attr" name="actionModeRedoDrawable" />

































core/res/res/values/themes_device_defaults.xml



+153
−107


























File changed.
Preview size limit exceeded, changes collapsed.