aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrumeet <liangyuteng12345@gmail.com>2017-08-27 21:49:46 +0800
committerTrumeet <liangyuteng12345@gmail.com>2017-08-27 21:49:46 +0800
commita68ed5a035b21daa847937d37607242b7166e570 (patch)
tree457b778b001fc941c41ba94fc52f668684a92572
parent07eb282b4af98146413e9911e7cdf4fceed9192e (diff)
downloadSetupWizardLibCompat-master.tar
SetupWizardLibCompat-master.tar.gz
SetupWizardLibCompat-master.tar.bz2
SetupWizardLibCompat-master.zip
fix: progress bar crash on pre-lollipopHEAD0.3master
-rw-r--r--.idea/modules.xml3
-rw-r--r--app/src/main/java/top/trumeet/snippet/setupwizardlibcompat/SetupWizardLayoutActivity.java1
-rw-r--r--setupwizardlib/src/main/res/layout/suw_progress_bar.xml (renamed from setupwizardlib/src/main/res/layout-v21/suw_progress_bar.xml)0
3 files changed, 1 insertions, 3 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1ea710f..0c36d53 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,11 +3,8 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/SetupWizardLibCompat.iml" filepath="$PROJECT_DIR$/SetupWizardLibCompat.iml" />
- <module fileurl="file://C:\Users\Trumeet\Files\Android\SetupWizardLibCompat\SetupWizardLibCompat.iml" filepath="C:\Users\Trumeet\Files\Android\SetupWizardLibCompat\SetupWizardLibCompat.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
- <module fileurl="file://C:\Users\Trumeet\Files\Android\SetupWizardLibCompat\app\app.iml" filepath="C:\Users\Trumeet\Files\Android\SetupWizardLibCompat\app\app.iml" />
<module fileurl="file://$PROJECT_DIR$/setupwizardlib/setupwizardlib.iml" filepath="$PROJECT_DIR$/setupwizardlib/setupwizardlib.iml" />
- <module fileurl="file://C:\Users\Trumeet\Files\Android\SetupWizardLibCompat\setupwizardlib\setupwizardlib.iml" filepath="C:\Users\Trumeet\Files\Android\SetupWizardLibCompat\setupwizardlib\setupwizardlib.iml" />
</modules>
</component>
</project> \ No newline at end of file
diff --git a/app/src/main/java/top/trumeet/snippet/setupwizardlibcompat/SetupWizardLayoutActivity.java b/app/src/main/java/top/trumeet/snippet/setupwizardlibcompat/SetupWizardLayoutActivity.java
index dfe3609..00d3c6d 100644
--- a/app/src/main/java/top/trumeet/snippet/setupwizardlibcompat/SetupWizardLayoutActivity.java
+++ b/app/src/main/java/top/trumeet/snippet/setupwizardlibcompat/SetupWizardLayoutActivity.java
@@ -31,6 +31,7 @@ public class SetupWizardLayoutActivity extends AppCompatActivity {
GlifLayoutActivity.class));
}
});
+ layout.setProgressBarShown(true);
setContentView(layout);
}
}
diff --git a/setupwizardlib/src/main/res/layout-v21/suw_progress_bar.xml b/setupwizardlib/src/main/res/layout/suw_progress_bar.xml
index cbb69ea..cbb69ea 100644
--- a/setupwizardlib/src/main/res/layout-v21/suw_progress_bar.xml
+++ b/setupwizardlib/src/main/res/layout/suw_progress_bar.xml