diff --git a/Examples/UIExplorer/ProgressBarAndroidExample.android.js b/Examples/UIExplorer/ProgressBarAndroidExample.android.js index b58cd73ca..19b182bc7 100644 --- a/Examples/UIExplorer/ProgressBarAndroidExample.android.js +++ b/Examples/UIExplorer/ProgressBarAndroidExample.android.js @@ -60,6 +60,10 @@ var ProgressBarAndroidExample = React.createClass({ + + + + diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js index 974eaf97d..95e5504a4 100644 --- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js +++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js @@ -21,6 +21,7 @@ var requireNativeComponent = require('requireNativeComponent'); var STYLE_ATTRIBUTES = [ 'Horizontal', + 'Normal', 'Small', 'Large', 'Inverse', @@ -70,6 +71,7 @@ var ProgressBarAndroid = React.createClass({ * Style of the ProgressBar. One of: * * - Horizontal + * - Normal (default) * - Small * - Large * - Inverse @@ -98,7 +100,7 @@ var ProgressBarAndroid = React.createClass({ getDefaultProps: function() { return { - styleAttr: 'Large', + styleAttr: 'Normal', indeterminate: true }; }, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java index 7f5bae7b3..82601cedd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java @@ -31,7 +31,7 @@ public class ReactProgressBarViewManager extends /* package */ static final String PROP_PROGRESS = "progress"; /* package */ static final String REACT_CLASS = "AndroidProgressBar"; - /* package */ static final String DEFAULT_STYLE = "Large"; + /* package */ static final String DEFAULT_STYLE = "Normal"; @Override public String getName() { @@ -99,6 +99,8 @@ public class ReactProgressBarViewManager extends return android.R.attr.progressBarStyleSmallInverse; } else if (styleStr.equals("LargeInverse")) { return android.R.attr.progressBarStyleLargeInverse; + } else if (styleStr.equals("Normal")) { + return android.R.attr.progressBarStyle; } else { throw new JSApplicationIllegalArgumentException("Unknown ProgressBar style: " + styleStr); }