Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support resource references in pointerShape attributes."

Browse Source
This commit is contained in:
Vladislav Kaznacheev
2016-02-04 21:28:39 +00:00
committed by Android (Google) Code Review
parent b631f7c60b 1ad6ec2054
commit 0975a8dda6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/View.java
View File

@@ -4506,9 +4506,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
break;
case R.styleable.View_pointerShape:
final int pointerShape = a.getInt(attr, PointerIcon.STYLE_NOT_SPECIFIED);
if (pointerShape != PointerIcon.STYLE_NOT_SPECIFIED) {
setPointerIcon(PointerIcon.getSystemIcon(context, pointerShape));
final int resourceId = a.getResourceId(attr, 0);
if (resourceId != 0) {
setPointerIcon(PointerIcon.loadCustomIcon(
context.getResources(), resourceId));
} else {
final int pointerShape = a.getInt(attr, PointerIcon.STYLE_NOT_SPECIFIED);
if (pointerShape != PointerIcon.STYLE_NOT_SPECIFIED) {
setPointerIcon(PointerIcon.getSystemIcon(context, pointerShape));
}
}
break;
}