Revert "Update ManagedProvisioning to the new SetupWizard library."

This reverts commit d0d91347871626f759e642cd94271054abf9197d.

Change-Id: Ibf1387c9f8362dee751406aa8bc87e930e444432

11 files changed, 26 insertions, 45 deletions

diff --git a/res/drawable-hdpi/ic_corp_icon.png b/res/drawable-hdpi/ic_corp_icon.png
deleted file mode 100644
index d83a862d..00000000
--- a/res/drawable-hdpi/ic_corp_icon.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_corp_icon.png b/res/drawable-mdpi/ic_corp_icon.png
deleted file mode 100644
index 79372b21..00000000
--- a/res/drawable-mdpi/ic_corp_icon.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_corp_icon.png b/res/drawable-xhdpi/ic_corp_icon.png
deleted file mode 100644
index 3626c7d0..00000000
--- a/res/drawable-xhdpi/ic_corp_icon.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_corp_icon.png b/res/drawable-xxhdpi/ic_corp_icon.png
deleted file mode 100644
index d33319f3..00000000
--- a/res/drawable-xxhdpi/ic_corp_icon.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_corp_icon.png b/res/drawable-xxxhdpi/ic_corp_icon.png
deleted file mode 100644
index 359e210e..00000000
--- a/res/drawable-xxxhdpi/ic_corp_icon.png
+++ /dev/null
diff --git a/res/layout/encrypt_device.xml b/res/layout/encrypt_device.xml
index 8df462ea..bb486088 100644
--- a/res/layout/encrypt_device.xml
+++ b/res/layout/encrypt_device.xml
@@ -16,28 +16,13 @@
  * limitations under the License.
  */
 -->
-<com.android.setupwizardlib.GlifLayout
+<com.android.setupwizardlib.SetupWizardLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:id="@+id/setup_wizard_layout"
        android:layout_width="match_parent"
        android:layout_height="match_parent">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/MainTextContainer"
-        android:orientation="vertical">
        <TextView
            android:id="@+id/encrypt_main_text"
-           style="@style/MainText" />
-       <LinearLayout
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:gravity="right"
-           android:orientation="horizontal" >
-           <Button
-               android:id="@+id/encrypt_button"
-               style="@style/TransparentButton"
-               android:text="@string/encrypt_device_launch_settings"
-               android:paddingTop="@dimen/button_padding_top"/>
-       </LinearLayout>
-    </LinearLayout>
-</com.android.setupwizardlib.GlifLayout>
+           style="@style/MainTextContainer" />
+</com.android.setupwizardlib.SetupWizardLayout>
\ No newline at end of file
diff --git a/res/layout/progress.xml b/res/layout/progress.xml
index cb08ada9..a011b787 100644
--- a/res/layout/progress.xml
+++ b/res/layout/progress.xml
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 -->
-<com.android.setupwizardlib.GlifLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/setup_wizard_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <TextView
+<com.android.setupwizardlib.SetupWizardLayout
+       xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       android:id="@+id/setup_wizard_layout"
+       android:layout_width="match_parent"
+       android:layout_height="match_parent">
+       <TextView
             style="@style/MainTextContainer"
             android:id="@+id/prog_text" />
-</com.android.setupwizardlib.GlifLayout>
+</com.android.setupwizardlib.SetupWizardLayout>
\ No newline at end of file
diff --git a/res/layout/user_consent.xml b/res/layout/user_consent.xml
index f18e67d1..1f39c3e0 100644
--- a/res/layout/user_consent.xml
+++ b/res/layout/user_consent.xml
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 -->
-<com.android.setupwizardlib.GlifLayout
+<com.android.setupwizardlib.SetupWizardLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:id="@+id/setup_wizard_layout"
        android:layout_width="match_parent"
        android:layout_height="match_parent">
        <include layout="@layout/user_consent_main_text" />
-</com.android.setupwizardlib.GlifLayout>
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/user_consent_main_text.xml b/res/layout/user_consent_main_text.xml
index 95571f25..99ae8639 100644
--- a/res/layout/user_consent_main_text.xml
+++ b/res/layout/user_consent_main_text.xml
@@ -19,6 +19,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/MainTextContainer"
     android:orientation="vertical">
+    <!-- This ImageView is a mock -->
+    <ImageView
+        android:id="@+id/organisation_logo_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:maxWidth="60dp"
+        android:maxHeight="60dp"
+        android:scaleType="centerInside"
+        android:visibility="gone"/>
     <TextView
         android:id="@+id/user_consent_message"
         style="@style/MainText"
@@ -27,16 +37,4 @@
         android:id="@+id/mdm_info_message"
         style="@style/MainText"/>
     <include layout="@layout/device_manager_icon_label"/>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="right"
-        android:orientation="horizontal" >
-        <Button
-            android:id="@+id/setup_button"
-            android:visibility="gone"
-            style="@style/TransparentButton"
-            android:paddingTop="@dimen/button_padding_top"/>
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8c7661e9..5b61df03 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,14 +19,13 @@
 <resources>
     <color name="text_black">#333333</color>
     <color name="black">#000000</color>
-    <color name="blue">#4285F4</color>
     <color name="gray">#ebebeb</color>
     <color name="light_gray">#fafafa</color>
     <color name="white">#ffffff</color>
     <color name="teal">#00796B</color>
     <color name="dark_teal">#00695C</color>
     <color name="dark_turquoise">#4db6ac</color>
-    <color name="accent">@color/blue</color>
+    <color name="accent">@color/orange</color>
     <color name="transparent">#00000000</color>
     <color name="orange">#FF5722</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4006f29f..a77dc65f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,8 +21,8 @@
     <!-- Main text -->
     <dimen name="main_text_padding_left_right">40dp</dimen>
     <dimen name="main_text_padding_bottom">24dp</dimen>
-    <dimen name="main_text_padding_top">0dp</dimen>
-    <dimen name="main_text_padding_between_text">24dp</dimen>
+    <dimen name="main_text_padding_top">34dp</dimen>
+    <dimen name="main_text_padding_between_text">16dp</dimen>
     <dimen name="main_text_size">16sp</dimen>
 
     <!-- Dialog Fragment text -->
@@ -37,7 +37,6 @@
 
     <dimen name="row_height">72dp</dimen>
     <dimen name="row_padding_top">0dp</dimen>
-    <dimen name="button_padding_top">32dp</dimen>
 
     <dimen name="checkbox_padding_left">24dp</dimen>
     <dimen name="checkbox_margin_top">24dp</dimen>