SetupWizard: Add loading fragment if launching into another activity

Also always show the Wi-Fi page

Change-Id: I3be39f793403131ea07d071c3d107b1800771e65

7 files changed, 49 insertions, 1 deletions

diff --git a/res/drawable-hdpi/timer.png b/res/drawable-hdpi/timer.png
new file mode 100755
index 0000000..359045c
--- /dev/null
+++ b/res/drawable-hdpi/timer.png
diff --git a/res/drawable-mdpi/timer.png b/res/drawable-mdpi/timer.png
new file mode 100755
index 0000000..be27157
--- /dev/null
+++ b/res/drawable-mdpi/timer.png
diff --git a/res/drawable-xhdpi/timer.png b/res/drawable-xhdpi/timer.png
new file mode 100755
index 0000000..fcaa753
--- /dev/null
+++ b/res/drawable-xhdpi/timer.png
diff --git a/res/drawable-xxhdpi/timer.png b/res/drawable-xxhdpi/timer.png
new file mode 100755
index 0000000..c10cf8f
--- /dev/null
+++ b/res/drawable-xxhdpi/timer.png
diff --git a/res/drawable-xxxhdpi/timer.png b/res/drawable-xxxhdpi/timer.png
new file mode 100755
index 0000000..ce844a2
--- /dev/null
+++ b/res/drawable-xxxhdpi/timer.png
diff --git a/res/layout/setup_loading_page.xml b/res/layout/setup_loading_page.xml
new file mode 100644
index 0000000..9959095
--- /dev/null
+++ b/res/layout/setup_loading_page.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <include layout="@layout/header" />
+
+    <ProgressBar
+        android:id="@+id/progressBar1"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:indeterminateOnly="true"
+        android:layout_width="match_parent"
+        android:layout_height="8dp" />
+
+    <FrameLayout android:id="@+id/page"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1"
+                 style="@style/PageContent">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:src="@drawable/timer"/>
+    </FrameLayout>
+</LinearLayout>
+
+
+
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 70767bf..5e1b6c6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,10 +33,11 @@
     <string name="new_account">New</string>
     <string name="skip_anyway">Skip anyway</string>
     <string name="dont_skip">Don\'t skip</string>
+    <string name="loading">Loading...</string>
 
     <string name="setup_complete">Setup is complete</string>
     <string name="setup_welcome">Welcome</string>
-    <string name="setup_wifi">Connect to Wi-Fi</string>
+    <string name="setup_wifi">Select Wi-Fi</string>
     <string name="setup_sim_missing">SIM Card Missing</string>
     <string name="setup_gms_account">GMS account</string>
     <string name="setup_choose_data_sim">Choose a SIM for Data</string>