Merge "Fix text appearances not working in colored button styles" into nyc-dev

diff --combined api/current.txt
index b109f98,67d9b4a..10f3284
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -2024,6 -2024,8 +2024,8 @@@ package android 
      field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213
      field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214
      field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215
+     field public static final int TextAppearance_Material_Widget_Button_Borderless_Colored = 16974559; // 0x10302df
+     field public static final int TextAppearance_Material_Widget_Button_Colored = 16974558; // 0x10302de
      field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4
      field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216
      field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217
@@@ -34569,7 -34571,7 +34571,7 @@@ package android.service.media 
  
  package android.service.notification {
  
 -  public class Condition implements android.os.Parcelable {
 +  public final class Condition implements android.os.Parcelable {
      ctor public Condition(android.net.Uri, java.lang.String, int);
      ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
      ctor public Condition(android.os.Parcel);
@@@ -34606,7 -34608,7 +34608,7 @@@
      method public void onRequestConditions(int);
      method public abstract void onSubscribe(android.net.Uri);
      method public abstract void onUnsubscribe(android.net.Uri);
 -    field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
 +    field public static final java.lang.String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";
      field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
      field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";
      field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

diff --combined api/system-current.txt
index c7ff526,2d9d466..1d49652
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -2136,6 -2136,8 +2136,8 @@@ package android 
      field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213
      field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214
      field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215
+     field public static final int TextAppearance_Material_Widget_Button_Borderless_Colored = 16974559; // 0x10302df
+     field public static final int TextAppearance_Material_Widget_Button_Colored = 16974558; // 0x10302de
      field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4
      field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216
      field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217
@@@ -37292,7 -37294,7 +37294,7 @@@ package android.service.notification 
      field public static final java.lang.String NEEDS_AUTOGROUPING_KEY = "autogroup_needed";
    }
  
 -  public class Condition implements android.os.Parcelable {
 +  public final class Condition implements android.os.Parcelable {
      ctor public Condition(android.net.Uri, java.lang.String, int);
      ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
      ctor public Condition(android.os.Parcel);
@@@ -37329,7 -37331,7 +37331,7 @@@
      method public void onRequestConditions(int);
      method public abstract void onSubscribe(android.net.Uri);
      method public abstract void onUnsubscribe(android.net.Uri);
 -    field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
 +    field public static final java.lang.String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";
      field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
      field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";
      field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

diff --combined api/test-current.txt
index 1e19db7,9e5b991..fea382f
--- 1/api/test-current.txt
--- 2/api/test-current.txt
+++ b/api/test-current.txt
@@@ -2024,6 -2024,8 +2024,8 @@@ package android 
      field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213
      field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214
      field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215
+     field public static final int TextAppearance_Material_Widget_Button_Borderless_Colored = 16974559; // 0x10302df
+     field public static final int TextAppearance_Material_Widget_Button_Colored = 16974558; // 0x10302de
      field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4
      field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216
      field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217
@@@ -34646,7 -34648,7 +34648,7 @@@ package android.service.media 
  
  package android.service.notification {
  
 -  public class Condition implements android.os.Parcelable {
 +  public final class Condition implements android.os.Parcelable {
      ctor public Condition(android.net.Uri, java.lang.String, int);
      ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
      ctor public Condition(android.os.Parcel);
@@@ -34683,7 -34685,7 +34685,7 @@@
      method public void onRequestConditions(int);
      method public abstract void onSubscribe(android.net.Uri);
      method public abstract void onUnsubscribe(android.net.Uri);
 -    field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
 +    field public static final java.lang.String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";
      field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
      field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";
      field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";