diff options
| author | Alan Lau <alanlau@google.com> | 2014-07-25 18:51:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 18:51:10 +0000 |
| commit | afb9296e531adcb5db49b115db4d91d151a8d82f (patch) | |
| tree | 53454fcca6cba4c672f3cfbca6d7ec9dd498c5d7 | |
| parent | fb9584cf67e2335d844dc84d70f7e80aee2d0b00 (diff) | |
| parent | 050972b1231819fd2c854ef9bba10d6f6f8b5f00 (diff) | |
| download | android_development-afb9296e531adcb5db49b115db4d91d151a8d82f.tar.gz android_development-afb9296e531adcb5db49b115db4d91d151a8d82f.tar.bz2 android_development-afb9296e531adcb5db49b115db4d91d151a8d82f.zip | |
am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit '050972b1231819fd2c854ef9bba10d6f6f8b5f00':
Change setScrollVertically to protected to make scroll work in subclasses.
| -rw-r--r-- | samples/wearable/AgendaData/Application/proguard-rules.txt | 2 | ||||
| -rw-r--r-- | samples/wearable/Flashlight/Wearable/proguard-rules.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/wearable/AgendaData/Application/proguard-rules.txt b/samples/wearable/AgendaData/Application/proguard-rules.txt index 824a322c1..53f713a6b 100644 --- a/samples/wearable/AgendaData/Application/proguard-rules.txt +++ b/samples/wearable/AgendaData/Application/proguard-rules.txt @@ -23,6 +23,6 @@ -keep class android.support.wearable.view.WearableListView { private void setScrollAnimator(int); - private void setScrollVertically(int); + protected void setScrollVertically(int); } diff --git a/samples/wearable/Flashlight/Wearable/proguard-rules.txt b/samples/wearable/Flashlight/Wearable/proguard-rules.txt index 277118ac5..2267fe6a9 100644 --- a/samples/wearable/Flashlight/Wearable/proguard-rules.txt +++ b/samples/wearable/Flashlight/Wearable/proguard-rules.txt @@ -11,7 +11,7 @@ -keep class android.support.wearable.view.WearableListView { private void setScrollAnimator(int); - private void setScrollVertically(int); + protected void setScrollVertically(int); } -keep class android.support.wearable.view.WearableListView.ViewHolder { private void setFocusPaddingTop(int); |