diff options
author | Alan Viverette <alanv@google.com> | 2014-07-24 19:58:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 19:58:34 +0000 |
commit | ddd69e828370ed9a6a5f91169532affd5a96415e (patch) | |
tree | 95fa1a9c0070dfb3f07b7f80f9270865272e6414 /api | |
parent | 5748d583db48ca0a21c9710c59ecdbf76c6cca58 (diff) | |
parent | dc3a80a158435575b893c50329401f942819c0f5 (diff) | |
download | frameworks_base-ddd69e828370ed9a6a5f91169532affd5a96415e.zip frameworks_base-ddd69e828370ed9a6a5f91169532affd5a96415e.tar.gz frameworks_base-ddd69e828370ed9a6a5f91169532affd5a96415e.tar.bz2 |
am 57696778: am 0531babd: am 380b9a5e: Merge "Revert "Make lighting style and attribute public"" into lmp-dev
* commit '57696778bc6ee94283e9d6c68c81940c7665187a':
Revert "Make lighting style and attribute public"
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index ac8309a..426b60b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -302,7 +302,6 @@ package android { field public static final int amPmSelectedBackgroundColor = 16843947; // 0x10104ab field public static final int amPmTextColor = 16843945; // 0x10104a9 field public static final int amPmUnselectedBackgroundColor = 16843946; // 0x10104aa - field public static final int ambientShadowAlpha = 16843954; // 0x10104b2 field public static final int angle = 16843168; // 0x10101a0 field public static final int animateFirstView = 16843477; // 0x10102d5 field public static final int animateLayoutChanges = 16843506; // 0x10102f2 @@ -814,7 +813,6 @@ package android { field public static final int layout_x = 16843135; // 0x101017f field public static final int layout_y = 16843136; // 0x1010180 field public static final int left = 16843181; // 0x10101ad - field public static final int lightingStyle = 16843953; // 0x10104b1 field public static final int lineSpacingExtra = 16843287; // 0x1010217 field public static final int lineSpacingMultiplier = 16843288; // 0x1010218 field public static final int lines = 16843092; // 0x1010154 @@ -1125,7 +1123,6 @@ package android { field public static final int spinnersShown = 16843595; // 0x101034b field public static final int splitMotionEvents = 16843503; // 0x10102ef field public static final int splitTrack = 16843854; // 0x101044e - field public static final int spotShadowAlpha = 16843955; // 0x10104b3 field public static final int src = 16843033; // 0x1010119 field public static final int ssp = 16843747; // 0x10103e3 field public static final int sspPattern = 16843749; // 0x10103e5 @@ -1871,7 +1868,6 @@ package android { field public static final int Holo_Light_ButtonBar_AlertDialog = 16974056; // 0x10300e8 field public static final int Holo_Light_SegmentedButton = 16974058; // 0x10300ea field public static final int Holo_SegmentedButton = 16974057; // 0x10300e9 - field public static final int Lighting = 16974559; // 0x10302df field public static final int MediaButton = 16973879; // 0x1030037 field public static final int MediaButton_Ffwd = 16973883; // 0x103003b field public static final int MediaButton_Next = 16973881; // 0x1030039 |