diff options
| author | Alan Viverette <alanv@google.com> | 2014-04-15 18:21:20 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-04-15 18:21:20 -0700 |
| commit | 548ea547b9abca8d21dbf080112bdc9703d44b8f (patch) | |
| tree | 91bcc76dc2e92bfdab4892948efb0ffec310011d /api | |
| parent | 771cd657acc37b50bafe18bf5f649d3c1d85b3d8 (diff) | |
| download | frameworks_base-548ea547b9abca8d21dbf080112bdc9703d44b8f.zip frameworks_base-548ea547b9abca8d21dbf080112bdc9703d44b8f.tar.gz frameworks_base-548ea547b9abca8d21dbf080112bdc9703d44b8f.tar.bz2 | |
Fix action bar theme inheritance and icons, make colors public
Theme.Quantum.Light.DarkActionBar is still broken, but fix incoming.
BUG: 14084633
BUG: 14083272
Change-Id: Id5f2f9ce5b0af741fc79d1fb325cfee74c7a1e37
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 2274ea0..6003211 100644 --- a/api/current.txt +++ b/api/current.txt @@ -382,6 +382,7 @@ package android { field public static final int codes = 16843330; // 0x1010242 field public static final int collapseColumns = 16843083; // 0x101014b field public static final int color = 16843173; // 0x10101a5 + field public static final int colorAccent = 16843842; // 0x1010442 field public static final int colorActivatedHighlight = 16843664; // 0x1010390 field public static final int colorBackground = 16842801; // 0x1010031 field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab @@ -397,6 +398,9 @@ package android { field public static final int colorLongPressedHighlight = 16843662; // 0x101038e field public static final int colorMultiSelectHighlight = 16843665; // 0x1010391 field public static final int colorPressedHighlight = 16843661; // 0x101038d + field public static final int colorPrimary = 16843840; // 0x1010440 + field public static final int colorPrimaryDark = 16843841; // 0x1010441 + field public static final int colorPrimaryLight = 16843839; // 0x101043f field public static final int columnCount = 16843639; // 0x1010377 field public static final int columnDelay = 16843215; // 0x10101cf field public static final int columnOrderPreserved = 16843640; // 0x1010378 |