From a68ed5a035b21daa847937d37607242b7166e570 Mon Sep 17 00:00:00 2001
From: Trumeet <liangyuteng12345@gmail.com>
Date: Sun, 27 Aug 2017 21:49:46 +0800
Subject: fix: progress bar crash on pre-lollipop

---
 .idea/modules.xml                                  |  3 ---
 .../SetupWizardLayoutActivity.java                 |  1 +
 .../src/main/res/layout-v21/suw_progress_bar.xml   | 25 ----------------------
 .../src/main/res/layout/suw_progress_bar.xml       | 25 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 setupwizardlib/src/main/res/layout-v21/suw_progress_bar.xml
 create mode 100644 setupwizardlib/src/main/res/layout/suw_progress_bar.xml

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-v21/suw_progress_bar.xml
deleted file mode 100644
index cbb69ea..0000000
--- a/setupwizardlib/src/main/res/layout-v21/suw_progress_bar.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/progress_bar"
-    style="?android:attr/progressBarStyleHorizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical"
-    android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical"
-    android:indeterminate="true" />
diff --git a/setupwizardlib/src/main/res/layout/suw_progress_bar.xml b/setupwizardlib/src/main/res/layout/suw_progress_bar.xml
new file mode 100644
index 0000000..cbb69ea
--- /dev/null
+++ b/setupwizardlib/src/main/res/layout/suw_progress_bar.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/progress_bar"
+    style="?android:attr/progressBarStyleHorizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical"
+    android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical"
+    android:indeterminate="true" />
-- 
cgit v1.2.3-70-g09d2