am ef5244b3: am c83d49bb: am 69c11987: Merge "Make lighting style and attribute public" into lmp-dev
* commit 'ef5244b3a5ae62e116385bf3323bc2445b0b2ece':
Make lighting style and attribute public
diff --git a/api/current.txt b/api/current.txt
index 1974a18..c68f887 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -302,6 +302,7 @@
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
@@ -813,6 +814,7 @@
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
@@ -1123,6 +1125,7 @@
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
@@ -1868,6 +1871,7 @@
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
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 73c6a67..a7d9855 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -7233,12 +7233,17 @@
<attr name="layout_gravity" />
</declare-styleable>
- <!-- @hide -->
+ <!-- Used to specify lighting properties such as shadow alpha. -->
<declare-styleable name="Lighting">
+ <!-- @hide -->
<attr name="lightY" format="dimension" />
+ <!-- @hide -->
<attr name="lightZ" format="dimension" />
+ <!-- @hide -->
<attr name="lightRadius" format="dimension" />
+ <!-- Alpha value for the ambient shadow. -->
<attr name="ambientShadowAlpha" format="float" />
+ <!-- Alpha value for the spot shadow. -->
<attr name="spotShadowAlpha" format="float" />
</declare-styleable>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index a6e85e9..8eb6f3c 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2268,6 +2268,9 @@
<public type="attr" name="checkMarkTintMode" />
<public type="attr" name="popupTheme" />
<public type="attr" name="toolbarStyle" />
+ <public type="attr" name="lightingStyle" />
+ <public type="attr" name="ambientShadowAlpha" />
+ <public type="attr" name="spotShadowAlpha" />
<public-padding type="dimen" name="l_resource_pad" end="0x01050010" />
@@ -2513,9 +2516,10 @@
<public type="style" name="Widget.Material.Button.Borderless.Colored" />
<public type="style" name="Widget.Material.Light.Button.Borderless.Colored" />
- <public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />
-
<public type="style" name="Theme.Leanback.FormWizard"/>
+ <public type="style" name="Lighting" />
+
+ <public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />
<!-- An interpolator which accelerates fast but decelerates slowly. -->
<public type="interpolator" name="fast_out_slow_in" />
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index c324e93..3516c0d 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1966,10 +1966,7 @@
<java-symbol type="string" name="whichEditApplicationNamed" />
<java-symbol type="string" name="whichSendApplication" />
<java-symbol type="string" name="whichSendApplicationNamed" />
- <java-symbol type="attr" name="lightingStyle" />
<java-symbol type="attr" name="lightY" />
<java-symbol type="attr" name="lightZ" />
<java-symbol type="attr" name="lightRadius" />
- <java-symbol type="attr" name="ambientShadowAlpha" />
- <java-symbol type="attr" name="spotShadowAlpha" />
</resources>