diff options
| author | 2016-02-03 21:51:48 +0000 | |
|---|---|---|
| committer | 2016-02-03 21:51:48 +0000 | |
| commit | 383b7aa01b3d03d72cc08e6ea48893a7af52c0ff (patch) | |
| tree | fecb69b2f539f1a0c9a40ce48557228eafa83dce | |
| parent | 55fd569c1be48e7db7cd2417f3cce6dcbce2a60f (diff) | |
| parent | 3d40fb804b385d12492aceda00f338ee61ebc98b (diff) | |
Merge "Make pointer-icon attrs public"
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 3 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 099d42d7d4fd..8a39a40459f5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -306,6 +306,7 @@ package android { field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 + field public static final int bitmap = 16844055; // 0x1010517 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -647,6 +648,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 + field public static final int hotSpotX = 16844056; // 0x1010518 + field public static final int hotSpotY = 16844057; // 0x1010519 field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 diff --git a/api/system-current.txt b/api/system-current.txt index 8231d4f2e69d..fd7528e3882c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -401,6 +401,7 @@ package android { field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 + field public static final int bitmap = 16844055; // 0x1010517 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -742,6 +743,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 + field public static final int hotSpotX = 16844056; // 0x1010518 + field public static final int hotSpotY = 16844057; // 0x1010519 field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 diff --git a/api/test-current.txt b/api/test-current.txt index 518739165d70..b2a67508d767 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -306,6 +306,7 @@ package android { field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 + field public static final int bitmap = 16844055; // 0x1010517 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -647,6 +648,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 + field public static final int hotSpotX = 16844056; // 0x1010518 + field public static final int hotSpotY = 16844057; // 0x1010519 field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 329e2e55b0f8..5c5aff0998fa 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2697,6 +2697,9 @@ <public type="attr" name="endY" /> <public type="attr" name="offset" /> <public type="attr" name="abiOverride" /> + <public type="attr" name="bitmap" /> + <public type="attr" name="hotSpotX" /> + <public type="attr" name="hotSpotY" /> <public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" /> <public type="style" name="Widget.Material.SeekBar.Discrete" /> |