summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ProgressBar.java
diff options
context:
space:
mode:
authorKonstantin Lopyrev <klopyrev@google.com>2010-08-10 17:52:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-10 17:52:32 -0700
commitf00ee0f76260a660cd9648d3bda9863e133cb401 (patch)
treee117838dfad94f346e19f7adc592c197b7aa2590 /core/java/android/widget/ProgressBar.java
parent95105f3c25110f28b236cfa71e9ad74533eef854 (diff)
parentf39d5987b977fdff8c34a2ddabaec31d1e909db3 (diff)
am f39d5987: Merge "Categorizing exported view properties." into gingerbread
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp * commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3': Categorizing exported view properties.
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
-rw-r--r--core/java/android/widget/ProgressBar.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index 8e9eb05a066e..c0a546deffa2 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -336,7 +336,7 @@ public class ProgressBar extends View {
*
* @return true if the progress bar is in indeterminate mode
*/
- @ViewDebug.ExportedProperty
+ @ViewDebug.ExportedProperty(category = "progress")
public synchronized boolean isIndeterminate() {
return mIndeterminate;
}
@@ -609,7 +609,7 @@ public class ProgressBar extends View {
* @see #setMax(int)
* @see #getMax()
*/
- @ViewDebug.ExportedProperty
+ @ViewDebug.ExportedProperty(category = "progress")
public synchronized int getProgress() {
return mIndeterminate ? 0 : mProgress;
}
@@ -626,7 +626,7 @@ public class ProgressBar extends View {
* @see #setMax(int)
* @see #getMax()
*/
- @ViewDebug.ExportedProperty
+ @ViewDebug.ExportedProperty(category = "progress")
public synchronized int getSecondaryProgress() {
return mIndeterminate ? 0 : mSecondaryProgress;
}
@@ -640,7 +640,7 @@ public class ProgressBar extends View {
* @see #getProgress()
* @see #getSecondaryProgress()
*/
- @ViewDebug.ExportedProperty
+ @ViewDebug.ExportedProperty(category = "progress")
public synchronized int getMax() {
return mMax;
}