From 6042ea8d3f0c789e61b8530a815f0da253996d17 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 25 Jul 2017 14:18:56 -0700
Subject: [PATCH 01/75] Import translations. DO NOT MERGE

Change-Id: I17c2c5957d9eaab581330b20fc6925def9a0d111
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-af/strings.xml        | 23 -------------------
 library/main/res/values-am/strings.xml        | 23 -------------------
 library/main/res/values-ar/strings.xml        | 23 -------------------
 library/main/res/values-az/strings.xml        | 23 -------------------
 library/main/res/values-b+sr+Latn/strings.xml | 23 -------------------
 library/main/res/values-be/strings.xml        | 23 -------------------
 library/main/res/values-bg/strings.xml        | 23 -------------------
 library/main/res/values-bn/strings.xml        | 23 -------------------
 library/main/res/values-bs/strings.xml        | 23 -------------------
 library/main/res/values-ca/strings.xml        | 23 -------------------
 library/main/res/values-cs/strings.xml        | 23 -------------------
 library/main/res/values-da/strings.xml        | 23 -------------------
 library/main/res/values-de/strings.xml        | 23 -------------------
 library/main/res/values-el/strings.xml        | 23 -------------------
 library/main/res/values-en-rAU/strings.xml    | 23 -------------------
 library/main/res/values-en-rGB/strings.xml    | 23 -------------------
 library/main/res/values-en-rIN/strings.xml    | 23 -------------------
 library/main/res/values-es-rUS/strings.xml    | 23 -------------------
 library/main/res/values-es/strings.xml        | 23 -------------------
 library/main/res/values-et/strings.xml        | 23 -------------------
 library/main/res/values-eu/strings.xml        | 23 -------------------
 library/main/res/values-fa/strings.xml        | 23 -------------------
 library/main/res/values-fi/strings.xml        | 23 -------------------
 library/main/res/values-fr-rCA/strings.xml    | 23 -------------------
 library/main/res/values-fr/strings.xml        | 23 -------------------
 library/main/res/values-gl/strings.xml        | 23 -------------------
 library/main/res/values-gu/strings.xml        | 23 -------------------
 library/main/res/values-hi/strings.xml        | 23 -------------------
 library/main/res/values-hr/strings.xml        | 23 -------------------
 library/main/res/values-hu/strings.xml        | 23 -------------------
 library/main/res/values-hy/strings.xml        | 23 -------------------
 library/main/res/values-in/strings.xml        | 23 -------------------
 library/main/res/values-is/strings.xml        | 23 -------------------
 library/main/res/values-it/strings.xml        | 23 -------------------
 library/main/res/values-iw/strings.xml        | 23 -------------------
 library/main/res/values-ja/strings.xml        | 23 -------------------
 library/main/res/values-ka/strings.xml        | 23 -------------------
 library/main/res/values-kk/strings.xml        | 23 -------------------
 library/main/res/values-km/strings.xml        | 23 -------------------
 library/main/res/values-kn/strings.xml        | 23 -------------------
 library/main/res/values-ko/strings.xml        | 23 -------------------
 library/main/res/values-ky/strings.xml        | 23 -------------------
 library/main/res/values-lo/strings.xml        | 23 -------------------
 library/main/res/values-lt/strings.xml        | 23 -------------------
 library/main/res/values-lv/strings.xml        | 23 -------------------
 library/main/res/values-mk/strings.xml        | 23 -------------------
 library/main/res/values-ml/strings.xml        | 23 -------------------
 library/main/res/values-mn/strings.xml        | 23 -------------------
 library/main/res/values-mr/strings.xml        | 23 -------------------
 library/main/res/values-ms/strings.xml        | 23 -------------------
 library/main/res/values-my/strings.xml        | 23 -------------------
 library/main/res/values-nb/strings.xml        | 23 -------------------
 library/main/res/values-ne/strings.xml        | 23 -------------------
 library/main/res/values-nl/strings.xml        | 23 -------------------
 library/main/res/values-pa/strings.xml        | 23 -------------------
 library/main/res/values-pl/strings.xml        | 23 -------------------
 library/main/res/values-pt-rBR/strings.xml    | 23 -------------------
 library/main/res/values-pt-rPT/strings.xml    | 23 -------------------
 library/main/res/values-pt/strings.xml        | 23 -------------------
 library/main/res/values-ro/strings.xml        | 23 -------------------
 library/main/res/values-ru/strings.xml        | 23 -------------------
 library/main/res/values-si/strings.xml        | 23 -------------------
 library/main/res/values-sk/strings.xml        | 23 -------------------
 library/main/res/values-sl/strings.xml        | 23 -------------------
 library/main/res/values-sq/strings.xml        | 23 -------------------
 library/main/res/values-sr/strings.xml        | 23 -------------------
 library/main/res/values-sv/strings.xml        | 23 -------------------
 library/main/res/values-sw/strings.xml        | 23 -------------------
 library/main/res/values-ta/strings.xml        | 23 -------------------
 library/main/res/values-te/strings.xml        | 23 -------------------
 library/main/res/values-th/strings.xml        | 23 -------------------
 library/main/res/values-tl/strings.xml        | 23 -------------------
 library/main/res/values-tr/strings.xml        | 23 -------------------
 library/main/res/values-uk/strings.xml        | 23 -------------------
 library/main/res/values-ur/strings.xml        | 23 -------------------
 library/main/res/values-uz/strings.xml        | 23 -------------------
 library/main/res/values-vi/strings.xml        | 23 -------------------
 library/main/res/values-zh-rCN/strings.xml    | 23 -------------------
 library/main/res/values-zh-rHK/strings.xml    | 23 -------------------
 library/main/res/values-zh-rTW/strings.xml    | 23 -------------------
 library/main/res/values-zu/strings.xml        | 23 -------------------
 81 files changed, 1863 deletions(-)
 delete mode 100644 library/main/res/values-af/strings.xml
 delete mode 100644 library/main/res/values-am/strings.xml
 delete mode 100644 library/main/res/values-ar/strings.xml
 delete mode 100644 library/main/res/values-az/strings.xml
 delete mode 100644 library/main/res/values-b+sr+Latn/strings.xml
 delete mode 100644 library/main/res/values-be/strings.xml
 delete mode 100644 library/main/res/values-bg/strings.xml
 delete mode 100644 library/main/res/values-bn/strings.xml
 delete mode 100644 library/main/res/values-bs/strings.xml
 delete mode 100644 library/main/res/values-ca/strings.xml
 delete mode 100644 library/main/res/values-cs/strings.xml
 delete mode 100644 library/main/res/values-da/strings.xml
 delete mode 100644 library/main/res/values-de/strings.xml
 delete mode 100644 library/main/res/values-el/strings.xml
 delete mode 100644 library/main/res/values-en-rAU/strings.xml
 delete mode 100644 library/main/res/values-en-rGB/strings.xml
 delete mode 100644 library/main/res/values-en-rIN/strings.xml
 delete mode 100644 library/main/res/values-es-rUS/strings.xml
 delete mode 100644 library/main/res/values-es/strings.xml
 delete mode 100644 library/main/res/values-et/strings.xml
 delete mode 100644 library/main/res/values-eu/strings.xml
 delete mode 100644 library/main/res/values-fa/strings.xml
 delete mode 100644 library/main/res/values-fi/strings.xml
 delete mode 100644 library/main/res/values-fr-rCA/strings.xml
 delete mode 100644 library/main/res/values-fr/strings.xml
 delete mode 100644 library/main/res/values-gl/strings.xml
 delete mode 100644 library/main/res/values-gu/strings.xml
 delete mode 100644 library/main/res/values-hi/strings.xml
 delete mode 100644 library/main/res/values-hr/strings.xml
 delete mode 100644 library/main/res/values-hu/strings.xml
 delete mode 100644 library/main/res/values-hy/strings.xml
 delete mode 100644 library/main/res/values-in/strings.xml
 delete mode 100644 library/main/res/values-is/strings.xml
 delete mode 100644 library/main/res/values-it/strings.xml
 delete mode 100644 library/main/res/values-iw/strings.xml
 delete mode 100644 library/main/res/values-ja/strings.xml
 delete mode 100644 library/main/res/values-ka/strings.xml
 delete mode 100644 library/main/res/values-kk/strings.xml
 delete mode 100644 library/main/res/values-km/strings.xml
 delete mode 100644 library/main/res/values-kn/strings.xml
 delete mode 100644 library/main/res/values-ko/strings.xml
 delete mode 100644 library/main/res/values-ky/strings.xml
 delete mode 100644 library/main/res/values-lo/strings.xml
 delete mode 100644 library/main/res/values-lt/strings.xml
 delete mode 100644 library/main/res/values-lv/strings.xml
 delete mode 100644 library/main/res/values-mk/strings.xml
 delete mode 100644 library/main/res/values-ml/strings.xml
 delete mode 100644 library/main/res/values-mn/strings.xml
 delete mode 100644 library/main/res/values-mr/strings.xml
 delete mode 100644 library/main/res/values-ms/strings.xml
 delete mode 100644 library/main/res/values-my/strings.xml
 delete mode 100644 library/main/res/values-nb/strings.xml
 delete mode 100644 library/main/res/values-ne/strings.xml
 delete mode 100644 library/main/res/values-nl/strings.xml
 delete mode 100644 library/main/res/values-pa/strings.xml
 delete mode 100644 library/main/res/values-pl/strings.xml
 delete mode 100644 library/main/res/values-pt-rBR/strings.xml
 delete mode 100644 library/main/res/values-pt-rPT/strings.xml
 delete mode 100644 library/main/res/values-pt/strings.xml
 delete mode 100644 library/main/res/values-ro/strings.xml
 delete mode 100644 library/main/res/values-ru/strings.xml
 delete mode 100644 library/main/res/values-si/strings.xml
 delete mode 100644 library/main/res/values-sk/strings.xml
 delete mode 100644 library/main/res/values-sl/strings.xml
 delete mode 100644 library/main/res/values-sq/strings.xml
 delete mode 100644 library/main/res/values-sr/strings.xml
 delete mode 100644 library/main/res/values-sv/strings.xml
 delete mode 100644 library/main/res/values-sw/strings.xml
 delete mode 100644 library/main/res/values-ta/strings.xml
 delete mode 100644 library/main/res/values-te/strings.xml
 delete mode 100644 library/main/res/values-th/strings.xml
 delete mode 100644 library/main/res/values-tl/strings.xml
 delete mode 100644 library/main/res/values-tr/strings.xml
 delete mode 100644 library/main/res/values-uk/strings.xml
 delete mode 100644 library/main/res/values-ur/strings.xml
 delete mode 100644 library/main/res/values-uz/strings.xml
 delete mode 100644 library/main/res/values-vi/strings.xml
 delete mode 100644 library/main/res/values-zh-rCN/strings.xml
 delete mode 100644 library/main/res/values-zh-rHK/strings.xml
 delete mode 100644 library/main/res/values-zh-rTW/strings.xml
 delete mode 100644 library/main/res/values-zu/strings.xml

diff --git a/library/main/res/values-af/strings.xml b/library/main/res/values-af/strings.xml
deleted file mode 100644
index 27dfb9a..0000000
--- a/library/main/res/values-af/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Volgende"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Terug"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Meer"</string>
-</resources>
diff --git a/library/main/res/values-am/strings.xml b/library/main/res/values-am/strings.xml
deleted file mode 100644
index b2870e0..0000000
--- a/library/main/res/values-am/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ቀጣይ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ተመለስ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"ተጨማሪ"</string>
-</resources>
diff --git a/library/main/res/values-ar/strings.xml b/library/main/res/values-ar/strings.xml
deleted file mode 100644
index 81877a6..0000000
--- a/library/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"التالي"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"رجوع"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"المزيد"</string>
-</resources>
diff --git a/library/main/res/values-az/strings.xml b/library/main/res/values-az/strings.xml
deleted file mode 100644
index 3086528..0000000
--- a/library/main/res/values-az/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Növbəti"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Geri"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Daha çox"</string>
-</resources>
diff --git a/library/main/res/values-b+sr+Latn/strings.xml b/library/main/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 2a0934c..0000000
--- a/library/main/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Dalje"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Nazad"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Još"</string>
-</resources>
diff --git a/library/main/res/values-be/strings.xml b/library/main/res/values-be/strings.xml
deleted file mode 100644
index 1753d86..0000000
--- a/library/main/res/values-be/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Далей"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Яшчэ"</string>
-</resources>
diff --git a/library/main/res/values-bg/strings.xml b/library/main/res/values-bg/strings.xml
deleted file mode 100644
index 6580ccd..0000000
--- a/library/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Напред"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Още"</string>
-</resources>
diff --git a/library/main/res/values-bn/strings.xml b/library/main/res/values-bn/strings.xml
deleted file mode 100644
index d807c08..0000000
--- a/library/main/res/values-bn/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"পরবর্তী"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ফিরুন"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"আরো"</string>
-</resources>
diff --git a/library/main/res/values-bs/strings.xml b/library/main/res/values-bs/strings.xml
deleted file mode 100644
index 2490af5..0000000
--- a/library/main/res/values-bs/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Naprijed"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Nazad"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Još"</string>
-</resources>
diff --git a/library/main/res/values-ca/strings.xml b/library/main/res/values-ca/strings.xml
deleted file mode 100644
index 55fffc3..0000000
--- a/library/main/res/values-ca/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Següent"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Enrere"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Més"</string>
-</resources>
diff --git a/library/main/res/values-cs/strings.xml b/library/main/res/values-cs/strings.xml
deleted file mode 100644
index ea061b2..0000000
--- a/library/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Další"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Zpět"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Další"</string>
-</resources>
diff --git a/library/main/res/values-da/strings.xml b/library/main/res/values-da/strings.xml
deleted file mode 100644
index dc0213f..0000000
--- a/library/main/res/values-da/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Næste"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Tilbage"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mere"</string>
-</resources>
diff --git a/library/main/res/values-de/strings.xml b/library/main/res/values-de/strings.xml
deleted file mode 100644
index 222b4f0..0000000
--- a/library/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Weiter"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Zurück"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mehr"</string>
-</resources>
diff --git a/library/main/res/values-el/strings.xml b/library/main/res/values-el/strings.xml
deleted file mode 100644
index 221cb85..0000000
--- a/library/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Επόμενο"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Πίσω"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Περισσότερα"</string>
-</resources>
diff --git a/library/main/res/values-en-rAU/strings.xml b/library/main/res/values-en-rAU/strings.xml
deleted file mode 100644
index 5260500..0000000
--- a/library/main/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
-</resources>
diff --git a/library/main/res/values-en-rGB/strings.xml b/library/main/res/values-en-rGB/strings.xml
deleted file mode 100644
index 5260500..0000000
--- a/library/main/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
-</resources>
diff --git a/library/main/res/values-en-rIN/strings.xml b/library/main/res/values-en-rIN/strings.xml
deleted file mode 100644
index 5260500..0000000
--- a/library/main/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
-</resources>
diff --git a/library/main/res/values-es-rUS/strings.xml b/library/main/res/values-es-rUS/strings.xml
deleted file mode 100644
index c86f18c..0000000
--- a/library/main/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Siguiente"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Atrás"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Más"</string>
-</resources>
diff --git a/library/main/res/values-es/strings.xml b/library/main/res/values-es/strings.xml
deleted file mode 100644
index c86f18c..0000000
--- a/library/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Siguiente"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Atrás"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Más"</string>
-</resources>
diff --git a/library/main/res/values-et/strings.xml b/library/main/res/values-et/strings.xml
deleted file mode 100644
index 45fa9dc..0000000
--- a/library/main/res/values-et/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Edasi"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Tagasi"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Rohkem"</string>
-</resources>
diff --git a/library/main/res/values-eu/strings.xml b/library/main/res/values-eu/strings.xml
deleted file mode 100644
index 0e3738e..0000000
--- a/library/main/res/values-eu/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Hurrengoa"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Atzera"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Gehiago"</string>
-</resources>
diff --git a/library/main/res/values-fa/strings.xml b/library/main/res/values-fa/strings.xml
deleted file mode 100644
index 58fd9ba..0000000
--- a/library/main/res/values-fa/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"بعدی"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"برگشت"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"بیشتر"</string>
-</resources>
diff --git a/library/main/res/values-fi/strings.xml b/library/main/res/values-fi/strings.xml
deleted file mode 100644
index 35b4360..0000000
--- a/library/main/res/values-fi/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Seuraava"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Takaisin"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Lisää"</string>
-</resources>
diff --git a/library/main/res/values-fr-rCA/strings.xml b/library/main/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 9e5badf..0000000
--- a/library/main/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Suivant"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Précédent"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Plus"</string>
-</resources>
diff --git a/library/main/res/values-fr/strings.xml b/library/main/res/values-fr/strings.xml
deleted file mode 100644
index 5c4f2b7..0000000
--- a/library/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Suivant"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Retour"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Plus"</string>
-</resources>
diff --git a/library/main/res/values-gl/strings.xml b/library/main/res/values-gl/strings.xml
deleted file mode 100644
index 28548a5..0000000
--- a/library/main/res/values-gl/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Seguinte"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Atrás"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Máis"</string>
-</resources>
diff --git a/library/main/res/values-gu/strings.xml b/library/main/res/values-gu/strings.xml
deleted file mode 100644
index eceb654..0000000
--- a/library/main/res/values-gu/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"આગલું"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"પાછળ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"વધુ"</string>
-</resources>
diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
deleted file mode 100644
index d30fbb4..0000000
--- a/library/main/res/values-hi/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"आगे"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
-</resources>
diff --git a/library/main/res/values-hr/strings.xml b/library/main/res/values-hr/strings.xml
deleted file mode 100644
index 2ea5d79..0000000
--- a/library/main/res/values-hr/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Dalje"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Natrag"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Više"</string>
-</resources>
diff --git a/library/main/res/values-hu/strings.xml b/library/main/res/values-hu/strings.xml
deleted file mode 100644
index dae7516..0000000
--- a/library/main/res/values-hu/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Következő"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Vissza"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Továbbiak"</string>
-</resources>
diff --git a/library/main/res/values-hy/strings.xml b/library/main/res/values-hy/strings.xml
deleted file mode 100644
index 68083dd..0000000
--- a/library/main/res/values-hy/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Առաջ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Հետ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Ավելին"</string>
-</resources>
diff --git a/library/main/res/values-in/strings.xml b/library/main/res/values-in/strings.xml
deleted file mode 100644
index e58bb0d..0000000
--- a/library/main/res/values-in/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Berikutnya"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Kembali"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Lainnya"</string>
-</resources>
diff --git a/library/main/res/values-is/strings.xml b/library/main/res/values-is/strings.xml
deleted file mode 100644
index 13b3d30..0000000
--- a/library/main/res/values-is/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Áfram"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Til baka"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Meira"</string>
-</resources>
diff --git a/library/main/res/values-it/strings.xml b/library/main/res/values-it/strings.xml
deleted file mode 100644
index a787895..0000000
--- a/library/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Avanti"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Indietro"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Altro"</string>
-</resources>
diff --git a/library/main/res/values-iw/strings.xml b/library/main/res/values-iw/strings.xml
deleted file mode 100644
index 856cff8..0000000
--- a/library/main/res/values-iw/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"הבא"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"חזרה"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"עוד"</string>
-</resources>
diff --git a/library/main/res/values-ja/strings.xml b/library/main/res/values-ja/strings.xml
deleted file mode 100644
index b21b8d3..0000000
--- a/library/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"次へ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"戻る"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"もっと見る"</string>
-</resources>
diff --git a/library/main/res/values-ka/strings.xml b/library/main/res/values-ka/strings.xml
deleted file mode 100644
index e90c485..0000000
--- a/library/main/res/values-ka/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"შემდეგი"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"უკან"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"დამატებით"</string>
-</resources>
diff --git a/library/main/res/values-kk/strings.xml b/library/main/res/values-kk/strings.xml
deleted file mode 100644
index d3c6fa4..0000000
--- a/library/main/res/values-kk/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Келесі"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Артқа"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Тағы"</string>
-</resources>
diff --git a/library/main/res/values-km/strings.xml b/library/main/res/values-km/strings.xml
deleted file mode 100644
index 7bf81a2..0000000
--- a/library/main/res/values-km/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"បន្ទាប់"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ថយក្រោយ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"ច្រើនទៀត"</string>
-</resources>
diff --git a/library/main/res/values-kn/strings.xml b/library/main/res/values-kn/strings.xml
deleted file mode 100644
index 0e609bb..0000000
--- a/library/main/res/values-kn/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ಮುಂದೆ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ಹಿಂದೆ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"ಇನ್ನಷ್ಟು"</string>
-</resources>
diff --git a/library/main/res/values-ko/strings.xml b/library/main/res/values-ko/strings.xml
deleted file mode 100644
index e55c0d7..0000000
--- a/library/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"다음"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"뒤로"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"더보기"</string>
-</resources>
diff --git a/library/main/res/values-ky/strings.xml b/library/main/res/values-ky/strings.xml
deleted file mode 100644
index c3b3a4c..0000000
--- a/library/main/res/values-ky/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Кийинки"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Артка"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Дагы"</string>
-</resources>
diff --git a/library/main/res/values-lo/strings.xml b/library/main/res/values-lo/strings.xml
deleted file mode 100644
index 568b7a5..0000000
--- a/library/main/res/values-lo/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ຕໍ່​ໄປ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ກັບຄືນ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"ເພີ່ມເຕີມ"</string>
-</resources>
diff --git a/library/main/res/values-lt/strings.xml b/library/main/res/values-lt/strings.xml
deleted file mode 100644
index db46bd5..0000000
--- a/library/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Kitas"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Atgal"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Daugiau"</string>
-</resources>
diff --git a/library/main/res/values-lv/strings.xml b/library/main/res/values-lv/strings.xml
deleted file mode 100644
index dee7589..0000000
--- a/library/main/res/values-lv/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Tālāk"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Atpakaļ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Vairāk"</string>
-</resources>
diff --git a/library/main/res/values-mk/strings.xml b/library/main/res/values-mk/strings.xml
deleted file mode 100644
index 30ee8f2..0000000
--- a/library/main/res/values-mk/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Следно"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Повеќе"</string>
-</resources>
diff --git a/library/main/res/values-ml/strings.xml b/library/main/res/values-ml/strings.xml
deleted file mode 100644
index 394c894..0000000
--- a/library/main/res/values-ml/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"അടുത്തത്"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"മടങ്ങുക"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"കൂടുതൽ"</string>
-</resources>
diff --git a/library/main/res/values-mn/strings.xml b/library/main/res/values-mn/strings.xml
deleted file mode 100644
index 18a6e27..0000000
--- a/library/main/res/values-mn/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Дараах"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Буцах"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Илүү"</string>
-</resources>
diff --git a/library/main/res/values-mr/strings.xml b/library/main/res/values-mr/strings.xml
deleted file mode 100644
index bb9980e..0000000
--- a/library/main/res/values-mr/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"पुढील"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"परत"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
-</resources>
diff --git a/library/main/res/values-ms/strings.xml b/library/main/res/values-ms/strings.xml
deleted file mode 100644
index 04b8c6f..0000000
--- a/library/main/res/values-ms/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Seterusnya"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Kembali"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Lagi"</string>
-</resources>
diff --git a/library/main/res/values-my/strings.xml b/library/main/res/values-my/strings.xml
deleted file mode 100644
index 4bdcd11..0000000
--- a/library/main/res/values-my/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ရှေ့သို့"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"နောက်သို့"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"နောက်ထပ်"</string>
-</resources>
diff --git a/library/main/res/values-nb/strings.xml b/library/main/res/values-nb/strings.xml
deleted file mode 100644
index bc856e3..0000000
--- a/library/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Neste"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Tilbake"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mer"</string>
-</resources>
diff --git a/library/main/res/values-ne/strings.xml b/library/main/res/values-ne/strings.xml
deleted file mode 100644
index c46b118..0000000
--- a/library/main/res/values-ne/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"अर्को"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"पछाडि जानुहोस्"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"थप"</string>
-</resources>
diff --git a/library/main/res/values-nl/strings.xml b/library/main/res/values-nl/strings.xml
deleted file mode 100644
index 27dfb9a..0000000
--- a/library/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Volgende"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Terug"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Meer"</string>
-</resources>
diff --git a/library/main/res/values-pa/strings.xml b/library/main/res/values-pa/strings.xml
deleted file mode 100644
index 742020c..0000000
--- a/library/main/res/values-pa/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ਅੱਗੇ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ਪਿੱਛੇ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"ਹੋਰ"</string>
-</resources>
diff --git a/library/main/res/values-pl/strings.xml b/library/main/res/values-pl/strings.xml
deleted file mode 100644
index f4e7e81..0000000
--- a/library/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Dalej"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Wstecz"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Więcej"</string>
-</resources>
diff --git a/library/main/res/values-pt-rBR/strings.xml b/library/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 79d86e2..0000000
--- a/library/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
-</resources>
diff --git a/library/main/res/values-pt-rPT/strings.xml b/library/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index b9c95a1..0000000
--- a/library/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Seguinte"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Anterior"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
-</resources>
diff --git a/library/main/res/values-pt/strings.xml b/library/main/res/values-pt/strings.xml
deleted file mode 100644
index 79d86e2..0000000
--- a/library/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
-</resources>
diff --git a/library/main/res/values-ro/strings.xml b/library/main/res/values-ro/strings.xml
deleted file mode 100644
index 7e643a7..0000000
--- a/library/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Înainte"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Înapoi"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mai mult"</string>
-</resources>
diff --git a/library/main/res/values-ru/strings.xml b/library/main/res/values-ru/strings.xml
deleted file mode 100644
index fcfbc3d..0000000
--- a/library/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Далее"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Ещё"</string>
-</resources>
diff --git a/library/main/res/values-si/strings.xml b/library/main/res/values-si/strings.xml
deleted file mode 100644
index f79c169..0000000
--- a/library/main/res/values-si/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ඊළඟ"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"ආපසු"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"තවත්"</string>
-</resources>
diff --git a/library/main/res/values-sk/strings.xml b/library/main/res/values-sk/strings.xml
deleted file mode 100644
index 30fe40a..0000000
--- a/library/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Ďalej"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Späť"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Viac"</string>
-</resources>
diff --git a/library/main/res/values-sl/strings.xml b/library/main/res/values-sl/strings.xml
deleted file mode 100644
index 0aa330d..0000000
--- a/library/main/res/values-sl/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Naprej"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Nazaj"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Več"</string>
-</resources>
diff --git a/library/main/res/values-sq/strings.xml b/library/main/res/values-sq/strings.xml
deleted file mode 100644
index c30f08d..0000000
--- a/library/main/res/values-sq/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Përpara"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Prapa"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Më shumë"</string>
-</resources>
diff --git a/library/main/res/values-sr/strings.xml b/library/main/res/values-sr/strings.xml
deleted file mode 100644
index 20be271..0000000
--- a/library/main/res/values-sr/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Даље"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Још"</string>
-</resources>
diff --git a/library/main/res/values-sv/strings.xml b/library/main/res/values-sv/strings.xml
deleted file mode 100644
index 2d66a8d..0000000
--- a/library/main/res/values-sv/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Nästa"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Tillbaka"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Mer"</string>
-</resources>
diff --git a/library/main/res/values-sw/strings.xml b/library/main/res/values-sw/strings.xml
deleted file mode 100644
index 8191ab8..0000000
--- a/library/main/res/values-sw/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Endelea"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Rudi nyuma"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Zaidi"</string>
-</resources>
diff --git a/library/main/res/values-ta/strings.xml b/library/main/res/values-ta/strings.xml
deleted file mode 100644
index 59a6098..0000000
--- a/library/main/res/values-ta/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"அடுத்து"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"முந்தையது"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"மேலும்"</string>
-</resources>
diff --git a/library/main/res/values-te/strings.xml b/library/main/res/values-te/strings.xml
deleted file mode 100644
index 4209a3c..0000000
--- a/library/main/res/values-te/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"తదుపరి"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"వెనుకకు"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"మరింత"</string>
-</resources>
diff --git a/library/main/res/values-th/strings.xml b/library/main/res/values-th/strings.xml
deleted file mode 100644
index 0ea98d6..0000000
--- a/library/main/res/values-th/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"ถัดไป"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"กลับ"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"เพิ่มเติม"</string>
-</resources>
diff --git a/library/main/res/values-tl/strings.xml b/library/main/res/values-tl/strings.xml
deleted file mode 100644
index dc85cb8..0000000
--- a/library/main/res/values-tl/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Susunod"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Bumalik"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Higit pa"</string>
-</resources>
diff --git a/library/main/res/values-tr/strings.xml b/library/main/res/values-tr/strings.xml
deleted file mode 100644
index 8e14f51..0000000
--- a/library/main/res/values-tr/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"İleri"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Geri"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Diğer"</string>
-</resources>
diff --git a/library/main/res/values-uk/strings.xml b/library/main/res/values-uk/strings.xml
deleted file mode 100644
index 7777cd5..0000000
--- a/library/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Далі"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Більше"</string>
-</resources>
diff --git a/library/main/res/values-ur/strings.xml b/library/main/res/values-ur/strings.xml
deleted file mode 100644
index e4e8fc4..0000000
--- a/library/main/res/values-ur/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"آگے"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"پیچھے"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"مزید"</string>
-</resources>
diff --git a/library/main/res/values-uz/strings.xml b/library/main/res/values-uz/strings.xml
deleted file mode 100644
index dfc9014..0000000
--- a/library/main/res/values-uz/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Keyingisi"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Orqaga"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Yana"</string>
-</resources>
diff --git a/library/main/res/values-vi/strings.xml b/library/main/res/values-vi/strings.xml
deleted file mode 100644
index 40fb5ab..0000000
--- a/library/main/res/values-vi/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Tiếp theo"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Quay lại"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Khác"</string>
-</resources>
diff --git a/library/main/res/values-zh-rCN/strings.xml b/library/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 1ba83ed..0000000
--- a/library/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"下一步"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"返回"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"更多"</string>
-</resources>
diff --git a/library/main/res/values-zh-rHK/strings.xml b/library/main/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 1ba83ed..0000000
--- a/library/main/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"下一步"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"返回"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"更多"</string>
-</resources>
diff --git a/library/main/res/values-zh-rTW/strings.xml b/library/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 9115698..0000000
--- a/library/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"繼續"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"返回"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"更多"</string>
-</resources>
diff --git a/library/main/res/values-zu/strings.xml b/library/main/res/values-zu/strings.xml
deleted file mode 100644
index 93e30c2..0000000
--- a/library/main/res/values-zu/strings.xml
+++ /dev/null
@@ -1,23 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Okulandelayo"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"Emuva"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"Okuningi"</string>
-</resources>

From 321851f6ffaf9af8c26d934689675a55b4c43257 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 25 Jul 2017 23:47:13 +0000
Subject: [PATCH 02/75] Revert "Import translations. DO NOT MERGE"

This reverts commit 6042ea8d3f0c789e61b8530a815f0da253996d17.

Change-Id: I22b5dbda88c93cd028745fc4e9582150cec8def8
---
 library/main/res/values-af/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-am/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ar/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-az/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-b+sr+Latn/strings.xml | 23 +++++++++++++++++++
 library/main/res/values-be/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-bg/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-bn/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-bs/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ca/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-cs/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-da/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-de/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-el/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-en-rAU/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-en-rGB/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-en-rIN/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-es-rUS/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-es/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-et/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-eu/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-fa/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-fi/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-fr-rCA/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-fr/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-gl/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-gu/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-hi/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-hr/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-hu/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-hy/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-in/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-is/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-it/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-iw/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ja/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ka/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-kk/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-km/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-kn/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ko/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ky/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-lo/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-lt/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-lv/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-mk/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ml/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-mn/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-mr/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ms/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-my/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-nb/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ne/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-nl/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-pa/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-pl/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-pt-rBR/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-pt-rPT/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-pt/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ro/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ru/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-si/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-sk/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-sl/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-sq/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-sr/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-sv/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-sw/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ta/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-te/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-th/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-tl/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-tr/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-uk/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-ur/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-uz/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-vi/strings.xml        | 23 +++++++++++++++++++
 library/main/res/values-zh-rCN/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-zh-rHK/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-zh-rTW/strings.xml    | 23 +++++++++++++++++++
 library/main/res/values-zu/strings.xml        | 23 +++++++++++++++++++
 81 files changed, 1863 insertions(+)
 create mode 100644 library/main/res/values-af/strings.xml
 create mode 100644 library/main/res/values-am/strings.xml
 create mode 100644 library/main/res/values-ar/strings.xml
 create mode 100644 library/main/res/values-az/strings.xml
 create mode 100644 library/main/res/values-b+sr+Latn/strings.xml
 create mode 100644 library/main/res/values-be/strings.xml
 create mode 100644 library/main/res/values-bg/strings.xml
 create mode 100644 library/main/res/values-bn/strings.xml
 create mode 100644 library/main/res/values-bs/strings.xml
 create mode 100644 library/main/res/values-ca/strings.xml
 create mode 100644 library/main/res/values-cs/strings.xml
 create mode 100644 library/main/res/values-da/strings.xml
 create mode 100644 library/main/res/values-de/strings.xml
 create mode 100644 library/main/res/values-el/strings.xml
 create mode 100644 library/main/res/values-en-rAU/strings.xml
 create mode 100644 library/main/res/values-en-rGB/strings.xml
 create mode 100644 library/main/res/values-en-rIN/strings.xml
 create mode 100644 library/main/res/values-es-rUS/strings.xml
 create mode 100644 library/main/res/values-es/strings.xml
 create mode 100644 library/main/res/values-et/strings.xml
 create mode 100644 library/main/res/values-eu/strings.xml
 create mode 100644 library/main/res/values-fa/strings.xml
 create mode 100644 library/main/res/values-fi/strings.xml
 create mode 100644 library/main/res/values-fr-rCA/strings.xml
 create mode 100644 library/main/res/values-fr/strings.xml
 create mode 100644 library/main/res/values-gl/strings.xml
 create mode 100644 library/main/res/values-gu/strings.xml
 create mode 100644 library/main/res/values-hi/strings.xml
 create mode 100644 library/main/res/values-hr/strings.xml
 create mode 100644 library/main/res/values-hu/strings.xml
 create mode 100644 library/main/res/values-hy/strings.xml
 create mode 100644 library/main/res/values-in/strings.xml
 create mode 100644 library/main/res/values-is/strings.xml
 create mode 100644 library/main/res/values-it/strings.xml
 create mode 100644 library/main/res/values-iw/strings.xml
 create mode 100644 library/main/res/values-ja/strings.xml
 create mode 100644 library/main/res/values-ka/strings.xml
 create mode 100644 library/main/res/values-kk/strings.xml
 create mode 100644 library/main/res/values-km/strings.xml
 create mode 100644 library/main/res/values-kn/strings.xml
 create mode 100644 library/main/res/values-ko/strings.xml
 create mode 100644 library/main/res/values-ky/strings.xml
 create mode 100644 library/main/res/values-lo/strings.xml
 create mode 100644 library/main/res/values-lt/strings.xml
 create mode 100644 library/main/res/values-lv/strings.xml
 create mode 100644 library/main/res/values-mk/strings.xml
 create mode 100644 library/main/res/values-ml/strings.xml
 create mode 100644 library/main/res/values-mn/strings.xml
 create mode 100644 library/main/res/values-mr/strings.xml
 create mode 100644 library/main/res/values-ms/strings.xml
 create mode 100644 library/main/res/values-my/strings.xml
 create mode 100644 library/main/res/values-nb/strings.xml
 create mode 100644 library/main/res/values-ne/strings.xml
 create mode 100644 library/main/res/values-nl/strings.xml
 create mode 100644 library/main/res/values-pa/strings.xml
 create mode 100644 library/main/res/values-pl/strings.xml
 create mode 100644 library/main/res/values-pt-rBR/strings.xml
 create mode 100644 library/main/res/values-pt-rPT/strings.xml
 create mode 100644 library/main/res/values-pt/strings.xml
 create mode 100644 library/main/res/values-ro/strings.xml
 create mode 100644 library/main/res/values-ru/strings.xml
 create mode 100644 library/main/res/values-si/strings.xml
 create mode 100644 library/main/res/values-sk/strings.xml
 create mode 100644 library/main/res/values-sl/strings.xml
 create mode 100644 library/main/res/values-sq/strings.xml
 create mode 100644 library/main/res/values-sr/strings.xml
 create mode 100644 library/main/res/values-sv/strings.xml
 create mode 100644 library/main/res/values-sw/strings.xml
 create mode 100644 library/main/res/values-ta/strings.xml
 create mode 100644 library/main/res/values-te/strings.xml
 create mode 100644 library/main/res/values-th/strings.xml
 create mode 100644 library/main/res/values-tl/strings.xml
 create mode 100644 library/main/res/values-tr/strings.xml
 create mode 100644 library/main/res/values-uk/strings.xml
 create mode 100644 library/main/res/values-ur/strings.xml
 create mode 100644 library/main/res/values-uz/strings.xml
 create mode 100644 library/main/res/values-vi/strings.xml
 create mode 100644 library/main/res/values-zh-rCN/strings.xml
 create mode 100644 library/main/res/values-zh-rHK/strings.xml
 create mode 100644 library/main/res/values-zh-rTW/strings.xml
 create mode 100644 library/main/res/values-zu/strings.xml

diff --git a/library/main/res/values-af/strings.xml b/library/main/res/values-af/strings.xml
new file mode 100644
index 0000000..27dfb9a
--- /dev/null
+++ b/library/main/res/values-af/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Volgende"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Terug"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Meer"</string>
+</resources>
diff --git a/library/main/res/values-am/strings.xml b/library/main/res/values-am/strings.xml
new file mode 100644
index 0000000..b2870e0
--- /dev/null
+++ b/library/main/res/values-am/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ቀጣይ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ተመለስ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"ተጨማሪ"</string>
+</resources>
diff --git a/library/main/res/values-ar/strings.xml b/library/main/res/values-ar/strings.xml
new file mode 100644
index 0000000..81877a6
--- /dev/null
+++ b/library/main/res/values-ar/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"التالي"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"رجوع"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"المزيد"</string>
+</resources>
diff --git a/library/main/res/values-az/strings.xml b/library/main/res/values-az/strings.xml
new file mode 100644
index 0000000..3086528
--- /dev/null
+++ b/library/main/res/values-az/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Növbəti"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Geri"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Daha çox"</string>
+</resources>
diff --git a/library/main/res/values-b+sr+Latn/strings.xml b/library/main/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..2a0934c
--- /dev/null
+++ b/library/main/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Dalje"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Nazad"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Još"</string>
+</resources>
diff --git a/library/main/res/values-be/strings.xml b/library/main/res/values-be/strings.xml
new file mode 100644
index 0000000..1753d86
--- /dev/null
+++ b/library/main/res/values-be/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Далей"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Яшчэ"</string>
+</resources>
diff --git a/library/main/res/values-bg/strings.xml b/library/main/res/values-bg/strings.xml
new file mode 100644
index 0000000..6580ccd
--- /dev/null
+++ b/library/main/res/values-bg/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Напред"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Още"</string>
+</resources>
diff --git a/library/main/res/values-bn/strings.xml b/library/main/res/values-bn/strings.xml
new file mode 100644
index 0000000..d807c08
--- /dev/null
+++ b/library/main/res/values-bn/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"পরবর্তী"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ফিরুন"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"আরো"</string>
+</resources>
diff --git a/library/main/res/values-bs/strings.xml b/library/main/res/values-bs/strings.xml
new file mode 100644
index 0000000..2490af5
--- /dev/null
+++ b/library/main/res/values-bs/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Naprijed"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Nazad"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Još"</string>
+</resources>
diff --git a/library/main/res/values-ca/strings.xml b/library/main/res/values-ca/strings.xml
new file mode 100644
index 0000000..55fffc3
--- /dev/null
+++ b/library/main/res/values-ca/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Següent"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Enrere"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Més"</string>
+</resources>
diff --git a/library/main/res/values-cs/strings.xml b/library/main/res/values-cs/strings.xml
new file mode 100644
index 0000000..ea061b2
--- /dev/null
+++ b/library/main/res/values-cs/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Další"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Zpět"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Další"</string>
+</resources>
diff --git a/library/main/res/values-da/strings.xml b/library/main/res/values-da/strings.xml
new file mode 100644
index 0000000..dc0213f
--- /dev/null
+++ b/library/main/res/values-da/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Næste"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Tilbage"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mere"</string>
+</resources>
diff --git a/library/main/res/values-de/strings.xml b/library/main/res/values-de/strings.xml
new file mode 100644
index 0000000..222b4f0
--- /dev/null
+++ b/library/main/res/values-de/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Weiter"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Zurück"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mehr"</string>
+</resources>
diff --git a/library/main/res/values-el/strings.xml b/library/main/res/values-el/strings.xml
new file mode 100644
index 0000000..221cb85
--- /dev/null
+++ b/library/main/res/values-el/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Επόμενο"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Πίσω"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Περισσότερα"</string>
+</resources>
diff --git a/library/main/res/values-en-rAU/strings.xml b/library/main/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..5260500
--- /dev/null
+++ b/library/main/res/values-en-rAU/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
+</resources>
diff --git a/library/main/res/values-en-rGB/strings.xml b/library/main/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..5260500
--- /dev/null
+++ b/library/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
+</resources>
diff --git a/library/main/res/values-en-rIN/strings.xml b/library/main/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..5260500
--- /dev/null
+++ b/library/main/res/values-en-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
+</resources>
diff --git a/library/main/res/values-es-rUS/strings.xml b/library/main/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..c86f18c
--- /dev/null
+++ b/library/main/res/values-es-rUS/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Siguiente"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Atrás"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Más"</string>
+</resources>
diff --git a/library/main/res/values-es/strings.xml b/library/main/res/values-es/strings.xml
new file mode 100644
index 0000000..c86f18c
--- /dev/null
+++ b/library/main/res/values-es/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Siguiente"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Atrás"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Más"</string>
+</resources>
diff --git a/library/main/res/values-et/strings.xml b/library/main/res/values-et/strings.xml
new file mode 100644
index 0000000..45fa9dc
--- /dev/null
+++ b/library/main/res/values-et/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Edasi"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Tagasi"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Rohkem"</string>
+</resources>
diff --git a/library/main/res/values-eu/strings.xml b/library/main/res/values-eu/strings.xml
new file mode 100644
index 0000000..0e3738e
--- /dev/null
+++ b/library/main/res/values-eu/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Hurrengoa"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Atzera"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Gehiago"</string>
+</resources>
diff --git a/library/main/res/values-fa/strings.xml b/library/main/res/values-fa/strings.xml
new file mode 100644
index 0000000..58fd9ba
--- /dev/null
+++ b/library/main/res/values-fa/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"بعدی"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"برگشت"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"بیشتر"</string>
+</resources>
diff --git a/library/main/res/values-fi/strings.xml b/library/main/res/values-fi/strings.xml
new file mode 100644
index 0000000..35b4360
--- /dev/null
+++ b/library/main/res/values-fi/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Seuraava"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Takaisin"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Lisää"</string>
+</resources>
diff --git a/library/main/res/values-fr-rCA/strings.xml b/library/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..9e5badf
--- /dev/null
+++ b/library/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Suivant"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Précédent"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Plus"</string>
+</resources>
diff --git a/library/main/res/values-fr/strings.xml b/library/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..5c4f2b7
--- /dev/null
+++ b/library/main/res/values-fr/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Suivant"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Retour"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Plus"</string>
+</resources>
diff --git a/library/main/res/values-gl/strings.xml b/library/main/res/values-gl/strings.xml
new file mode 100644
index 0000000..28548a5
--- /dev/null
+++ b/library/main/res/values-gl/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Seguinte"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Atrás"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Máis"</string>
+</resources>
diff --git a/library/main/res/values-gu/strings.xml b/library/main/res/values-gu/strings.xml
new file mode 100644
index 0000000..eceb654
--- /dev/null
+++ b/library/main/res/values-gu/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"આગલું"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"પાછળ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"વધુ"</string>
+</resources>
diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
new file mode 100644
index 0000000..d30fbb4
--- /dev/null
+++ b/library/main/res/values-hi/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"आगे"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
+</resources>
diff --git a/library/main/res/values-hr/strings.xml b/library/main/res/values-hr/strings.xml
new file mode 100644
index 0000000..2ea5d79
--- /dev/null
+++ b/library/main/res/values-hr/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Dalje"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Natrag"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Više"</string>
+</resources>
diff --git a/library/main/res/values-hu/strings.xml b/library/main/res/values-hu/strings.xml
new file mode 100644
index 0000000..dae7516
--- /dev/null
+++ b/library/main/res/values-hu/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Következő"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Vissza"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Továbbiak"</string>
+</resources>
diff --git a/library/main/res/values-hy/strings.xml b/library/main/res/values-hy/strings.xml
new file mode 100644
index 0000000..68083dd
--- /dev/null
+++ b/library/main/res/values-hy/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Առաջ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Հետ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Ավելին"</string>
+</resources>
diff --git a/library/main/res/values-in/strings.xml b/library/main/res/values-in/strings.xml
new file mode 100644
index 0000000..e58bb0d
--- /dev/null
+++ b/library/main/res/values-in/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Berikutnya"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Kembali"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Lainnya"</string>
+</resources>
diff --git a/library/main/res/values-is/strings.xml b/library/main/res/values-is/strings.xml
new file mode 100644
index 0000000..13b3d30
--- /dev/null
+++ b/library/main/res/values-is/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Áfram"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Til baka"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Meira"</string>
+</resources>
diff --git a/library/main/res/values-it/strings.xml b/library/main/res/values-it/strings.xml
new file mode 100644
index 0000000..a787895
--- /dev/null
+++ b/library/main/res/values-it/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Avanti"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Indietro"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Altro"</string>
+</resources>
diff --git a/library/main/res/values-iw/strings.xml b/library/main/res/values-iw/strings.xml
new file mode 100644
index 0000000..856cff8
--- /dev/null
+++ b/library/main/res/values-iw/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"הבא"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"חזרה"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"עוד"</string>
+</resources>
diff --git a/library/main/res/values-ja/strings.xml b/library/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..b21b8d3
--- /dev/null
+++ b/library/main/res/values-ja/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"次へ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"戻る"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"もっと見る"</string>
+</resources>
diff --git a/library/main/res/values-ka/strings.xml b/library/main/res/values-ka/strings.xml
new file mode 100644
index 0000000..e90c485
--- /dev/null
+++ b/library/main/res/values-ka/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"შემდეგი"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"უკან"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"დამატებით"</string>
+</resources>
diff --git a/library/main/res/values-kk/strings.xml b/library/main/res/values-kk/strings.xml
new file mode 100644
index 0000000..d3c6fa4
--- /dev/null
+++ b/library/main/res/values-kk/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Келесі"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Артқа"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Тағы"</string>
+</resources>
diff --git a/library/main/res/values-km/strings.xml b/library/main/res/values-km/strings.xml
new file mode 100644
index 0000000..7bf81a2
--- /dev/null
+++ b/library/main/res/values-km/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"បន្ទាប់"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ថយក្រោយ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"ច្រើនទៀត"</string>
+</resources>
diff --git a/library/main/res/values-kn/strings.xml b/library/main/res/values-kn/strings.xml
new file mode 100644
index 0000000..0e609bb
--- /dev/null
+++ b/library/main/res/values-kn/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ಮುಂದೆ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ಹಿಂದೆ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"ಇನ್ನಷ್ಟು"</string>
+</resources>
diff --git a/library/main/res/values-ko/strings.xml b/library/main/res/values-ko/strings.xml
new file mode 100644
index 0000000..e55c0d7
--- /dev/null
+++ b/library/main/res/values-ko/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"다음"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"뒤로"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"더보기"</string>
+</resources>
diff --git a/library/main/res/values-ky/strings.xml b/library/main/res/values-ky/strings.xml
new file mode 100644
index 0000000..c3b3a4c
--- /dev/null
+++ b/library/main/res/values-ky/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Кийинки"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Артка"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Дагы"</string>
+</resources>
diff --git a/library/main/res/values-lo/strings.xml b/library/main/res/values-lo/strings.xml
new file mode 100644
index 0000000..568b7a5
--- /dev/null
+++ b/library/main/res/values-lo/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ຕໍ່​ໄປ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ກັບຄືນ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"ເພີ່ມເຕີມ"</string>
+</resources>
diff --git a/library/main/res/values-lt/strings.xml b/library/main/res/values-lt/strings.xml
new file mode 100644
index 0000000..db46bd5
--- /dev/null
+++ b/library/main/res/values-lt/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Kitas"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Atgal"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Daugiau"</string>
+</resources>
diff --git a/library/main/res/values-lv/strings.xml b/library/main/res/values-lv/strings.xml
new file mode 100644
index 0000000..dee7589
--- /dev/null
+++ b/library/main/res/values-lv/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Tālāk"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Atpakaļ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Vairāk"</string>
+</resources>
diff --git a/library/main/res/values-mk/strings.xml b/library/main/res/values-mk/strings.xml
new file mode 100644
index 0000000..30ee8f2
--- /dev/null
+++ b/library/main/res/values-mk/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Следно"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Повеќе"</string>
+</resources>
diff --git a/library/main/res/values-ml/strings.xml b/library/main/res/values-ml/strings.xml
new file mode 100644
index 0000000..394c894
--- /dev/null
+++ b/library/main/res/values-ml/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"അടുത്തത്"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"മടങ്ങുക"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"കൂടുതൽ"</string>
+</resources>
diff --git a/library/main/res/values-mn/strings.xml b/library/main/res/values-mn/strings.xml
new file mode 100644
index 0000000..18a6e27
--- /dev/null
+++ b/library/main/res/values-mn/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Дараах"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Буцах"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Илүү"</string>
+</resources>
diff --git a/library/main/res/values-mr/strings.xml b/library/main/res/values-mr/strings.xml
new file mode 100644
index 0000000..bb9980e
--- /dev/null
+++ b/library/main/res/values-mr/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"पुढील"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"परत"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
+</resources>
diff --git a/library/main/res/values-ms/strings.xml b/library/main/res/values-ms/strings.xml
new file mode 100644
index 0000000..04b8c6f
--- /dev/null
+++ b/library/main/res/values-ms/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Seterusnya"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Kembali"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Lagi"</string>
+</resources>
diff --git a/library/main/res/values-my/strings.xml b/library/main/res/values-my/strings.xml
new file mode 100644
index 0000000..4bdcd11
--- /dev/null
+++ b/library/main/res/values-my/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ရှေ့သို့"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"နောက်သို့"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"နောက်ထပ်"</string>
+</resources>
diff --git a/library/main/res/values-nb/strings.xml b/library/main/res/values-nb/strings.xml
new file mode 100644
index 0000000..bc856e3
--- /dev/null
+++ b/library/main/res/values-nb/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Neste"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Tilbake"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mer"</string>
+</resources>
diff --git a/library/main/res/values-ne/strings.xml b/library/main/res/values-ne/strings.xml
new file mode 100644
index 0000000..c46b118
--- /dev/null
+++ b/library/main/res/values-ne/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"अर्को"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"पछाडि जानुहोस्"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"थप"</string>
+</resources>
diff --git a/library/main/res/values-nl/strings.xml b/library/main/res/values-nl/strings.xml
new file mode 100644
index 0000000..27dfb9a
--- /dev/null
+++ b/library/main/res/values-nl/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Volgende"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Terug"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Meer"</string>
+</resources>
diff --git a/library/main/res/values-pa/strings.xml b/library/main/res/values-pa/strings.xml
new file mode 100644
index 0000000..742020c
--- /dev/null
+++ b/library/main/res/values-pa/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ਅੱਗੇ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ਪਿੱਛੇ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"ਹੋਰ"</string>
+</resources>
diff --git a/library/main/res/values-pl/strings.xml b/library/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..f4e7e81
--- /dev/null
+++ b/library/main/res/values-pl/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Dalej"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Wstecz"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Więcej"</string>
+</resources>
diff --git a/library/main/res/values-pt-rBR/strings.xml b/library/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..79d86e2
--- /dev/null
+++ b/library/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
+</resources>
diff --git a/library/main/res/values-pt-rPT/strings.xml b/library/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..b9c95a1
--- /dev/null
+++ b/library/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Seguinte"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Anterior"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
+</resources>
diff --git a/library/main/res/values-pt/strings.xml b/library/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..79d86e2
--- /dev/null
+++ b/library/main/res/values-pt/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
+</resources>
diff --git a/library/main/res/values-ro/strings.xml b/library/main/res/values-ro/strings.xml
new file mode 100644
index 0000000..7e643a7
--- /dev/null
+++ b/library/main/res/values-ro/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Înainte"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Înapoi"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mai mult"</string>
+</resources>
diff --git a/library/main/res/values-ru/strings.xml b/library/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..fcfbc3d
--- /dev/null
+++ b/library/main/res/values-ru/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Далее"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Ещё"</string>
+</resources>
diff --git a/library/main/res/values-si/strings.xml b/library/main/res/values-si/strings.xml
new file mode 100644
index 0000000..f79c169
--- /dev/null
+++ b/library/main/res/values-si/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ඊළඟ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ආපසු"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"තවත්"</string>
+</resources>
diff --git a/library/main/res/values-sk/strings.xml b/library/main/res/values-sk/strings.xml
new file mode 100644
index 0000000..30fe40a
--- /dev/null
+++ b/library/main/res/values-sk/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Ďalej"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Späť"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Viac"</string>
+</resources>
diff --git a/library/main/res/values-sl/strings.xml b/library/main/res/values-sl/strings.xml
new file mode 100644
index 0000000..0aa330d
--- /dev/null
+++ b/library/main/res/values-sl/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Naprej"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Nazaj"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Več"</string>
+</resources>
diff --git a/library/main/res/values-sq/strings.xml b/library/main/res/values-sq/strings.xml
new file mode 100644
index 0000000..c30f08d
--- /dev/null
+++ b/library/main/res/values-sq/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Përpara"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Prapa"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Më shumë"</string>
+</resources>
diff --git a/library/main/res/values-sr/strings.xml b/library/main/res/values-sr/strings.xml
new file mode 100644
index 0000000..20be271
--- /dev/null
+++ b/library/main/res/values-sr/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Даље"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Још"</string>
+</resources>
diff --git a/library/main/res/values-sv/strings.xml b/library/main/res/values-sv/strings.xml
new file mode 100644
index 0000000..2d66a8d
--- /dev/null
+++ b/library/main/res/values-sv/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Nästa"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Tillbaka"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mer"</string>
+</resources>
diff --git a/library/main/res/values-sw/strings.xml b/library/main/res/values-sw/strings.xml
new file mode 100644
index 0000000..8191ab8
--- /dev/null
+++ b/library/main/res/values-sw/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Endelea"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Rudi nyuma"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Zaidi"</string>
+</resources>
diff --git a/library/main/res/values-ta/strings.xml b/library/main/res/values-ta/strings.xml
new file mode 100644
index 0000000..59a6098
--- /dev/null
+++ b/library/main/res/values-ta/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"அடுத்து"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"முந்தையது"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"மேலும்"</string>
+</resources>
diff --git a/library/main/res/values-te/strings.xml b/library/main/res/values-te/strings.xml
new file mode 100644
index 0000000..4209a3c
--- /dev/null
+++ b/library/main/res/values-te/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"తదుపరి"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"వెనుకకు"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"మరింత"</string>
+</resources>
diff --git a/library/main/res/values-th/strings.xml b/library/main/res/values-th/strings.xml
new file mode 100644
index 0000000..0ea98d6
--- /dev/null
+++ b/library/main/res/values-th/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ถัดไป"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"กลับ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"เพิ่มเติม"</string>
+</resources>
diff --git a/library/main/res/values-tl/strings.xml b/library/main/res/values-tl/strings.xml
new file mode 100644
index 0000000..dc85cb8
--- /dev/null
+++ b/library/main/res/values-tl/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Susunod"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Bumalik"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Higit pa"</string>
+</resources>
diff --git a/library/main/res/values-tr/strings.xml b/library/main/res/values-tr/strings.xml
new file mode 100644
index 0000000..8e14f51
--- /dev/null
+++ b/library/main/res/values-tr/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"İleri"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Geri"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Diğer"</string>
+</resources>
diff --git a/library/main/res/values-uk/strings.xml b/library/main/res/values-uk/strings.xml
new file mode 100644
index 0000000..7777cd5
--- /dev/null
+++ b/library/main/res/values-uk/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Далі"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Назад"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Більше"</string>
+</resources>
diff --git a/library/main/res/values-ur/strings.xml b/library/main/res/values-ur/strings.xml
new file mode 100644
index 0000000..e4e8fc4
--- /dev/null
+++ b/library/main/res/values-ur/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"آگے"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"پیچھے"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"مزید"</string>
+</resources>
diff --git a/library/main/res/values-uz/strings.xml b/library/main/res/values-uz/strings.xml
new file mode 100644
index 0000000..dfc9014
--- /dev/null
+++ b/library/main/res/values-uz/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Keyingisi"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Orqaga"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Yana"</string>
+</resources>
diff --git a/library/main/res/values-vi/strings.xml b/library/main/res/values-vi/strings.xml
new file mode 100644
index 0000000..40fb5ab
--- /dev/null
+++ b/library/main/res/values-vi/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Tiếp theo"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Quay lại"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Khác"</string>
+</resources>
diff --git a/library/main/res/values-zh-rCN/strings.xml b/library/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..1ba83ed
--- /dev/null
+++ b/library/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"下一步"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"返回"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"更多"</string>
+</resources>
diff --git a/library/main/res/values-zh-rHK/strings.xml b/library/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..1ba83ed
--- /dev/null
+++ b/library/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"下一步"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"返回"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"更多"</string>
+</resources>
diff --git a/library/main/res/values-zh-rTW/strings.xml b/library/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..9115698
--- /dev/null
+++ b/library/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"繼續"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"返回"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"更多"</string>
+</resources>
diff --git a/library/main/res/values-zu/strings.xml b/library/main/res/values-zu/strings.xml
new file mode 100644
index 0000000..93e30c2
--- /dev/null
+++ b/library/main/res/values-zu/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Okulandelayo"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Emuva"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Okuningi"</string>
+</resources>

From 751b5a55ef783b4ea1c01fee0e39b894335c9c74 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 26 Jul 2017 10:08:27 -0700
Subject: [PATCH 03/75] Import translations. DO NOT MERGE

Change-Id: Id80ab0ef0199e8130c32cd1f5dd00df21ae46b89
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-pt-rBR/strings.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 library/main/res/values-pt-rBR/strings.xml

diff --git a/library/main/res/values-pt-rBR/strings.xml b/library/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..79d86e2
--- /dev/null
+++ b/library/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
+</resources>

From 8fc6285e6afa764fa6430f1a36421cbd9f19c7c1 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 26 Jul 2017 10:09:17 -0700
Subject: [PATCH 04/75] Import translations. DO NOT MERGE

Change-Id: Ifd34bfe725d1d866a1b6edc4200aec4c3439b678
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/main/res/values-pt-rBR/strings.xml b/library/main/res/values-pt-rBR/strings.xml
index 41032f8..79d86e2 100644
--- a/library/main/res/values-pt-rBR/strings.xml
+++ b/library/main/res/values-pt-rBR/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Próximo"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
 </resources>

From 0e0b5e053be23cb91a5a1c0a6c9ee8024cdfb605 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 26 Jul 2017 10:10:02 -0700
Subject: [PATCH 05/75] Import translations. DO NOT MERGE

Change-Id: I6d4523cde671fc0a0d5779803480c2fdf8e0c763
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/main/res/values-pt-rBR/strings.xml b/library/main/res/values-pt-rBR/strings.xml
index 41032f8..79d86e2 100644
--- a/library/main/res/values-pt-rBR/strings.xml
+++ b/library/main/res/values-pt-rBR/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"Próximo"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Próxima"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"Voltar"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"Mais"</string>
 </resources>

From a23e50896f6ddb40f14551d7fc1af129ce501f3f Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 1 Aug 2017 19:08:48 -0700
Subject: [PATCH 06/75] Allow keyboard to focus on switch item

Test: ./gradlew connectedAndroidTest test
Bug: 63115991
Change-Id: If03b3e469fd740631b5eabb6031f11fd2165bdb3
---
 .../gingerbread/res/layout/suw_items_expandable_switch.xml   | 1 -
 library/gingerbread/res/layout/suw_items_switch.xml          | 1 -
 .../android/setupwizardlib/items/ExpandableSwitchItem.java   | 4 ++++
 .../setupwizardlib/items/ExpandableSwitchItemTest.java       | 2 ++
 .../android/setupwizardlib/items/RecyclerItemAdapter.java    | 2 +-
 .../com/android/setupwizardlib/test/SystemBarHelperTest.java | 5 ++++-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/library/gingerbread/res/layout/suw_items_expandable_switch.xml b/library/gingerbread/res/layout/suw_items_expandable_switch.xml
index 2b98a9f..21c2c22 100644
--- a/library/gingerbread/res/layout/suw_items_expandable_switch.xml
+++ b/library/gingerbread/res/layout/suw_items_expandable_switch.xml
@@ -20,7 +20,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal"
     android:tag="noBackground">
 
diff --git a/library/gingerbread/res/layout/suw_items_switch.xml b/library/gingerbread/res/layout/suw_items_switch.xml
index af326b2..3f101d7 100644
--- a/library/gingerbread/res/layout/suw_items_switch.xml
+++ b/library/gingerbread/res/layout/suw_items_switch.xml
@@ -20,7 +20,6 @@
     style="@style/SuwItemContainer.Verbose"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal">
 
     <FrameLayout
diff --git a/library/gingerbread/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java b/library/gingerbread/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java
index be9916e..71d1bb6 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java
@@ -138,6 +138,10 @@ public class ExpandableSwitchItem extends SwitchItem
         }
 
         tintCompoundDrawables(view);
+
+        // Expandable switch item has focusability on the expandable layout on the left, and the
+        // switch on the right, but not the item itself.
+        view.setFocusable(false);
     }
 
     @Override
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
index 0ae0737..4fb3e28 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
@@ -71,6 +71,8 @@ public class ExpandableSwitchItemTest {
         assertEquals("Should be collapsed initially", "TestSummary", mItem.getSummary());
         assertEquals("Summary view should display collapsed summary",
                 "TestSummary", mSummaryView.getText());
+
+        assertFalse("Expandable switch item itself should not be focusable", view.isFocusable());
     }
 
     @Test
diff --git a/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java b/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java
index 78280a6..0703c17 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java
@@ -143,9 +143,9 @@ public class RecyclerItemAdapter extends RecyclerView.Adapter<ItemViewHolder>
     @Override
     public void onBindViewHolder(ItemViewHolder holder, int position) {
         final IItem item = getItem(position);
-        item.onBindView(holder.itemView);
         holder.setEnabled(item.isEnabled());
         holder.setItem(item);
+        item.onBindView(holder.itemView);
     }
 
     @Override
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
index 0ebf7cb..d3142f1 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
@@ -31,6 +31,7 @@ import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.UiThreadTestRule;
 import android.support.test.runner.AndroidJUnit4;
+import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -131,7 +132,9 @@ public class SystemBarHelperTest {
     @Test
     public void testShowSystemBarsWindow() {
         final Window window = createWindowWithSystemUiVisibility(0x456);
-        SystemBarHelper.showSystemBars(window, InstrumentationRegistry.getContext());
+        Context context = new ContextThemeWrapper(
+                InstrumentationRegistry.getContext(), android.R.style.Theme);
+        SystemBarHelper.showSystemBars(window, context);
         if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
             assertEquals(
                     "DEFAULT_IMMERSIVE_FLAGS should be removed from window's systemUiVisibility",

From c072bc26cd2709a2cfcdeb36e3c45c35fdaaf01b Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 3 Aug 2017 16:02:03 -0700
Subject: [PATCH 07/75] Set status bar color to transparent in "platform"

So that the status bar background drawn by GlifLayout is visible.

Test: ./gradlew test
Bug: 64126435
Change-Id: If089091a08ab80cddc2514e1e929a771f3371373
---
 library/platform/res/values-v23/styles.xml    |  4 ++--
 .../setupwizardlib/util/GlifStyleTest.java    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 2eb5caf..9fff5f1 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -92,7 +92,7 @@
         <item name="android:listPreferredItemPaddingEnd">?attr/suwMarginSides</item>
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
         <item name="android:textColorLink">@color/suw_color_accent_glif_dark</item>
@@ -124,7 +124,7 @@
         <item name="android:listPreferredItemPaddingEnd">?attr/suwMarginSides</item>
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
         <item name="android:textColorLink">@color/suw_color_accent_glif_light</item>
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index e4e311f..aea2c03 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -20,9 +20,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.robolectric.RuntimeEnvironment.application;
 
+import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 
@@ -63,4 +67,21 @@ public class GlifStyleTest {
             assertEquals("ff4285f4", Integer.toHexString(button.getTextColors().getDefaultColor()));
         }
     }
+
+    @TargetApi(VERSION_CODES.LOLLIPOP)
+    @Config(sdk = Config.NEWEST_SDK)
+    @Test
+    public void glifThemeLight_statusBarColorShouldBeTransparent() {
+        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+        assertEquals(0x00000000, activity.getWindow().getStatusBarColor());
+    }
+
+    private static class GlifThemeActivity extends Activity {
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            setTheme(R.style.SuwThemeGlif_Light);
+            super.onCreate(savedInstanceState);
+        }
+    }
 }

From fef3d11f566d2da42d839266a5ba18b91be6e8a9 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 12 Aug 2017 02:11:44 -0700
Subject: [PATCH 08/75] Import translations. DO NOT MERGE

Change-Id: Ic1e67887f748126543ebb9bcf583f98f1bdb4bf6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-en-rCA/strings.xml | 23 ++++++++++++++++++++++
 library/main/res/values-en-rXC/strings.xml | 23 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 library/main/res/values-en-rCA/strings.xml
 create mode 100644 library/main/res/values-en-rXC/strings.xml

diff --git a/library/main/res/values-en-rCA/strings.xml b/library/main/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..5260500
--- /dev/null
+++ b/library/main/res/values-en-rCA/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
+</resources>
diff --git a/library/main/res/values-en-rXC/strings.xml b/library/main/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..693af6b
--- /dev/null
+++ b/library/main/res/values-en-rXC/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎Back‎‏‎‎‏‎"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎More‎‏‎‎‏‎"</string>
+</resources>

From 0bd21785449bccbd66646bd20d87dbf00c9b7f78 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 12 Aug 2017 02:12:34 -0700
Subject: [PATCH 09/75] Import translations. DO NOT MERGE

Change-Id: If94feed12b0b9d9549785771627a5daf29e8304a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 navigationbar/res/values-en-rCA/strings.xml | 6 ++++++
 navigationbar/res/values-en-rXC/strings.xml | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 navigationbar/res/values-en-rCA/strings.xml
 create mode 100644 navigationbar/res/values-en-rXC/strings.xml

diff --git a/navigationbar/res/values-en-rCA/strings.xml b/navigationbar/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..b06dc86
--- /dev/null
+++ b/navigationbar/res/values-en-rCA/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"Next"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"Back"</string>
+</resources>
diff --git a/navigationbar/res/values-en-rXC/strings.xml b/navigationbar/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..5c7c658
--- /dev/null
+++ b/navigationbar/res/values-en-rXC/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎Next‎‏‎‎‏‎"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎Back‎‏‎‎‏‎"</string>
+</resources>

From 16bb52a67c60c147d5d681ffcf573acedb5ba7e0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 23 Aug 2017 17:30:03 -0700
Subject: [PATCH 10/75] Import translations. DO NOT MERGE

Change-Id: I9a663646228e95ae006a0b1fd328e1c06ff98c33
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
index d30fbb4..a5c27b1 100644
--- a/library/main/res/values-hi/strings.xml
+++ b/library/main/res/values-hi/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"आगे"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"अगला"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>

From 18fb5350f2c345c9094430ceff41262bb4ef8d8b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 23 Aug 2017 17:31:07 -0700
Subject: [PATCH 11/75] Import translations. DO NOT MERGE

Change-Id: I7b0f4ed9c5158e9b1abd6c19457a6e60df610cdd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 navigationbar/res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navigationbar/res/values-hi/strings.xml b/navigationbar/res/values-hi/strings.xml
index 6afe5e5..fc1e9da 100644
--- a/navigationbar/res/values-hi/strings.xml
+++ b/navigationbar/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"अगला"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"पीछे"</string>
 </resources>

From 74098f24035dcc157fe9a9cd542defcd6fefa60e Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 27 Aug 2017 10:20:34 -0700
Subject: [PATCH 12/75] Import translations. DO NOT MERGE

Change-Id: Ica3a3f0e2bbb680dfb35c86e0940fe06c236d998
Auto-generated-cl: translation import
---
 library/main/res/values-mr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/main/res/values-mr/strings.xml b/library/main/res/values-mr/strings.xml
index bb9980e..a529655 100644
--- a/library/main/res/values-mr/strings.xml
+++ b/library/main/res/values-mr/strings.xml
@@ -18,6 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="suw_next_button_label" msgid="7269625133873553978">"पुढील"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"परत"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"मागे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>

From 69ee2b75a4ad3b7519d919dc0a3948fce926c2a8 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 27 Aug 2017 10:21:25 -0700
Subject: [PATCH 13/75] Import translations. DO NOT MERGE

Change-Id: Ic14c9e42fdbd002ada864b88111196e846b997d6
Auto-generated-cl: translation import
---
 navigationbar/res/values-mr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navigationbar/res/values-mr/strings.xml b/navigationbar/res/values-mr/strings.xml
index 9269807..3668c64 100644
--- a/navigationbar/res/values-mr/strings.xml
+++ b/navigationbar/res/values-mr/strings.xml
@@ -2,5 +2,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"पुढील"</string>
-    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"परत"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"मागे"</string>
 </resources>

From 8d48b26adcbac4a42edffffb9e699eb38a1a961d Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 6 Sep 2017 04:03:48 -0700
Subject: [PATCH 14/75] Import translations. DO NOT MERGE

Change-Id: Ic3bd4a006b17bcb36e60b3b5f5fcf22242d6711b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-bn/strings.xml | 2 +-
 library/main/res/values-hi/strings.xml | 2 +-
 library/main/res/values-te/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/main/res/values-bn/strings.xml b/library/main/res/values-bn/strings.xml
index d807c08..88865ee 100644
--- a/library/main/res/values-bn/strings.xml
+++ b/library/main/res/values-bn/strings.xml
@@ -19,5 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="suw_next_button_label" msgid="7269625133873553978">"পরবর্তী"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"ফিরুন"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"আরো"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"আরও"</string>
 </resources>
diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
index a5c27b1..3fb41d3 100644
--- a/library/main/res/values-hi/strings.xml
+++ b/library/main/res/values-hi/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"अगला"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"आगे बढ़ें"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>
diff --git a/library/main/res/values-te/strings.xml b/library/main/res/values-te/strings.xml
index 4209a3c..b120ee8 100644
--- a/library/main/res/values-te/strings.xml
+++ b/library/main/res/values-te/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="suw_next_button_label" msgid="7269625133873553978">"తదుపరి"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"తర్వాత"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"వెనుకకు"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"మరింత"</string>
 </resources>

From c3648f6d260585ff5d3e420ae57649868e7de5b3 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 6 Sep 2017 04:04:46 -0700
Subject: [PATCH 15/75] Import translations. DO NOT MERGE

Change-Id: I1b10f49ffead502e0317e238b118e3df1ea6b3f1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 navigationbar/res/values-hi/strings.xml | 2 +-
 navigationbar/res/values-te/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/navigationbar/res/values-hi/strings.xml b/navigationbar/res/values-hi/strings.xml
index fc1e9da..f8e9f9d 100644
--- a/navigationbar/res/values-hi/strings.xml
+++ b/navigationbar/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"अगला"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे बढ़ें"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"पीछे"</string>
 </resources>
diff --git a/navigationbar/res/values-te/strings.xml b/navigationbar/res/values-te/strings.xml
index e575ba7..fdf5c75 100644
--- a/navigationbar/res/values-te/strings.xml
+++ b/navigationbar/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"తదుపరి"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"తర్వాత"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"వెనుకకు"</string>
 </resources>

From 96b54f3cd7c66a21ae39390d155b310a0e575eb5 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 13 Sep 2017 21:44:22 -0700
Subject: [PATCH 16/75] Update to Robolectric 3.4.2

Test: ./gradlew test
Bug: 65652792
Change-Id: I8e0093fd956a885c8f1404e2a17b5f4aaec87dfc
---
 library/self.gradle                           |  4 +--
 .../setupwizardlib/util/PartnerTest.java      | 28 +++++++++++++------
 .../view/IllustrationVideoViewTest.java       |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/library/self.gradle b/library/self.gradle
index 6a405e2..69f9654 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -38,8 +38,8 @@ android.sourceSets {
         java.srcDirs = ['test/robotest/src']
 
         dependencies {
-            testCompile 'org.robolectric:robolectric:3.+'
-            testCompile 'org.robolectric:shadows-core:3.+'
+            testCompile 'org.robolectric:robolectric:3.4.2'
+            testCompile 'org.robolectric:framework:3.4.2'
             testCompile 'junit:junit:4.+'
             testCompile 'org.mockito:mockito-core:1.9.5'
             // Workaround for https://github.com/robolectric/robolectric/issues/2566
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
index f47eef1..aeb678f 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
@@ -31,6 +31,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.os.Build.VERSION;
@@ -40,20 +41,25 @@ import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.util.Partner.ResourceEntry;
+import com.android.setupwizardlib.util.PartnerTest.ShadowApplicationPackageManager;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.DefaultPackageManager;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowResources;
 
 import java.util.Arrays;
 import java.util.Collections;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(
+        constants = BuildConfig.class,
+        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK },
+        shadows = ShadowApplicationPackageManager.class)
 public class PartnerTest {
 
     private static final String ACTION_PARTNER_CUSTOMIZATION =
@@ -62,7 +68,7 @@ public class PartnerTest {
     private Context mContext;
     private Resources mPartnerResources;
 
-    private TestPackageManager mPackageManager;
+    private ShadowApplicationPackageManager mPackageManager;
 
     @Before
     public void setUp() throws Exception {
@@ -71,8 +77,9 @@ public class PartnerTest {
         mContext = spy(application);
         mPartnerResources = spy(ShadowResources.getSystem());
 
-        mPackageManager = new TestPackageManager();
-        RuntimeEnvironment.setRobolectricPackageManager(mPackageManager);
+        mPackageManager =
+                (ShadowApplicationPackageManager) Shadows.shadowOf(application.getPackageManager());
+        mPackageManager.partnerResources = mPartnerResources;
     }
 
     @Test
@@ -173,13 +180,18 @@ public class PartnerTest {
         return info;
     }
 
-    private class TestPackageManager extends DefaultPackageManager {
+    @Implements(className = "android.app.ApplicationPackageManager")
+    public static class ShadowApplicationPackageManager extends
+            org.robolectric.shadows.ShadowApplicationPackageManager {
 
+        public Resources partnerResources;
+
+        @Implementation
         @Override
         public Resources getResourcesForApplication(ApplicationInfo app)
                 throws NameNotFoundException {
             if (app != null && "test.partner.package".equals(app.packageName)) {
-                return mPartnerResources;
+                return partnerResources;
             } else {
                 return super.getResourcesForApplication(app);
             }
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
index ffa228d..ddf59ca 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
@@ -48,7 +48,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
-import org.robolectric.internal.Shadow;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowMediaPlayer;
 import org.robolectric.util.ReflectionHelpers;
 

From 31dbc098a972bd970c947d860d062d9be45ea223 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 20 Sep 2017 18:55:33 -0700
Subject: [PATCH 17/75] Add OWNERS file to setup wizard lib

Test: None
Change-Id: I9ab8618b1764be15556452887d73e09a1a3fdf2e
---
 OWNERS | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..5245206
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+russellbrenner@google.com
+ajayns@google.com
+iofir@google.com
+yukl@google.com

From 668644f62475a4d77ad4af09fc2129243d0c4c95 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 25 Sep 2017 19:47:54 -0700
Subject: [PATCH 18/75] Add continuous coverage for Robolectric tests

Configured jacoco build for Robolectric tests, and dist the results
so it can be picked up in continuous testing.

Test: OUT_DIR=/path/to/out DIST_DIR=/path/to/out/dist \
      ./gradlew coverage dist
Bug: 66828854

Change-Id: If847f74dbcfa57af1ce3c64f28c2c870f4b9d973
---
 tools/build_for_build_server.sh     |  2 +-
 tools/gradle/dist-unit-tests.gradle | 74 ++++++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/tools/build_for_build_server.sh b/tools/build_for_build_server.sh
index a90ae67..7a8c942 100755
--- a/tools/build_for_build_server.sh
+++ b/tools/build_for_build_server.sh
@@ -6,4 +6,4 @@ export TARGET_BUILD_DENSITY="alldpi"
 export TARGET_BUILD_TYPE="release"
 export TARGET_BUILD_APPS="setup-wizard-lib"
 
-./gradlew buildProjectFull test
+./gradlew buildProjectFull test coverage
diff --git a/tools/gradle/dist-unit-tests.gradle b/tools/gradle/dist-unit-tests.gradle
index faae260..aaecd35 100644
--- a/tools/gradle/dist-unit-tests.gradle
+++ b/tools/gradle/dist-unit-tests.gradle
@@ -10,6 +10,7 @@
  */
 
 apply plugin: 'dist'
+apply plugin: 'jacoco'
 
 // If unit tests are run as part of the build, dist the test XML reports to host-test-reports/*.zip
 android.unitTestVariants.all { variant ->
@@ -28,11 +29,80 @@ android.unitTestVariants.all { variant ->
             archiveName = task.name + 'Result.zip'
             destinationDir = junitReport.destination.parentFile
         }
-        zipTask.mustRunAfter task
+        task.finalizedBy zipTask
 
         // Copy the test reports to dist/host-test-reports
         // The file path and format should match GradleHostBasedTest class in TradeFed.
-        tasks.dist.dependsOn zipTask
+        tasks.dist.mustRunAfter zipTask
         dist.file zipTask.archivePath.path, "host-test-reports/${zipTask.archiveName}"
     }
 }
+
+/*
+ * The section below adds code coverage to all the unitTest targets. By default, the jacoco plugin
+ * only adds to the 'java' plugin and not the Android ones.
+ *
+ * For each unitTest task "fooUnitTest", a new target "fooUnitTestCoverage" will be generated for
+ * to generate the jacoco report.
+ */
+android.testOptions.unitTests.all {
+    // Fix robolectric tests reporting 0 coverage on newer versions of the plugin.
+    jacoco {
+        includeNoLocationClasses = true
+    }
+}
+
+// Define the main coverage task if it does not exist. This task generates coverage report for all
+// unit tests.
+def coverageTask = tasks.findByName('coverage') ?: tasks.create('coverage') {
+    group = "Reporting"
+    description = "Generate Jacoco coverage reports"
+}
+
+android.unitTestVariants.all { variant ->
+    def testTaskName = "test${variant.name.capitalize()}"
+    def testTask = tasks.findByName(testTaskName)
+
+    // Create coverage task of form 'testFlavorCoverageUnitTestCoverage' depending on
+    // 'testFlavorCoverageUnitTest'
+    def jacocoTask = tasks.create("${testTaskName}Coverage", JacocoReport) {
+        group = "Reporting"
+        description = "Generate a Jacoco coverage report for robolectric tests on ${variant.name}."
+
+        classDirectories = fileTree(
+            dir: "${project.buildDir}/intermediates/classes/" +
+                "${variant.productFlavors[0].name}/${variant.buildType.name}",
+            excludes: ['**/R.class',
+                       '**/R$*.class',
+                       '**/BuildConfig.*',
+                       '**/Manifest*.*']
+        )
+
+        sourceDirectories = files(variant.testedVariant.sourceSets.collect { it.java.srcDirs })
+        executionData = files("${project.buildDir}/jacoco/${testTaskName}.exec")
+
+        reports {
+            xml.enabled = true
+            html.enabled = true
+        }
+    }
+    jacocoTask.dependsOn testTask
+
+    // Create a zip file of the HTML coverage reports
+    def zipTask = tasks.create("zipResultsOf${jacocoTask.name.capitalize()}", Zip) {
+        from jacocoTask.reports.html.destination
+        archiveName = "${testTaskName}HtmlCoverage.zip"
+        destinationDir = jacocoTask.reports.html.destination.parentFile
+    }
+    jacocoTask.finalizedBy zipTask
+
+    // Copy the coverage reports to dist/host-test-coverage
+    // The file path and format should match JacocoLogForwarder class in TradeFed.
+    tasks.dist.mustRunAfter jacocoTask
+    dist.file jacocoTask.reports.xml.destination.path, "host-test-coverage/${jacocoTask.name}.xml"
+
+    tasks.dist.mustRunAfter zipTask
+    dist.file zipTask.archivePath.path, "host-test-coverage/${zipTask.archiveName}"
+
+    coverageTask.dependsOn(jacocoTask)
+}

From b72f3fb4598d2bd2560cdf5043defc80a0199e2e Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 15 May 2017 19:09:24 -0700
Subject: [PATCH 19/75] Add test for LinkAccessibilityHelper

- For the AccessibilityDelegateCompat methods, add tests that the
  delegation is done correctly.
- Refactored LinkAccessibilityHelper to make the dependency direction
  clearer.

Test: ./gradlew connectedAndroidTest test
Change-Id: I6132c0820ee6de1b9cc71a2838bdf05a34d7d2af
---
 .../util/LinkAccessibilityHelper.java         | 414 ++++++++----------
 .../LinkAccessibilityHelperTest.java          |  95 +++-
 library/standalone.gradle                     |   4 +-
 tools/gradle/android.properties               |   4 +-
 4 files changed, 269 insertions(+), 248 deletions(-)
 rename library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/{test => util}/LinkAccessibilityHelperTest.java (75%)

diff --git a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
index 1e663d6..1fb3a37 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
@@ -19,6 +19,8 @@ package com.android.setupwizardlib.util;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.view.AccessibilityDelegateCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeProviderCompat;
@@ -38,12 +40,11 @@ import java.util.List;
 /**
  * An accessibility delegate that allows {@link android.text.style.ClickableSpan} to be focused and
  * clicked by accessibility services.
- * <p>
- * <strong>Note: </strong> From Android O on, there is native support for ClickableSpan
- * accessibility, so this class is not needed (and indeed has no effect.)
- * </p>
  *
- * <p />Sample usage:
+ * <p><strong>Note:</strong> This class is a no-op on Android O or above since there is native
+ * support for ClickableSpan accessibility.
+ *
+ * <p>Sample usage:
  * <pre>
  * LinkAccessibilityHelper mAccessibilityHelper;
  *
@@ -68,294 +69,255 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
 
     private static final String TAG = "LinkAccessibilityHelper";
 
-    private final TextView mView;
-    private final Rect mTempRect = new Rect();
-    private final ExploreByTouchHelper mExploreByTouchHelper;
+    private final AccessibilityDelegateCompat mDelegate;
 
     public LinkAccessibilityHelper(TextView view) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) {
-            // Pre-O, we essentially extend ExploreByTouchHelper to expose a virtual view hierarchy
-            mExploreByTouchHelper = new ExploreByTouchHelper(view) {
-                @Override
-                protected int getVirtualViewAt(float x, float y) {
-                    return LinkAccessibilityHelper.this.getVirtualViewAt(x, y);
-                }
+        this(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                // Platform support was added in O. This helper will be no-op
+                ? new AccessibilityDelegateCompat()
+                // Pre-O, we extend ExploreByTouchHelper to expose a virtual view hierarchy
+                : new PreOLinkAccessibilityHelper(view));
+    }
 
-                @Override
-                protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
-                    LinkAccessibilityHelper.this.getVisibleVirtualViews(virtualViewIds);
-                }
-
-                @Override
-                protected void onPopulateEventForVirtualView(int virtualViewId,
-                        AccessibilityEvent event) {
-                    LinkAccessibilityHelper
-                            .this.onPopulateEventForVirtualView(virtualViewId, event);
-                }
-
-                @Override
-                protected void onPopulateNodeForVirtualView(int virtualViewId,
-                        AccessibilityNodeInfoCompat infoCompat) {
-                    LinkAccessibilityHelper
-                            .this.onPopulateNodeForVirtualView(virtualViewId, infoCompat);
-
-                }
-
-                @Override
-                protected boolean onPerformActionForVirtualView(int virtualViewId, int action,
-                        Bundle arguments) {
-                    return LinkAccessibilityHelper.this
-                            .onPerformActionForVirtualView(virtualViewId, action, arguments);
-                }
-            };
-        } else {
-            mExploreByTouchHelper = null;
-        }
-        mView = view;
+    @VisibleForTesting
+    LinkAccessibilityHelper(@NonNull AccessibilityDelegateCompat delegate) {
+        mDelegate = delegate;
     }
 
     @Override
     public void sendAccessibilityEvent(View host, int eventType) {
-        if (mExploreByTouchHelper != null) {
-            mExploreByTouchHelper.sendAccessibilityEvent(host, eventType);
-        } else {
-            super.sendAccessibilityEvent(host, eventType);
-        }
+        mDelegate.sendAccessibilityEvent(host, eventType);
     }
 
     @Override
     public void sendAccessibilityEventUnchecked(View host, AccessibilityEvent event) {
-        if (mExploreByTouchHelper != null) {
-            mExploreByTouchHelper.sendAccessibilityEventUnchecked(host, event);
-        } else {
-            super.sendAccessibilityEventUnchecked(host, event);
-        }
+        mDelegate.sendAccessibilityEventUnchecked(host, event);
     }
 
     @Override
     public boolean dispatchPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
-        return (mExploreByTouchHelper != null)
-                ? mExploreByTouchHelper.dispatchPopulateAccessibilityEvent(host, event)
-                : super.dispatchPopulateAccessibilityEvent(host, event);
+        return mDelegate.dispatchPopulateAccessibilityEvent(host, event);
     }
 
     @Override
     public void onPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
-        if (mExploreByTouchHelper != null) {
-            mExploreByTouchHelper.onPopulateAccessibilityEvent(host, event);
-        } else {
-            super.onPopulateAccessibilityEvent(host, event);
-        }
+        mDelegate.onPopulateAccessibilityEvent(host, event);
     }
 
     @Override
     public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
-        if (mExploreByTouchHelper != null) {
-            mExploreByTouchHelper.onInitializeAccessibilityEvent(host, event);
-        } else {
-            super.onInitializeAccessibilityEvent(host, event);
-        }
+        mDelegate.onInitializeAccessibilityEvent(host, event);
     }
 
     @Override
     public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {
-        if (mExploreByTouchHelper != null) {
-            mExploreByTouchHelper.onInitializeAccessibilityNodeInfo(host, info);
-        } else {
-            super.onInitializeAccessibilityNodeInfo(host, info);
-        }
+        mDelegate.onInitializeAccessibilityNodeInfo(host, info);
     }
 
     @Override
     public boolean onRequestSendAccessibilityEvent(ViewGroup host, View child,
             AccessibilityEvent event) {
-        return (mExploreByTouchHelper != null)
-                ? mExploreByTouchHelper.onRequestSendAccessibilityEvent(host, child, event)
-                : super.onRequestSendAccessibilityEvent(host, child, event);
+        return mDelegate.onRequestSendAccessibilityEvent(host, child, event);
     }
 
     @Override
     public AccessibilityNodeProviderCompat getAccessibilityNodeProvider(View host) {
-        return (mExploreByTouchHelper != null)
-                ? mExploreByTouchHelper.getAccessibilityNodeProvider(host)
-                : super.getAccessibilityNodeProvider(host);
+        return mDelegate.getAccessibilityNodeProvider(host);
     }
 
     @Override
     public boolean performAccessibilityAction(View host, int action, Bundle args) {
-        return (mExploreByTouchHelper != null)
-                ? mExploreByTouchHelper.performAccessibilityAction(host, action, args)
-                : super.performAccessibilityAction(host, action, args);
+        return mDelegate.performAccessibilityAction(host, action, args);
     }
 
     /**
-     * Delegated to {@link ExploreByTouchHelper}
+     * Dispatches hover event to the virtual view hierarchy. This method should be called in
+     * {@link View#dispatchHoverEvent(MotionEvent)}.
+     *
+     * @see ExploreByTouchHelper#dispatchHoverEvent(MotionEvent)
      */
     public final boolean dispatchHoverEvent(MotionEvent event) {
-        return (mExploreByTouchHelper != null) ? mExploreByTouchHelper.dispatchHoverEvent(event)
-                : false;
+        return mDelegate instanceof ExploreByTouchHelper
+                && ((ExploreByTouchHelper) mDelegate).dispatchHoverEvent(event);
     }
 
-    protected int getVirtualViewAt(float x, float y) {
-        final CharSequence text = mView.getText();
-        if (text instanceof Spanned) {
-            final Spanned spannedText = (Spanned) text;
-            final int offset = getOffsetForPosition(mView, x, y);
-            ClickableSpan[] linkSpans = spannedText.getSpans(offset, offset, ClickableSpan.class);
-            if (linkSpans.length == 1) {
-                ClickableSpan linkSpan = linkSpans[0];
-                return spannedText.getSpanStart(linkSpan);
+    @VisibleForTesting
+    static class PreOLinkAccessibilityHelper extends ExploreByTouchHelper {
+
+        private final Rect mTempRect = new Rect();
+        private final TextView mView;
+
+        PreOLinkAccessibilityHelper(TextView view) {
+            super(view);
+            mView = view;
+        }
+
+        protected int getVirtualViewAt(float x, float y) {
+            final CharSequence text = mView.getText();
+            if (text instanceof Spanned) {
+                final Spanned spannedText = (Spanned) text;
+                final int offset = getOffsetForPosition(mView, x, y);
+                ClickableSpan[] linkSpans =
+                        spannedText.getSpans(offset, offset, ClickableSpan.class);
+                if (linkSpans.length == 1) {
+                    ClickableSpan linkSpan = linkSpans[0];
+                    return spannedText.getSpanStart(linkSpan);
+                }
+            }
+            return ExploreByTouchHelper.INVALID_ID;
+        }
+
+        protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
+            final CharSequence text = mView.getText();
+            if (text instanceof Spanned) {
+                final Spanned spannedText = (Spanned) text;
+                ClickableSpan[] linkSpans = spannedText.getSpans(0, spannedText.length(),
+                        ClickableSpan.class);
+                for (ClickableSpan span : linkSpans) {
+                    virtualViewIds.add(spannedText.getSpanStart(span));
+                }
             }
         }
-        return ExploreByTouchHelper.INVALID_ID;
-    }
 
-    protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
-        final CharSequence text = mView.getText();
-        if (text instanceof Spanned) {
-            final Spanned spannedText = (Spanned) text;
-            ClickableSpan[] linkSpans = spannedText.getSpans(0, spannedText.length(),
-                    ClickableSpan.class);
-            for (ClickableSpan span : linkSpans) {
-                virtualViewIds.add(spannedText.getSpanStart(span));
-            }
-        }
-    }
-
-    protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) {
-        final ClickableSpan span = getSpanForOffset(virtualViewId);
-        if (span != null) {
-            event.setContentDescription(getTextForSpan(span));
-        } else {
-            Log.e(TAG, "LinkSpan is null for offset: " + virtualViewId);
-            event.setContentDescription(mView.getText());
-        }
-    }
-
-    protected void onPopulateNodeForVirtualView(int virtualViewId,
-            AccessibilityNodeInfoCompat info) {
-        final ClickableSpan span = getSpanForOffset(virtualViewId);
-        if (span != null) {
-            info.setContentDescription(getTextForSpan(span));
-        } else {
-            Log.e(TAG, "LinkSpan is null for offset: " + virtualViewId);
-            info.setContentDescription(mView.getText());
-        }
-        info.setFocusable(true);
-        info.setClickable(true);
-        getBoundsForSpan(span, mTempRect);
-        if (mTempRect.isEmpty()) {
-            Log.e(TAG, "LinkSpan bounds is empty for: " + virtualViewId);
-            mTempRect.set(0, 0, 1, 1);
-        }
-        info.setBoundsInParent(mTempRect);
-        info.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK);
-    }
-
-    protected boolean onPerformActionForVirtualView(int virtualViewId, int action,
-            Bundle arguments) {
-        if (action == AccessibilityNodeInfoCompat.ACTION_CLICK) {
-            ClickableSpan span = getSpanForOffset(virtualViewId);
+        protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) {
+            final ClickableSpan span = getSpanForOffset(virtualViewId);
             if (span != null) {
-                span.onClick(mView);
-                return true;
+                event.setContentDescription(getTextForSpan(span));
             } else {
                 Log.e(TAG, "LinkSpan is null for offset: " + virtualViewId);
+                event.setContentDescription(mView.getText());
             }
         }
-        return false;
-    }
 
-    private ClickableSpan getSpanForOffset(int offset) {
-        CharSequence text = mView.getText();
-        if (text instanceof Spanned) {
-            Spanned spannedText = (Spanned) text;
-            ClickableSpan[] spans = spannedText.getSpans(offset, offset, ClickableSpan.class);
-            if (spans.length == 1) {
-                return spans[0];
+        protected void onPopulateNodeForVirtualView(
+                int virtualViewId,
+                AccessibilityNodeInfoCompat info) {
+            final ClickableSpan span = getSpanForOffset(virtualViewId);
+            if (span != null) {
+                info.setContentDescription(getTextForSpan(span));
+            } else {
+                Log.e(TAG, "LinkSpan is null for offset: " + virtualViewId);
+                info.setContentDescription(mView.getText());
             }
+            info.setFocusable(true);
+            info.setClickable(true);
+            getBoundsForSpan(span, mTempRect);
+            if (mTempRect.isEmpty()) {
+                Log.e(TAG, "LinkSpan bounds is empty for: " + virtualViewId);
+                mTempRect.set(0, 0, 1, 1);
+            }
+            info.setBoundsInParent(mTempRect);
+            info.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK);
         }
-        return null;
-    }
 
-    private CharSequence getTextForSpan(ClickableSpan span) {
-        CharSequence text = mView.getText();
-        if (text instanceof Spanned) {
-            Spanned spannedText = (Spanned) text;
-            return spannedText.subSequence(spannedText.getSpanStart(span),
-                    spannedText.getSpanEnd(span));
-        }
-        return text;
-    }
-
-    // Find the bounds of a span. If it spans multiple lines, it will only return the bounds for the
-    // section on the first line.
-    private Rect getBoundsForSpan(ClickableSpan span, Rect outRect) {
-        CharSequence text = mView.getText();
-        outRect.setEmpty();
-        if (text instanceof Spanned) {
-            final Layout layout = mView.getLayout();
-            if (layout != null) {
-                Spanned spannedText = (Spanned) text;
-                final int spanStart = spannedText.getSpanStart(span);
-                final int spanEnd = spannedText.getSpanEnd(span);
-                final float xStart = layout.getPrimaryHorizontal(spanStart);
-                final float xEnd = layout.getPrimaryHorizontal(spanEnd);
-                final int lineStart = layout.getLineForOffset(spanStart);
-                final int lineEnd = layout.getLineForOffset(spanEnd);
-                layout.getLineBounds(lineStart, outRect);
-                if (lineEnd == lineStart) {
-                    // If the span is on a single line, adjust both the left and right bounds
-                    // so outrect is exactly bounding the span.
-                    outRect.left = (int) Math.min(xStart, xEnd);
-                    outRect.right = (int) Math.max(xStart, xEnd);
+        protected boolean onPerformActionForVirtualView(
+                int virtualViewId,
+                int action,
+                Bundle arguments) {
+            if (action == AccessibilityNodeInfoCompat.ACTION_CLICK) {
+                ClickableSpan span = getSpanForOffset(virtualViewId);
+                if (span != null) {
+                    span.onClick(mView);
+                    return true;
                 } else {
-                    // If the span wraps across multiple lines, only use the first line (as returned
-                    // by layout.getLineBounds above), and adjust the "start" of outrect to where
-                    // the span starts, leaving the "end" of outrect at the end of the line.
-                    // ("start" being left for LTR, and right for RTL)
-                    if (layout.getParagraphDirection(lineStart) == Layout.DIR_RIGHT_TO_LEFT) {
-                        outRect.right = (int) xStart;
-                    } else {
-                        outRect.left = (int) xStart;
-                    }
+                    Log.e(TAG, "LinkSpan is null for offset: " + virtualViewId);
                 }
-
-                // Offset for padding
-                outRect.offset(mView.getTotalPaddingLeft(), mView.getTotalPaddingTop());
             }
+            return false;
         }
-        return outRect;
-    }
 
-    // Compat implementation of TextView#getOffsetForPosition().
+        private ClickableSpan getSpanForOffset(int offset) {
+            CharSequence text = mView.getText();
+            if (text instanceof Spanned) {
+                Spanned spannedText = (Spanned) text;
+                ClickableSpan[] spans = spannedText.getSpans(offset, offset, ClickableSpan.class);
+                if (spans.length == 1) {
+                    return spans[0];
+                }
+            }
+            return null;
+        }
 
-    private static int getOffsetForPosition(TextView view, float x, float y) {
-        if (view.getLayout() == null) return -1;
-        final int line = getLineAtCoordinate(view, y);
-        return getOffsetAtCoordinate(view, line, x);
-    }
+        private CharSequence getTextForSpan(ClickableSpan span) {
+            CharSequence text = mView.getText();
+            if (text instanceof Spanned) {
+                Spanned spannedText = (Spanned) text;
+                return spannedText.subSequence(
+                        spannedText.getSpanStart(span),
+                        spannedText.getSpanEnd(span));
+            }
+            return text;
+        }
 
-    private static float convertToLocalHorizontalCoordinate(TextView view, float x) {
-        x -= view.getTotalPaddingLeft();
-        // Clamp the position to inside of the view.
-        x = Math.max(0.0f, x);
-        x = Math.min(view.getWidth() - view.getTotalPaddingRight() - 1, x);
-        x += view.getScrollX();
-        return x;
-    }
+        // Find the bounds of a span. If it spans multiple lines, it will only return the bounds for
+        // the section on the first line.
+        private Rect getBoundsForSpan(ClickableSpan span, Rect outRect) {
+            CharSequence text = mView.getText();
+            outRect.setEmpty();
+            if (text instanceof Spanned) {
+                final Layout layout = mView.getLayout();
+                if (layout != null) {
+                    Spanned spannedText = (Spanned) text;
+                    final int spanStart = spannedText.getSpanStart(span);
+                    final int spanEnd = spannedText.getSpanEnd(span);
+                    final float xStart = layout.getPrimaryHorizontal(spanStart);
+                    final float xEnd = layout.getPrimaryHorizontal(spanEnd);
+                    final int lineStart = layout.getLineForOffset(spanStart);
+                    final int lineEnd = layout.getLineForOffset(spanEnd);
+                    layout.getLineBounds(lineStart, outRect);
+                    if (lineEnd == lineStart) {
+                        // If the span is on a single line, adjust both the left and right bounds
+                        // so outrect is exactly bounding the span.
+                        outRect.left = (int) Math.min(xStart, xEnd);
+                        outRect.right = (int) Math.max(xStart, xEnd);
+                    } else {
+                        // If the span wraps across multiple lines, only use the first line (as
+                        // returned by layout.getLineBounds above), and adjust the "start" of
+                        // outrect to where the span starts, leaving the "end" of outrect at the end
+                        // of the line. ("start" being left for LTR, and right for RTL)
+                        if (layout.getParagraphDirection(lineStart) == Layout.DIR_RIGHT_TO_LEFT) {
+                            outRect.right = (int) xStart;
+                        } else {
+                            outRect.left = (int) xStart;
+                        }
+                    }
 
-    private static int getLineAtCoordinate(TextView view, float y) {
-        y -= view.getTotalPaddingTop();
-        // Clamp the position to inside of the view.
-        y = Math.max(0.0f, y);
-        y = Math.min(view.getHeight() - view.getTotalPaddingBottom() - 1, y);
-        y += view.getScrollY();
-        return view.getLayout().getLineForVertical((int) y);
-    }
+                    // Offset for padding
+                    outRect.offset(mView.getTotalPaddingLeft(), mView.getTotalPaddingTop());
+                }
+            }
+            return outRect;
+        }
 
-    private static int getOffsetAtCoordinate(TextView view, int line, float x) {
-        x = convertToLocalHorizontalCoordinate(view, x);
-        return view.getLayout().getOffsetForHorizontal(line, x);
+        // Compat implementation of TextView#getOffsetForPosition().
+
+        private static int getOffsetForPosition(TextView view, float x, float y) {
+            if (view.getLayout() == null) return -1;
+            final int line = getLineAtCoordinate(view, y);
+            return getOffsetAtCoordinate(view, line, x);
+        }
+
+        private static float convertToLocalHorizontalCoordinate(TextView view, float x) {
+            x -= view.getTotalPaddingLeft();
+            // Clamp the position to inside of the view.
+            x = Math.max(0.0f, x);
+            x = Math.min(view.getWidth() - view.getTotalPaddingRight() - 1, x);
+            x += view.getScrollX();
+            return x;
+        }
+
+        private static int getLineAtCoordinate(TextView view, float y) {
+            y -= view.getTotalPaddingTop();
+            // Clamp the position to inside of the view.
+            y = Math.max(0.0f, y);
+            y = Math.min(view.getHeight() - view.getTotalPaddingBottom() - 1, y);
+            y += view.getScrollY();
+            return view.getLayout().getLineForVertical((int) y);
+        }
+
+        private static int getOffsetAtCoordinate(TextView view, int line, float x) {
+            x = convertToLocalHorizontalCoordinate(view, x);
+            return view.getLayout().getOffsetForHorizontal(line, x);
+        }
     }
 }
diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java
similarity index 75%
rename from library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java
rename to library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java
index 844e73e..6228e6f 100644
--- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java
@@ -14,29 +14,35 @@
  * limitations under the License.
  */
 
-package com.android.setupwizardlib.test;
+package com.android.setupwizardlib.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.same;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import android.graphics.Rect;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v4.text.BidiFormatter;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 import android.support.v4.widget.ExploreByTouchHelper;
 import android.text.SpannableStringBuilder;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.span.LinkSpan;
-import com.android.setupwizardlib.util.LinkAccessibilityHelper;
+import com.android.setupwizardlib.util.LinkAccessibilityHelper.PreOLinkAccessibilityHelper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,13 +58,12 @@ public class LinkAccessibilityHelperTest {
     private static final LinkSpan LINK_SPAN = new LinkSpan("foobar");
 
     private TextView mTextView;
-    private TestLinkAccessibilityHelper mHelper;
+    private TestPreOLinkAccessibilityHelper mHelper;
 
     private DisplayMetrics mDisplayMetrics;
 
     @Test
     public void testGetVirtualViewAt() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         final int virtualViewId = mHelper.getVirtualViewAt(dp2Px(15), dp2Px(10));
         assertEquals("Virtual view ID should be 1", 1, virtualViewId);
@@ -66,7 +71,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testGetVirtualViewAtHost() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         final int virtualViewId = mHelper.getVirtualViewAt(dp2Px(100), dp2Px(100));
         assertEquals("Virtual view ID should be INVALID_ID",
@@ -75,7 +79,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testGetVisibleVirtualViews() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         List<Integer> virtualViewIds = new ArrayList<>();
         mHelper.getVisibleVirtualViews(virtualViewIds);
@@ -86,7 +89,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testOnPopulateEventForVirtualView() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         AccessibilityEvent event = AccessibilityEvent.obtain();
         mHelper.onPopulateEventForVirtualView(1, event);
@@ -100,7 +102,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testOnPopulateEventForVirtualViewHost() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         AccessibilityEvent event = AccessibilityEvent.obtain();
         mHelper.onPopulateEventForVirtualView(ExploreByTouchHelper.INVALID_ID, event);
@@ -113,7 +114,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testOnPopulateNodeForVirtualView() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         AccessibilityNodeInfoCompat info = AccessibilityNodeInfoCompat.obtain();
         mHelper.onPopulateNodeForVirtualView(1, info);
@@ -132,7 +132,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testNullLayout() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         initTextView();
         // Setting the padding will cause the layout to be null-ed out.
         mTextView.setPadding(1, 1, 1, 1);
@@ -150,7 +149,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testRtlLayout() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         SpannableStringBuilder ssb = new SpannableStringBuilder("מכונה בתרגום");
         ssb.setSpan(LINK_SPAN, 1, 2, 0 /* flags */);
         initTextView(ssb);
@@ -170,7 +168,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testMultilineLink() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         SpannableStringBuilder ssb = new SpannableStringBuilder(
                 "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
                 + "Praesent accumsan efficitur eros eu porttitor.");
@@ -192,7 +189,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testRtlMultilineLink() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         String iwLoremIpsum = "אחר על רביעי אקטואליה. לוח דת אחרות המקובל רומנית, מיזמים מועמדים "
                 + "האנציקלופדיה בה צ'ט. מתן מה שנורו לערוך ייִדיש, בקר או החול אנתרופולוגיה, עוד "
                 + "דפים המחשב מיזמים ב.";
@@ -216,7 +212,6 @@ public class LinkAccessibilityHelperTest {
 
     @Test
     public void testBidiMultilineLink() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) return;
         String iwLoremIpsum = "אחר על רביעי אקטואליה. לוח דת אחרות המקובל רומנית, מיזמים מועמדים "
                 + "האנציקלופדיה בה צ'ט. מתן מה שנורו לערוך ייִדיש, בקר או החול אנתרופולוגיה, עוד "
                 + "דפים המחשב מיזמים ב.";
@@ -243,6 +238,70 @@ public class LinkAccessibilityHelperTest {
         info.recycle();
     }
 
+    @Test
+    public void testMethodDelegation() {
+        initTextView();
+        ExploreByTouchHelper delegate = mock(TestPreOLinkAccessibilityHelper.class);
+        LinkAccessibilityHelper helper = new LinkAccessibilityHelper(delegate);
+
+        AccessibilityEvent accessibilityEvent =
+                AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_CLICKED);
+
+        helper.sendAccessibilityEvent(mTextView, AccessibilityEvent.TYPE_VIEW_CLICKED);
+        verify(delegate).sendAccessibilityEvent(
+                same(mTextView),
+                eq(AccessibilityEvent.TYPE_VIEW_CLICKED));
+
+        helper.sendAccessibilityEventUnchecked(mTextView, accessibilityEvent);
+        verify(delegate).sendAccessibilityEventUnchecked(same(mTextView), same(accessibilityEvent));
+
+        helper.performAccessibilityAction(
+                mTextView,
+                AccessibilityActionCompat.ACTION_CLICK.getId(),
+                Bundle.EMPTY);
+        verify(delegate).performAccessibilityAction(
+                same(mTextView),
+                eq(AccessibilityActionCompat.ACTION_CLICK.getId()),
+                eq(Bundle.EMPTY));
+
+        helper.dispatchPopulateAccessibilityEvent(
+                mTextView,
+                accessibilityEvent);
+        verify(delegate).dispatchPopulateAccessibilityEvent(
+                same(mTextView),
+                same(accessibilityEvent));
+
+        MotionEvent motionEvent = MotionEvent.obtain(0, 0, 0, 0, 0, 0);
+        helper.dispatchHoverEvent(motionEvent);
+        verify(delegate).dispatchHoverEvent(eq(motionEvent));
+
+        helper.getAccessibilityNodeProvider(mTextView);
+        verify(delegate).getAccessibilityNodeProvider(same(mTextView));
+
+        helper.onInitializeAccessibilityEvent(mTextView, accessibilityEvent);
+        verify(delegate).onInitializeAccessibilityEvent(
+                same(mTextView),
+                eq(accessibilityEvent));
+
+        AccessibilityNodeInfoCompat accessibilityNodeInfo = AccessibilityNodeInfoCompat.obtain();
+        helper.onInitializeAccessibilityNodeInfo(mTextView, accessibilityNodeInfo);
+        verify(delegate).onInitializeAccessibilityNodeInfo(
+                same(mTextView),
+                same(accessibilityNodeInfo));
+
+        helper.onPopulateAccessibilityEvent(mTextView, accessibilityEvent);
+        verify(delegate).onPopulateAccessibilityEvent(
+                same(mTextView),
+                same(accessibilityEvent));
+
+        FrameLayout parent = new FrameLayout(InstrumentationRegistry.getTargetContext());
+        helper.onRequestSendAccessibilityEvent(parent, mTextView, accessibilityEvent);
+        verify(delegate).onRequestSendAccessibilityEvent(
+                same(parent),
+                same(mTextView),
+                same(accessibilityEvent));
+    }
+
     private void initTextView() {
         SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
         ssb.setSpan(LINK_SPAN, 1, 2, 0 /* flags */);
@@ -254,7 +313,7 @@ public class LinkAccessibilityHelperTest {
         mTextView.setSingleLine(false);
         mTextView.setText(text);
         mTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
-        mHelper = new TestLinkAccessibilityHelper(mTextView);
+        mHelper = new TestPreOLinkAccessibilityHelper(mTextView);
 
         int measureExactly500dp = View.MeasureSpec.makeMeasureSpec(dp2Px(500),
                 View.MeasureSpec.EXACTLY);
@@ -270,9 +329,9 @@ public class LinkAccessibilityHelperTest {
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, mDisplayMetrics);
     }
 
-    private static class TestLinkAccessibilityHelper extends LinkAccessibilityHelper {
+    public static class TestPreOLinkAccessibilityHelper extends PreOLinkAccessibilityHelper {
 
-        TestLinkAccessibilityHelper(TextView view) {
+        TestPreOLinkAccessibilityHelper(TextView view) {
             super(view);
         }
 
diff --git a/library/standalone.gradle b/library/standalone.gradle
index a2119ac..132b908 100644
--- a/library/standalone.gradle
+++ b/library/standalone.gradle
@@ -16,5 +16,5 @@
 
 apply from: 'standalone-rules.gradle'
 
-android.compileSdkVersion 25
-android.buildToolsVersion '25.0.0'
+android.compileSdkVersion 26
+android.buildToolsVersion '26.0.0'
diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties
index 75de660..b4a1e0c 100644
--- a/tools/gradle/android.properties
+++ b/tools/gradle/android.properties
@@ -1,6 +1,6 @@
 // Set the default SDK and build tools version for all apps
-compileSdkVersion 25
-buildToolsVersion = '25.0.0'
+compileSdkVersion 26
+buildToolsVersion = '26.0.0'
 
 // enable Java7
 compileOptions.sourceCompatibility JavaVersion.VERSION_1_7

From beea4d67b53a2ee83eb85df452fdac5add971754 Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Mon, 16 Oct 2017 16:02:33 -0700
Subject: [PATCH 20/75] Add "isPreDeferredSetupWizard" to WizardManagerHelper

bug: 67782334
Test: Manually tested
Change-Id: Ic75eac6fd743a526e2cf61a12eecf66da7fa02b1
---
 .../setupwizardlib/util/WizardManagerHelper.java   | 14 ++++++++++++++
 .../util/WizardManagerHelperTest.java              |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index a93694c..896c013 100644
--- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
@@ -45,6 +45,8 @@ public class WizardManagerHelper {
     static final String EXTRA_IS_FIRST_RUN = "firstRun";
     @VisibleForTesting
     static final String EXTRA_IS_DEFERRED_SETUP = "deferredSetup";
+    @VisibleForTesting
+    static final String EXTRA_IS_PRE_DEFERRED_SETUP = "preDeferredSetup";
 
     public static final String EXTRA_THEME = "theme";
     public static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
@@ -212,6 +214,18 @@ public class WizardManagerHelper {
                 && originalIntent.getBooleanExtra(EXTRA_IS_DEFERRED_SETUP, false);
     }
 
+    /**
+     * Checks whether an intent is running in "pre-deferred" setup wizard flow.
+     *
+     * @param originalIntent The original intent that was used to start the step, usually via
+     *                       {@link android.app.Activity#getIntent()}.
+     * @return true if the intent passed in was running in "pre-deferred" setup wizard.
+     */
+    public static boolean isPreDeferredSetupWizard(Intent originalIntent) {
+        return originalIntent != null
+                && originalIntent.getBooleanExtra(EXTRA_IS_PRE_DEFERRED_SETUP, false);
+    }
+
     /**
      * Checks the intent whether the extra indicates that the light theme should be used or not. If
      * the theme is not specified in the intent, or the theme specified is unknown, the value def
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
index 4c460c8..6477b51 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
@@ -87,6 +87,14 @@ public class WizardManagerHelperTest {
                 WizardManagerHelper.isDeferredSetupWizard(intent));
     }
 
+    @Test
+    public void testIsPreDeferredSetupTrue() {
+        final Intent intent = new Intent();
+        intent.putExtra("preDeferredSetup", true);
+        assertTrue("Is pre-deferred setup wizard should be true",
+                WizardManagerHelper.isPreDeferredSetupWizard(intent));
+    }
+
     @Test
     public void testIsSetupWizardFalse() {
         final Intent intent = new Intent();

From 88d7f0d37007e13601b6ead3ca039ece20ef94d7 Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Tue, 31 Oct 2017 14:43:49 -0700
Subject: [PATCH 21/75] Intent extra PRE_DEFERRED_SETUP should be copied

Test: Robolectric tests updated, manually tested and verified extra
copied
Change-Id: I282ab5e0121fb41be5f082eec77019d3e6d3a369
---
 .../util/WizardManagerHelper.java               | 17 ++++++++++-------
 .../util/WizardManagerHelperTest.java           |  3 +++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index 896c013..32929aa 100644
--- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
@@ -27,6 +27,8 @@ import android.support.annotation.VisibleForTesting;
 
 import com.android.setupwizardlib.R;
 
+import java.util.Arrays;
+
 public class WizardManagerHelper {
 
     private static final String ACTION_NEXT = "com.android.wizard.NEXT";
@@ -142,13 +144,14 @@ public class WizardManagerHelper {
      */
     public static void copyWizardManagerExtras(Intent srcIntent, Intent dstIntent) {
         dstIntent.putExtra(EXTRA_WIZARD_BUNDLE, srcIntent.getBundleExtra(EXTRA_WIZARD_BUNDLE));
-        dstIntent.putExtra(EXTRA_THEME, srcIntent.getStringExtra(EXTRA_THEME));
-        dstIntent.putExtra(EXTRA_IS_FIRST_RUN,
-                srcIntent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false));
-        dstIntent.putExtra(EXTRA_IS_DEFERRED_SETUP,
-                srcIntent.getBooleanExtra(EXTRA_IS_DEFERRED_SETUP, false));
-        dstIntent.putExtra(EXTRA_SCRIPT_URI, srcIntent.getStringExtra(EXTRA_SCRIPT_URI));
-        dstIntent.putExtra(EXTRA_ACTION_ID, srcIntent.getStringExtra(EXTRA_ACTION_ID));
+        for (String key : Arrays.asList(
+                EXTRA_IS_FIRST_RUN, EXTRA_IS_DEFERRED_SETUP, EXTRA_IS_PRE_DEFERRED_SETUP)) {
+            dstIntent.putExtra(key, srcIntent.getBooleanExtra(key, false));
+        }
+
+        for (String key : Arrays.asList(EXTRA_THEME, EXTRA_SCRIPT_URI, EXTRA_ACTION_ID)) {
+            dstIntent.putExtra(key, srcIntent.getStringExtra(key));
+        }
     }
 
     /**
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
index 6477b51..c236bb5 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
@@ -274,6 +274,7 @@ public class WizardManagerHelperTest {
                 .putExtra(WizardManagerHelper.EXTRA_WIZARD_BUNDLE, wizardBundle)
                 .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true)
                 .putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, true)
+                .putExtra(WizardManagerHelper.EXTRA_IS_PRE_DEFERRED_SETUP, true)
                 // Script URI and Action ID are kept for backwards compatibility
                 .putExtra(WizardManagerHelper.EXTRA_SCRIPT_URI, "test_script_uri")
                 .putExtra(WizardManagerHelper.EXTRA_ACTION_ID, "test_action_id");
@@ -292,6 +293,8 @@ public class WizardManagerHelperTest {
                 intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, false));
         assertTrue("EXTRA_IS_DEFERRED_SETUP should be copied",
                 intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, false));
+        assertTrue("EXTRA_IS_PRE_DEFERRED_SETUP should be copied",
+                intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_PRE_DEFERRED_SETUP, false));
 
         // Script URI and Action ID are replaced by Wizard Bundle in M, but are kept for backwards
         // compatibility

From 58195c5316855122593366bd867ed51a91bd5c11 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 2 Nov 2017 20:52:08 -0700
Subject: [PATCH 22/75] Hide icon view if icon is null

To remove the extra margin when the icon is not used.

Test: ./gradlew connectedAndroidTest
Bug: 68826871
Change-Id: Ic23307a28b2829fdbe029c61f912f04bab90ca13
---
 library/main/res/layout/suw_glif_header.xml           |  3 ++-
 .../android/setupwizardlib/template/IconMixin.java    |  2 ++
 .../setupwizardlib/template/IconMixinTest.java        | 11 +++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/library/main/res/layout/suw_glif_header.xml b/library/main/res/layout/suw_glif_header.xml
index b090f79..cfabcb1 100644
--- a/library/main/res/layout/suw_glif_header.xml
+++ b/library/main/res/layout/suw_glif_header.xml
@@ -26,7 +26,8 @@
         style="@style/SuwGlifIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:contentDescription="@null" />
+        android:contentDescription="@null"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/suw_layout_title"
diff --git a/library/main/src/com/android/setupwizardlib/template/IconMixin.java b/library/main/src/com/android/setupwizardlib/template/IconMixin.java
index 46c23f0..c42299b 100644
--- a/library/main/src/com/android/setupwizardlib/template/IconMixin.java
+++ b/library/main/src/com/android/setupwizardlib/template/IconMixin.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
 
 import com.android.setupwizardlib.R;
@@ -61,6 +62,7 @@ public class IconMixin implements Mixin {
         final ImageView iconView = getView();
         if (iconView != null) {
             iconView.setImageDrawable(icon);
+            iconView.setVisibility(icon != null ? View.VISIBLE : View.GONE);
         }
     }
 
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
index a1f2b54..0391392 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
@@ -31,6 +31,7 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Xml;
+import android.view.View;
 import android.widget.ImageView;
 
 import com.android.setupwizardlib.TemplateLayout;
@@ -74,6 +75,15 @@ public class IconMixinTest {
         mixin.setIcon(drawable);
 
         assertSame(drawable, mIconView.getDrawable());
+        assertEquals(View.VISIBLE, mIconView.getVisibility());
+    }
+
+    @Test
+    public void setIcon_shouldSetVisibilityToGone_whenIconIsNull() {
+        IconMixin mixin = new IconMixin(mTemplateLayout, null, 0);
+        mixin.setIcon(null);
+
+        assertEquals(View.GONE, mIconView.getVisibility());
     }
 
     @Test
@@ -101,5 +111,6 @@ public class IconMixinTest {
                 .getDrawable(android.R.drawable.ic_menu_add);
         final BitmapDrawable actual = (BitmapDrawable) mIconView.getDrawable();
         assertEquals(expected.getBitmap(), actual.getBitmap());
+        assertEquals(View.VISIBLE, mIconView.getVisibility());
     }
 }

From 00e551ce2deaeb4414fc5a387d8ea8de6a19876c Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 3 Nov 2017 12:16:04 -0700
Subject: [PATCH 23/75] Allow GlifLayout to not request fullscreen

For usage with app bars or inside another layout, GlifLayout should
not request fullscreen. Add a flag to allow disabling that.

Test: ./gradlew test
Bug: 68826871
Change-Id: Ie6a7f91628af5b861e8ba91e62a3f1c9c390aebf
---
 library/main/res/values/attrs.xml             |  1 +
 .../android/setupwizardlib/GlifLayout.java    | 11 +++++---
 .../setupwizardlib/GlifLayoutTest.java        | 27 +++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 36d5fb7..d378bb0 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -102,6 +102,7 @@
         <attr name="suwBackgroundBaseColor" format="color" />
         <attr name="suwColorPrimary" />
         <attr name="suwFooter" format="reference" />
+        <attr name="suwLayoutFullscreen" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="SuwStatusBarBackgroundLayout">
diff --git a/library/main/src/com/android/setupwizardlib/GlifLayout.java b/library/main/src/com/android/setupwizardlib/GlifLayout.java
index f4d52a5..dd0963b 100644
--- a/library/main/src/com/android/setupwizardlib/GlifLayout.java
+++ b/library/main/src/com/android/setupwizardlib/GlifLayout.java
@@ -77,6 +77,8 @@ public class GlifLayout extends TemplateLayout {
     @Nullable
     private ColorStateList mBackgroundBaseColor;
 
+    private boolean mLayoutFullscreen = true;
+
     public GlifLayout(Context context) {
         this(context, 0, 0);
     }
@@ -139,7 +141,13 @@ public class GlifLayout extends TemplateLayout {
             inflateFooter(footer);
         }
 
+        mLayoutFullscreen = a.getBoolean(R.styleable.SuwGlifLayout_suwLayoutFullscreen, true);
+
         a.recycle();
+
+        if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && mLayoutFullscreen) {
+            setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+        }
     }
 
     @Override
@@ -280,9 +288,6 @@ public class GlifLayout extends TemplateLayout {
                 patternBg.setBackgroundDrawable(background);
             }
         }
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-            setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-        }
     }
 
     public boolean isProgressBarShown() {
diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
index d46409d..967a52e 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
@@ -32,6 +32,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.support.annotation.IdRes;
 import android.view.ContextThemeWrapper;
 import android.view.View;
@@ -266,6 +267,32 @@ public class GlifLayoutTest {
         assertNotNull(layout.findViewById(android.R.id.text1));
     }
 
+    @Config(sdk = { VERSION_CODES.M, Config.NEWEST_SDK })
+    @Test
+    public void createFromXml_shouldSetLayoutFullscreen_whenLayoutFullscreenIsNotSet() {
+        GlifLayout layout = new GlifLayout(
+                mContext,
+                Robolectric.buildAttributeSet()
+                        .build());
+
+        assertEquals(
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
+                layout.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+    }
+
+    @Test
+    public void createFromXml_shouldNotSetLayoutFullscreen_whenLayoutFullscreenIsFalse() {
+        GlifLayout layout = new GlifLayout(
+                mContext,
+                Robolectric.buildAttributeSet()
+                        .addAttribute(R.attr.suwLayoutFullscreen, "false")
+                        .build());
+
+        assertEquals(
+                0,
+                layout.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+    }
+
     private Drawable getPhoneBackground(GlifLayout layout) {
         final StatusBarBackgroundLayout patternBg =
                 (StatusBarBackgroundLayout) layout.findManagedViewById(R.id.suw_pattern_bg);

From 33b56523998c90d5313b3f8f7a1f2eb29099e562 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 8 Nov 2017 11:15:55 -0800
Subject: [PATCH 24/75] Always compose GlifPatternDrawable using alpha

The color filter approach is broken in P, and the alpha approach
achieves the same result despite being slightly less efficient.

Test: Manual
Bug: 69039551
Change-Id: I1e1ee0bc89723995da69f272995b4825316a78dc
---
 .../setupwizardlib/GlifPatternDrawable.java   | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java b/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java
index 51c1a49..c1d968a 100644
--- a/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java
+++ b/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java
@@ -23,7 +23,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
-import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PixelFormat;
@@ -96,7 +95,6 @@ public class GlifPatternDrawable extends Drawable {
 
     private int mColor;
     private Paint mTempPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    private ColorFilter mColorFilter;
 
     public GlifPatternDrawable(int color) {
         setColor(color);
@@ -140,17 +138,10 @@ public class GlifPatternDrawable extends Drawable {
         canvas.clipRect(bounds);
 
         scaleCanvasToBounds(canvas, bitmap, bounds);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB
-                && canvas.isHardwareAccelerated()) {
-            mTempPaint.setColorFilter(mColorFilter);
-            canvas.drawBitmap(bitmap, 0, 0, mTempPaint);
-        } else {
-            // Software renderer doesn't work properly with ColorMatrix filter on ALPHA_8 bitmaps.
-            canvas.drawColor(Color.BLACK);
-            mTempPaint.setColor(Color.WHITE);
-            canvas.drawBitmap(bitmap, 0, 0, mTempPaint);
-            canvas.drawColor(mColor);
-        }
+        canvas.drawColor(Color.BLACK);
+        mTempPaint.setColor(Color.WHITE);
+        canvas.drawBitmap(bitmap, 0, 0, mTempPaint);
+        canvas.drawColor(mColor);
 
         canvas.restore();
     }
@@ -299,12 +290,6 @@ public class GlifPatternDrawable extends Drawable {
         final int g = Color.green(color);
         final int b = Color.blue(color);
         mColor = Color.argb(COLOR_ALPHA_INT, r, g, b);
-        mColorFilter = new ColorMatrixColorFilter(new float[] {
-                0, 0, 0, 1 - COLOR_ALPHA, r * COLOR_ALPHA,
-                0, 0, 0, 1 - COLOR_ALPHA, g * COLOR_ALPHA,
-                0, 0, 0, 1 - COLOR_ALPHA, b * COLOR_ALPHA,
-                0, 0, 0,               0,             255
-        });
         invalidateSelf();
     }
 

From fe4a75413551caa580537f80066396e3e69bac9f Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Fri, 10 Nov 2017 18:59:14 +0000
Subject: [PATCH 25/75] Fix import of android-support-annotations

Bug: 69161825
Change-Id: Ic48ec4a3a5125ebc1fe83ae9b23e7696cd7c0cef
---
 library/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Android.mk b/library/Android.mk
index 26f5e1f..030733e 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -43,8 +43,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recycle
 
 ifdef LOCAL_USE_AAPT2
 
+LOCAL_JAVA_LIBRARIES := \
+    android-support-annotations
+
 LOCAL_SHARED_ANDROID_LIBRARIES := \
-    android-support-annotations \
     android-support-compat \
     android-support-core-ui \
     android-support-v7-appcompat \

From 4d2145974cef3022ec4162d77ef50d74a720c4f0 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 21 Nov 2017 18:39:27 -0800
Subject: [PATCH 26/75] Specify colorBackground in material theme

Lollipop and Marshmallow have different background colors. Specify
the color in SuwThemeMaterial so they are consistent across OS
versions.

Test: Manual
Bug: 69563212
Change-Id: Ice36a8f74796c0dd804fa897d74188c9ff88354d
---
 library/gingerbread/res/values/styles.xml  | 2 ++
 library/main/res/values/colors.xml         | 2 ++
 library/platform/res/values-v23/styles.xml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 6e525ef..b556f07 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -20,6 +20,7 @@
     <!-- General styles -->
 
     <style name="SuwThemeMaterial" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:colorBackground">@color/suw_color_background_dark</item>
         <item name="android:indeterminateTint" tools:ignore="NewApi">@color/suw_progress_bar_color_dark</item>
         <!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
         <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
@@ -51,6 +52,7 @@
     </style>
 
     <style name="SuwThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:colorBackground">@color/suw_color_background_light</item>
         <item name="android:indeterminateTint" tools:ignore="NewApi">@color/suw_progress_bar_color_light</item>
         <!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
         <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index cd57a8a..b20098d 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -21,6 +21,8 @@
 
     <color name="suw_color_accent_dark">#ff448aff</color>
     <color name="suw_color_accent_light">#ff3367d6</color>
+    <color name="suw_color_background_dark">#ff303030</color>
+    <color name="suw_color_background_light">#fffafafa</color>
     <color name="suw_link_color_dark">#ff448aff</color>
     <color name="suw_link_color_light">#ff3367d6</color>
     <color name="suw_list_item_icon_color_dark">#b3ffffff</color>
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 9fff5f1..17ad09a 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -26,6 +26,7 @@
          Theme.AppCompat. -->
     <style name="SuwThemeMaterial" parent="android:Theme.Material.NoActionBar">
         <item name="android:colorAccent">@color/suw_color_accent_dark</item>
+        <item name="android:colorBackground">@color/suw_color_background_dark</item>
         <item name="android:indeterminateTint">@color/suw_progress_bar_color_dark</item>
         <!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
         <item name="android:indeterminateTintMode">src_in</item>
@@ -54,6 +55,7 @@
 
     <style name="SuwThemeMaterial.Light" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:colorAccent">@color/suw_color_accent_light</item>
+        <item name="android:colorBackground">@color/suw_color_background_light</item>
         <item name="android:indeterminateTint">@color/suw_progress_bar_color_light</item>
         <!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
         <item name="android:indeterminateTintMode">src_in</item>

From 8b52391bba333441da82aed544bd58fae9586f15 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 1 Dec 2017 12:51:42 -0800
Subject: [PATCH 27/75] Add GLIF v3 theme and make buttons Google Blue 600

Test: ./gradlew test
Bug: 69930196
Change-Id: Iba6be8daad2f27925647e43a6a1c5e19c03fb7bb
---
 library/gingerbread/res/values/styles.xml     |  10 ++
 .../color-v23/suw_flat_button_highlight.xml   |   2 +-
 library/main/res/values/attrs.xml             |   1 +
 library/main/res/values/colors.xml            |   1 +
 library/main/res/values/styles.xml            |   8 +
 .../util/WizardManagerHelper.java             |  22 ++-
 library/platform/res/values-v23/styles.xml    |   4 +
 .../util/WizardManagerHelperTest.java         | 140 ++++++++----------
 8 files changed, 106 insertions(+), 82 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 6e525ef..9dcf770 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -38,6 +38,7 @@
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
         <item name="suwDividerInsetEnd">0dp</item>
         <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
@@ -69,6 +70,7 @@
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_light</item>
         <item name="suwDividerInsetEnd">0dp</item>
         <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
@@ -101,6 +103,7 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_dark</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -136,6 +139,7 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_light</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -197,11 +201,16 @@
              ContextThemeWrapper. These self-referencing attributes make sure this is applied as
              both to the button. -->
         <item name="android:buttonStyle">@style/SuwGlifButton.Primary</item>
+        <item name="android:theme">@style/SuwGlifButton.Primary</item>
         <item name="buttonStyle">@style/SuwGlifButton.Primary</item>
 
         <!-- Values used in styles -->
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
+
+        <!-- Values used in themes -->
+        <item name="android:backgroundTint" tools:targetApi="lollipop">?attr/suwButtonColor</item>
+        <item name="backgroundTint">?attr/suwButtonColor</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -216,6 +225,7 @@
         <item name="android:minWidth">0dp</item>
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
+        <item name="android:textColor">?attr/suwButtonColor</item>
 
         <!-- Values used in themes -->
         <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item>
diff --git a/library/main/res/color-v23/suw_flat_button_highlight.xml b/library/main/res/color-v23/suw_flat_button_highlight.xml
index c5be14f..4d90570 100644
--- a/library/main/res/color-v23/suw_flat_button_highlight.xml
+++ b/library/main/res/color-v23/suw_flat_button_highlight.xml
@@ -16,6 +16,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent"
+    <item android:color="?attr/suwButtonColor"
         android:alpha="0.24" />
 </selector>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index d378bb0..ec21f87 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
     <!-- Theme attributes -->
     <attr name="suwLayoutTheme" format="reference" />
     <attr name="suwMarginSides" format="dimension|reference" />
+    <attr name="suwButtonColor" format="color" />
 
     <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only
          horizontal values are listed here as the header does not support vertical gravity. -->
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index cd57a8a..525d1b2 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -42,5 +42,6 @@
     <color name="suw_color_accent_glif_light">#ff4285f4</color>
     <color name="suw_glif_background_color_dark">#ff000000</color>
     <color name="suw_glif_background_color_light">#ffffffff</color>
+    <color name="suw_glif_v3_footer_button_color">#ff1a73e8</color>
 
 </resources>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index bd3b60f..0e7685b 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -51,6 +51,14 @@
     <!-- Deprecated. Use SuwThemeGlifV2.Light instead -->
     <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" />
 
+    <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
+        <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
+    </style>
+
+    <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
+        <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
+    </style>
+
     <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity">
         <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item>
         <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item>
diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index 32929aa..f4bb8f5 100644
--- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
@@ -97,6 +97,18 @@ public class WizardManagerHelper {
     @Deprecated
     public static final String THEME_GLIF_PIXEL_LIGHT = THEME_GLIF_V2_LIGHT;
 
+    /**
+     * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the dark variant of the
+     * theme used in setup wizard for P.
+     */
+    public static final String THEME_GLIF_V3 = "glif_v3";
+
+    /**
+     * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the default theme used in
+     * setup wizard for P.
+     */
+    public static final String THEME_GLIF_V3_LIGHT = "glif_v3_light";
+
     /**
      * Get an intent that will invoke the next step of setup wizard.
      *
@@ -253,10 +265,12 @@ public class WizardManagerHelper {
      */
     public static boolean isLightTheme(String theme, boolean def) {
         if (THEME_HOLO_LIGHT.equals(theme) || THEME_MATERIAL_LIGHT.equals(theme)
-                || THEME_GLIF_LIGHT.equals(theme) || THEME_GLIF_V2_LIGHT.equals(theme)) {
+                || THEME_GLIF_LIGHT.equals(theme) || THEME_GLIF_V2_LIGHT.equals(theme)
+                || THEME_GLIF_V3_LIGHT.equals(theme)) {
             return true;
         } else if (THEME_HOLO.equals(theme) || THEME_MATERIAL.equals(theme)
-                || THEME_GLIF.equals(theme) || THEME_GLIF_V2.equals(theme)) {
+                || THEME_GLIF.equals(theme) || THEME_GLIF_V2.equals(theme)
+                || THEME_GLIF_V3.equals(theme)) {
             return false;
         } else {
             return def;
@@ -301,6 +315,10 @@ public class WizardManagerHelper {
     public static @StyleRes int getThemeRes(String theme, @StyleRes int defaultTheme) {
         if (theme != null) {
             switch (theme) {
+                case THEME_GLIF_V3_LIGHT:
+                    return R.style.SuwThemeGlifV3_Light;
+                case THEME_GLIF_V3:
+                    return R.style.SuwThemeGlifV3;
                 case THEME_GLIF_V2_LIGHT:
                     return R.style.SuwThemeGlifV2_Light;
                 case THEME_GLIF_V2:
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 9fff5f1..c2aaeed 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -40,6 +40,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -68,6 +69,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -100,6 +102,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -132,6 +135,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
index c236bb5..9195de2 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
@@ -39,6 +39,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = Config.NEWEST_SDK)
 public class WizardManagerHelperTest {
@@ -104,75 +108,57 @@ public class WizardManagerHelperTest {
     }
 
     @Test
-    public void testHoloIsNotLightTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "holo");
-        assertFalse("Theme holo should not be light theme",
-                WizardManagerHelper.isLightTheme(intent, true));
+    public void isLightTheme_shouldReturnTrue_whenThemeIsLight() {
+        List<String> lightThemes = Arrays.asList(
+                "holo_light",
+                "material_light",
+                "glif_light",
+                "glif_v2_light",
+                "glif_v3_light"
+        );
+        ArrayList<String> unexpectedIntentThemes = new ArrayList<>();
+        ArrayList<String> unexpectedStringThemes = new ArrayList<>();
+        for (final String theme : lightThemes) {
+            Intent intent = new Intent();
+            intent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
+            if (!WizardManagerHelper.isLightTheme(intent, false)) {
+                unexpectedIntentThemes.add(theme);
+            }
+            if (!WizardManagerHelper.isLightTheme(theme, false)) {
+                unexpectedStringThemes.add(theme);
+            }
+        }
+        assertTrue("Intent themes " + unexpectedIntentThemes + " should be light",
+                unexpectedIntentThemes.isEmpty());
+        assertTrue("String themes " + unexpectedStringThemes + " should be light",
+                unexpectedStringThemes.isEmpty());
     }
 
     @Test
-    public void testHoloLightIsLightTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "holo_light");
-        assertTrue("Theme holo_light should be light theme",
-                WizardManagerHelper.isLightTheme(intent, false));
-    }
-
-    @Test
-    public void testMaterialIsNotLightTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "material");
-        assertFalse("Theme material should not be light theme",
-                WizardManagerHelper.isLightTheme(intent, true));
-    }
-
-    @Test
-    public void testMaterialLightIsLightTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "material_light");
-        assertTrue("Theme material_light should be light theme",
-                WizardManagerHelper.isLightTheme(intent, false));
-    }
-
-    @Test
-    public void testGlifIsDarkTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "glif");
-        assertFalse("Theme glif should be dark theme",
-                WizardManagerHelper.isLightTheme(intent, false));
-        assertFalse("Theme glif should be dark theme",
-                WizardManagerHelper.isLightTheme(intent, true));
-    }
-
-    @Test
-    public void testGlifLightIsLightTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "glif_light");
-        assertTrue("Theme glif_light should be light theme",
-                WizardManagerHelper.isLightTheme(intent, false));
-        assertTrue("Theme glif_light should be light theme",
-                WizardManagerHelper.isLightTheme(intent, true));
-    }
-
-    @Test
-    public void testGlifV2IsDarkTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "glif_v2");
-        assertFalse("Theme glif_v2 should be dark theme",
-                WizardManagerHelper.isLightTheme(intent, false));
-        assertFalse("Theme glif_v2 should be dark theme",
-                WizardManagerHelper.isLightTheme(intent, true));
-    }
-
-    @Test
-    public void testGlifV2LightIsLightTheme() {
-        final Intent intent = new Intent();
-        intent.putExtra("theme", "glif_v2_light");
-        assertTrue("Theme glif_v2_light should be light theme",
-                WizardManagerHelper.isLightTheme(intent, false));
-        assertTrue("Theme glif_v2_light should be light theme",
-                WizardManagerHelper.isLightTheme(intent, true));
+    public void isLightTheme_shouldReturnFalse_whenThemeIsNotLight() {
+        List<String> lightThemes = Arrays.asList(
+                "holo",
+                "material",
+                "glif",
+                "glif_v2",
+                "glif_v3"
+        );
+        ArrayList<String> unexpectedIntentThemes = new ArrayList<>();
+        ArrayList<String> unexpectedStringThemes = new ArrayList<>();
+        for (final String theme : lightThemes) {
+            Intent intent = new Intent();
+            intent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
+            if (WizardManagerHelper.isLightTheme(intent, true)) {
+                unexpectedIntentThemes.add(theme);
+            }
+            if (WizardManagerHelper.isLightTheme(theme, true)) {
+                unexpectedStringThemes.add(theme);
+            }
+        }
+        assertTrue("Intent themes " + unexpectedIntentThemes + " should not be light",
+                unexpectedIntentThemes.isEmpty());
+        assertTrue("String themes " + unexpectedStringThemes + " should not be light",
+                unexpectedStringThemes.isEmpty());
     }
 
     @Test
@@ -195,19 +181,15 @@ public class WizardManagerHelperTest {
     }
 
     @Test
-    public void testIsLightThemeString() {
-        assertTrue("isLightTheme should return true for material_light",
-                WizardManagerHelper.isLightTheme("material_light", false));
-        assertFalse("isLightTheme should return false for material",
-                WizardManagerHelper.isLightTheme("material", false));
-        assertTrue("isLightTheme should return true for holo_light",
-                WizardManagerHelper.isLightTheme("holo_light", false));
-        assertFalse("isLightTheme should return false for holo",
-                WizardManagerHelper.isLightTheme("holo", false));
-        assertTrue("isLightTheme should return default value true",
-                WizardManagerHelper.isLightTheme("abracadabra", true));
-        assertFalse("isLightTheme should return default value false",
-                WizardManagerHelper.isLightTheme("abracadabra", false));
+    public void testGetThemeResGlifV3Light() {
+        assertEquals(R.style.SuwThemeGlifV3_Light,
+                WizardManagerHelper.getThemeRes("glif_v3_light", 0));
+    }
+
+    @Test
+    public void testGetThemeResGlifV3() {
+        assertEquals(R.style.SuwThemeGlifV3,
+                WizardManagerHelper.getThemeRes("glif_v3", 0));
     }
 
     @Test

From 25b95910469405efda4f481fe3c949aeb04a5ca9 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 5 Dec 2017 12:38:14 -0800
Subject: [PATCH 28/75] Add missing @Override annotations

Test: Existing tests pass
Change-Id: I9bf733b3591a1bc02e4bd4898f04d30e14e5fd45
---
 .../android/setupwizardlib/util/LinkAccessibilityHelper.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
index 1fb3a37..9965aa0 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
@@ -152,6 +152,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
             mView = view;
         }
 
+        @Override
         protected int getVirtualViewAt(float x, float y) {
             final CharSequence text = mView.getText();
             if (text instanceof Spanned) {
@@ -167,6 +168,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
             return ExploreByTouchHelper.INVALID_ID;
         }
 
+        @Override
         protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
             final CharSequence text = mView.getText();
             if (text instanceof Spanned) {
@@ -179,6 +181,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
             }
         }
 
+        @Override
         protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) {
             final ClickableSpan span = getSpanForOffset(virtualViewId);
             if (span != null) {
@@ -189,6 +192,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
             }
         }
 
+        @Override
         protected void onPopulateNodeForVirtualView(
                 int virtualViewId,
                 AccessibilityNodeInfoCompat info) {
@@ -210,6 +214,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
             info.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK);
         }
 
+        @Override
         protected boolean onPerformActionForVirtualView(
                 int virtualViewId,
                 int action,

From ba1332d1b4dd525a2ef313246482708cb2016052 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 6 Dec 2017 12:55:23 -0800
Subject: [PATCH 29/75] Changes needed to upgrade to new gradle version

- Add ignore for various lint errors that is introduced in the lint
  update
- Remove GLIF Pixel themes as they are unused and causing lint errors
- Add flavor dimension "compat" as it is now required
- Replace *Compile with *Implementation in the gradle files, as
  needed by the newer Gradle version
- Use build tools 27.0.0 to avoid the Gradle warning
- Use new Robolectric configuration mechanism and removed our old
  hack, per http://robolectric.org/getting-started/

Reference: https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html

Test: Existing tests pass
Bug: 70287447
Change-Id: I505476ae3695cd06349766c5e6280299f779f272
---
 .../view/NavigationBarButton.java             |   2 +
 .../items/ExpandableSwitchItemTest.java       |   3 +-
 .../setupwizardlib/items/SwitchItemTest.java  |   3 +-
 .../util/DimensionConsistencyTest.java        |   3 +-
 library/lint.xml                              |   4 +
 library/main/res/values/styles.xml            |  20 ++-
 .../util/WizardManagerHelper.java             |  12 --
 library/platform/res/values-v23/styles.xml    |   4 +-
 ...ecyclerViewScrollHandlingDelegateTest.java |   3 +-
 library/rules.gradle                          |  10 +-
 library/self.gradle                           |  25 ++--
 .../setupwizardlib/GlifLayoutTest.java        |   2 +-
 .../setupwizardlib/items/ButtonItemTest.java  |   5 +-
 .../setupwizardlib/items/ItemGroupTest.java   |   5 +-
 .../PatchedGradleManifestFactory.java         | 126 ------------------
 .../SuwLibRobolectricTestRunner.java          |  29 ----
 .../setupwizardlib/span/LinkSpanTest.java     |   4 +-
 .../ListViewScrollHandlingDelegateTest.java   |   3 +-
 .../template/RequireScrollMixinTest.java      |   3 +-
 .../ScrollViewScrollHandlingDelegateTest.java |   3 +-
 .../util/GlifDimensionTest.java               |   3 +-
 .../setupwizardlib/util/GlifStyleTest.java    |   3 +-
 .../setupwizardlib/util/PartnerTest.java      |   2 -
 .../util/WizardManagerHelperTest.java         |   3 +-
 .../view/FillContentLayoutTest.java           |   3 +-
 .../view/IllustrationVideoViewTest.java       |   2 -
 tools/gradle/android.properties               |   4 +-
 27 files changed, 54 insertions(+), 235 deletions(-)
 delete mode 100644 library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
index 5172c47..d7a3c2e 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
@@ -16,6 +16,7 @@
 
 package com.android.setupwizardlib.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
@@ -30,6 +31,7 @@ import android.widget.Button;
  * Button for navigation bar, which includes tinting of its compound drawables to be used for dark
  * and light themes.
  */
+@SuppressLint("AppCompatCustomView")
 public class NavigationBarButton extends Button {
 
     public NavigationBarButton(Context context) {
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
index 4fb3e28..3020ed3 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
@@ -32,7 +32,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -44,7 +43,7 @@ import org.robolectric.annotation.Config;
 import java.util.ArrayList;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ExpandableSwitchItemTest {
 
     private TextView mSummaryView;
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
index d391d80..fa5bbba 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
@@ -31,7 +31,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -40,7 +39,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class SwitchItemTest {
 
     private SwitchCompat mSwitch;
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
index 43e7f03..7a08235 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
@@ -25,7 +25,6 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -35,7 +34,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS)
+@Config(sdk = Config.ALL_SDKS)
 public class DimensionConsistencyTest {
 
     // Visual height of the framework switch widget
diff --git a/library/lint.xml b/library/lint.xml
index ca22c65..625b20d 100644
--- a/library/lint.xml
+++ b/library/lint.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <!-- SUW lib prefixes styleable resources -->
+    <issue id="CustomViewStyleable" severity="ignore" />
     <issue id="ExtraTranslation" severity="ignore" />
     <issue id="GradleDependency" severity="ignore" />
     <issue id="MissingTranslation" severity="ignore" />
+    <!-- Stop lint from complaining about SDK version checks in the "platform" variant -->
+    <issue id="ObsoleteSdkInt" severity="ignore" />
     <issue id="RtlEnabled" severity="ignore" />
 </lint>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 0e7685b..e1e229f 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -32,9 +32,6 @@
         <item name="suwScrollIndicators">top|bottom</item>
     </style>
 
-    <!-- Deprecated. Use SuwThemeGlifV2 instead -->
-    <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" />
-
     <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
         <item name="android:colorBackground">@color/suw_glif_background_color_light</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
@@ -48,9 +45,6 @@
         <item name="suwScrollIndicators">top|bottom</item>
     </style>
 
-    <!-- Deprecated. Use SuwThemeGlifV2.Light instead -->
-    <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" />
-
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
     </style>
@@ -94,11 +88,10 @@
         <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
     </style>
 
-    <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription">
-        <item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item>
-    </style>
-
-    <style name="TextAppearance.SuwDescription.Secondary" parent="TextAppearance.SuwDescription">
+    <!-- Ignore UnusedResources: Used by clients -->
+    <style name="TextAppearance.SuwDescription.Secondary"
+        parent="TextAppearance.SuwDescription"
+        tools:ignore="UnusedResources">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
@@ -211,7 +204,10 @@
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item>
     </style>
 
-    <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" />
+    <!-- Ignore UnusedResources: used by clients -->
+    <style name="SuwGlifButton.Tertiary"
+        parent="SuwGlifButton.BaseTertiary"
+        tools:ignore="UnusedResources" />
 
     <!-- The start and end paddings are asymmetric because start buttons are borderless buttons
          which aligns the text label. -->
diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index f4bb8f5..cf9ddac 100644
--- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
@@ -79,24 +79,12 @@ public class WizardManagerHelper {
      */
     public static final String THEME_GLIF_V2 = "glif_v2";
 
-    /**
-     * @deprecated Use {@link #THEME_GLIF_V2} instead.
-     */
-    @Deprecated
-    public static final String THEME_GLIF_PIXEL = THEME_GLIF_V2;
-
     /**
      * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the default theme used in
      * setup wizard for O DR.
      */
     public static final String THEME_GLIF_V2_LIGHT = "glif_v2_light";
 
-    /**
-     * @deprecated Use {@link #THEME_GLIF_V2_LIGHT} instead.
-     */
-    @Deprecated
-    public static final String THEME_GLIF_PIXEL_LIGHT = THEME_GLIF_V2_LIGHT;
-
     /**
      * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the dark variant of the
      * theme used in setup wizard for P.
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index aaccd17..26ab230 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
         <item name="android:textColorLink">@color/suw_link_color_dark</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowDisablePreview">true</item>
@@ -65,7 +65,7 @@
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
         <item name="android:textColorLink">@color/suw_link_color_light</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowDisablePreview">true</item>
diff --git a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
index b509389..5912f7f 100644
--- a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
+++ b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
@@ -27,7 +27,6 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -38,7 +37,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class RecyclerViewScrollHandlingDelegateTest {
 
diff --git a/library/rules.gradle b/library/rules.gradle
index 6b0acce..f5face8 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -21,9 +21,12 @@ android {
             res.srcDirs = ['main/res']
         }
 
+        flavorDimensions 'compat'
+
         productFlavors {
             // Platform version that will not include the compatibility libraries
             platform {
+                dimension 'compat'
                 minSdkVersion 23
 
                 dependencies {
@@ -43,16 +46,17 @@ android {
                     //          deps = ['project-name': 'com.example.group:project-name:1.0.0']
                     //      }
                     //
-                    platformCompile deps['support-annotations']
+                    platformImplementation deps['support-annotations']
                 }
             }
 
             // Provides backwards compatibility for Gingerbread or above, using support libraries.
             gingerbreadCompat {
+                dimension 'compat'
                 minSdkVersion 9
                 dependencies {
-                    gingerbreadCompatCompile deps['support-appcompat-v7']
-                    gingerbreadCompatCompile deps['support-recyclerview-v7']
+                    gingerbreadCompatImplementation deps['support-appcompat-v7']
+                    gingerbreadCompatImplementation deps['support-recyclerview-v7']
                 }
             }
         }
diff --git a/library/self.gradle b/library/self.gradle
index 69f9654..a3e5334 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -13,12 +13,12 @@ android.sourceSets {
         res.srcDirs = ['test/instrumentation/res']
 
         dependencies {
-            androidTestCompile 'com.android.support.test:rules:0.5'
-            androidTestCompile 'com.android.support.test:runner:0.5'
-            androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-            androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-            androidTestCompile 'junit:junit:4.+'
-            androidTestCompile 'org.mockito:mockito-core:1.9.5'
+            androidTestImplementation 'com.android.support.test:rules:0.5'
+            androidTestImplementation 'com.android.support.test:runner:0.5'
+            androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+            androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+            androidTestImplementation 'junit:junit:4.+'
+            androidTestImplementation 'org.mockito:mockito-core:1.9.5'
         }
     }
 
@@ -38,12 +38,12 @@ android.sourceSets {
         java.srcDirs = ['test/robotest/src']
 
         dependencies {
-            testCompile 'org.robolectric:robolectric:3.4.2'
-            testCompile 'org.robolectric:framework:3.4.2'
-            testCompile 'junit:junit:4.+'
-            testCompile 'org.mockito:mockito-core:1.9.5'
+            testImplementation 'org.robolectric:robolectric:3.4.2'
+            testImplementation 'org.robolectric:framework:3.4.2'
+            testImplementation 'junit:junit:4.+'
+            testImplementation 'org.mockito:mockito-core:1.9.5'
             // Workaround for https://github.com/robolectric/robolectric/issues/2566
-            testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+            testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
         }
     }
 
@@ -51,6 +51,9 @@ android.sourceSets {
         java.srcDirs = ['gingerbread/test/robotest/src', 'recyclerview/test/robotest/src']
     }
 }
+
+android.testOptions.unitTests.includeAndroidResources = true
+
 android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 android.lintOptions {
     abortOnError true
diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
index 967a52e..360dfe2 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
@@ -54,7 +54,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class GlifLayoutTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java b/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
index 93b9a6d..40e5da8 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
@@ -39,7 +39,6 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.items.ButtonItem.OnClickListener;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
@@ -50,9 +49,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(
-        constants = BuildConfig.class,
-        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ButtonItemTest {
 
     private ViewGroup mParent;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java b/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
index a61b750..ecaec71 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -36,9 +35,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(
-        constants = BuildConfig.class,
-        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ItemGroupTest {
 
     private static final Item CHILD_1 = new EqualsItem("Child 1");
diff --git a/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java b/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java
deleted file mode 100644
index 64c63e7..0000000
--- a/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2017 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.
- */
-
-package com.android.setupwizardlib.robolectric;
-
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.GradleManifestFactory;
-import org.robolectric.internal.ManifestIdentifier;
-import org.robolectric.res.FileFsFile;
-import org.robolectric.util.Logger;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.io.File;
-import java.net.URL;
-
-/**
- * Modified GradleManifestFactory to patch an issue where some build variants have merged
- * resources under res/merged/variant/type while others have it under bundles/variant/type/res.
- *
- * The change is that in the .exists() checks below we check for specific folders for the build
- * variant rather than checking existence at the parent directory.
- */
-class PatchedGradleManifestFactory extends GradleManifestFactory {
-
-    @Override
-    public ManifestIdentifier identify(Config config) {
-        if (config.constants() == Void.class) {
-            Logger.error("Field 'constants' not specified in @Config annotation");
-            Logger.error("This is required when using Robolectric with Gradle!");
-            throw new RuntimeException("No 'constants' field in @Config annotation!");
-        }
-
-        final String buildOutputDir = getBuildOutputDir(config);
-        final String type = getType(config);
-        final String flavor = getFlavor(config);
-        final String abiSplit = getAbiSplit(config);
-        final String packageName = config.packageName().isEmpty()
-                ? config.constants().getPackage().getName()
-                : config.packageName();
-
-        final FileFsFile res;
-        final FileFsFile assets;
-        final FileFsFile manifest;
-
-        if (FileFsFile.from(buildOutputDir, "data-binding-layout-out", flavor, type).exists()) {
-            // Android gradle plugin 1.5.0+ puts the merged layouts in data-binding-layout-out.
-            // https://github.com/robolectric/robolectric/issues/2143
-            res = FileFsFile.from(buildOutputDir, "data-binding-layout-out", flavor, type);
-        } else if (FileFsFile.from(buildOutputDir, "res", "merged", flavor, type).exists()) {
-            // res/merged added in Android Gradle plugin 1.3-beta1
-            res = FileFsFile.from(buildOutputDir, "res", "merged", flavor, type);
-        } else if (FileFsFile.from(buildOutputDir, "res", flavor, type).exists()) {
-            res = FileFsFile.from(buildOutputDir, "res", flavor, type);
-        } else {
-            res = FileFsFile.from(buildOutputDir, "bundles", flavor, type, "res");
-        }
-
-        if (FileFsFile.from(buildOutputDir, "assets", flavor, type).exists()) {
-            assets = FileFsFile.from(buildOutputDir, "assets", flavor, type);
-        } else {
-            assets = FileFsFile.from(buildOutputDir, "bundles", flavor, type, "assets");
-        }
-
-        String manifestName = config.manifest();
-        URL manifestUrl = getClass().getClassLoader().getResource(manifestName);
-        if (manifestUrl != null && manifestUrl.getProtocol().equals("file")) {
-            manifest = FileFsFile.from(manifestUrl.getPath());
-        } else if (FileFsFile.from(buildOutputDir, "manifests", "full", flavor, abiSplit, type,
-                manifestName).exists()) {
-            manifest = FileFsFile.from(
-                    buildOutputDir, "manifests", "full", flavor, abiSplit, type, manifestName);
-        } else if (FileFsFile.from(buildOutputDir, "manifests", "aapt", flavor, abiSplit, type,
-                manifestName).exists()) {
-            // Android gradle plugin 2.2.0+ can put library manifest files inside of "aapt"
-            // instead of "full"
-            manifest = FileFsFile.from(buildOutputDir, "manifests", "aapt", flavor, abiSplit,
-                    type, manifestName);
-        } else {
-            manifest = FileFsFile.from(buildOutputDir, "bundles", flavor, abiSplit, type,
-                    manifestName);
-        }
-
-        return new ManifestIdentifier(manifest, res, assets, packageName, null);
-    }
-
-    private static String getBuildOutputDir(Config config) {
-        return config.buildDir() + File.separator + "intermediates";
-    }
-
-    private static String getType(Config config) {
-        try {
-            return ReflectionHelpers.getStaticField(config.constants(), "BUILD_TYPE");
-        } catch (Throwable e) {
-            return null;
-        }
-    }
-
-    private static String getFlavor(Config config) {
-        try {
-            return ReflectionHelpers.getStaticField(config.constants(), "FLAVOR");
-        } catch (Throwable e) {
-            return null;
-        }
-    }
-
-    private static String getAbiSplit(Config config) {
-        try {
-            return config.abiSplit();
-        } catch (Throwable e) {
-            return null;
-        }
-    }
-}
diff --git a/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java b/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
index 509201a..61baa23 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
@@ -20,42 +20,13 @@ import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.ManifestFactory;
 
 public class SuwLibRobolectricTestRunner extends RobolectricTestRunner {
 
-    private String mModuleRootPath;
-
     public SuwLibRobolectricTestRunner(Class<?> testClass) throws InitializationError {
         super(testClass);
     }
 
-    // Hack to determine the module root path in the build folder (e.g. out/gradle/setup-wizard-lib)
-    private void updateModuleRootPath(Config config) {
-        String moduleRoot = config.constants().getResource("").toString()
-                .replace("file:", "").replace("jar:", "");
-        mModuleRootPath =
-                moduleRoot.substring(0, moduleRoot.lastIndexOf("/build")) + "/setup-wizard-lib";
-    }
-
-    /**
-     * Return the default config used to run Robolectric tests.
-     */
-    @Override
-    protected Config buildGlobalConfig() {
-        Config parent = super.buildGlobalConfig();
-        updateModuleRootPath(parent);
-        return new Config.Builder(parent)
-                .setBuildDir(mModuleRootPath + "/build")
-                .build();
-    }
-
-    @Override
-    protected ManifestFactory getManifestFactory(Config config) {
-        return new PatchedGradleManifestFactory();
-    }
-
     @Override
     protected void runChild(FrameworkMethod method, RunNotifier notifier) {
         System.out.println("===== Running " + method + " =====");
diff --git a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
index f86e057..fe72e03 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
@@ -23,15 +23,12 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
 public class LinkSpanTest {
 
     @Test
@@ -68,6 +65,7 @@ public class LinkSpanTest {
         assertSame("Clicked LinkSpan should be passed to setup", linkSpan, context.clickedSpan);
     }
 
+    @SuppressWarnings("deprecation")
     private static class TestContext extends ContextWrapper implements LinkSpan.OnClickListener {
 
         public LinkSpan clickedSpan = null;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
index fa81dc0..ec3622d 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
@@ -31,7 +31,6 @@ import android.widget.AbsListView.OnScrollListener;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -42,7 +41,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class ListViewScrollHandlingDelegateTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
index 8e39c43..c641449 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
@@ -34,7 +34,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.template.RequireScrollMixin.OnRequireScrollStateChangedListener;
@@ -48,7 +47,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class RequireScrollMixinTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
index f77e256..429445c 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.RuntimeEnvironment.application;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.view.BottomScrollView;
 import com.android.setupwizardlib.view.BottomScrollView.BottomScrollListener;
@@ -36,7 +35,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class ScrollViewScrollHandlingDelegateTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
index 2be64e1..c10c122 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
@@ -26,7 +26,6 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -36,7 +35,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS)
+@Config(sdk = Config.ALL_SDKS)
 public class GlifDimensionTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index aea2c03..3627806 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -30,7 +30,6 @@ import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -41,7 +40,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
+@Config(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class GlifStyleTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
index aeb678f..683e40b 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
@@ -37,7 +37,6 @@ import android.content.res.Resources;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.util.Partner.ResourceEntry;
@@ -57,7 +56,6 @@ import java.util.Collections;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(
-        constants = BuildConfig.class,
         sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK },
         shadows = ShadowApplicationPackageManager.class)
 public class PartnerTest {
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
index 9195de2..0d15ef4 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
@@ -31,7 +31,6 @@ import android.provider.Settings.Global;
 import android.provider.Settings.Secure;
 import android.support.annotation.StyleRes;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -44,7 +43,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = Config.NEWEST_SDK)
+@Config(sdk = Config.NEWEST_SDK)
 public class WizardManagerHelperTest {
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
index f1332c0..ae4f3d1 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
@@ -22,7 +22,6 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.view.View;
 import android.view.View.MeasureSpec;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Test;
@@ -31,7 +30,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
+@Config(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class FillContentLayoutTest {
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
index ddf59ca..6db8852 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
@@ -31,7 +31,6 @@ import android.os.Build.VERSION_CODES;
 import android.support.annotation.RawRes;
 import android.view.Surface;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.view.IllustrationVideoViewTest.ShadowMockMediaPlayer;
@@ -54,7 +53,6 @@ import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(
-        constants = BuildConfig.class,
         sdk = Config.NEWEST_SDK,
         shadows = {
                 ShadowMockMediaPlayer.class,
diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties
index b4a1e0c..3795eee 100644
--- a/tools/gradle/android.properties
+++ b/tools/gradle/android.properties
@@ -1,6 +1,6 @@
 // Set the default SDK and build tools version for all apps
-compileSdkVersion 26
-buildToolsVersion = '26.0.0'
+compileSdkVersion 27
+buildToolsVersion = '27.0.0'
 
 // enable Java7
 compileOptions.sourceCompatibility JavaVersion.VERSION_1_7

From 652b5baba3bc94a2e08f8ffba85d2719f62edf6f Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Thu, 7 Dec 2017 13:28:52 -0800
Subject: [PATCH 30/75] Change SUW footer height

- Changed the height of footer to 72dp from 80dp
bug: 69930241
Test: Manually tested and verified the height of footer

Change-Id: I1e434d5d15b68e095b5baf8687d1cc1a7ec313fe
---
 library/main/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index f29484a..5978a4e 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -26,7 +26,7 @@
     <dimen name="suw_glif_button_margin_start">8dp</dimen>
     <dimen name="suw_glif_button_padding">16dp</dimen>
     <dimen name="suw_glif_footer_padding_vertical">8dp</dimen>
-    <dimen name="suw_glif_footer_min_height">80dp</dimen>
+    <dimen name="suw_glif_footer_min_height">72dp</dimen>
     <dimen name="suw_glif_margin_sides">24dp</dimen>
     <dimen name="suw_glif_margin_top">48dp</dimen>
 

From ceea5ff728985c6a43c7c6de61ed2b7f530db483 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 5 Dec 2017 12:36:57 -0800
Subject: [PATCH 31/75] Implement new XL Progress bar

For screens without much content, the new style is to use an extra
large progress bar (same size as illustration).

Bug: 63074068
Test: ./gradlew test
Change-Id: If139e8eeb555cc684ce43a91524ad2da00b7dc93
---
 library/gingerbread/res/values/styles.xml     |   7 +
 .../suw_fourcolor_progress_bar.xml            | 194 ++++++++++++++++++
 .../res/layout/suw_glif_loading_screen.xml    |  40 ++++
 library/main/res/values-v11/styles.xml        |  22 ++
 library/main/res/values-v21/styles.xml        |  10 +
 .../setupwizardlib/util/GlifStyleTest.java    |  11 +
 6 files changed, 284 insertions(+)
 create mode 100644 library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
 create mode 100644 library/main/res/layout/suw_glif_loading_screen.xml
 create mode 100644 library/main/res/values-v11/styles.xml

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index b510f75..1653938 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -246,6 +246,13 @@
         <item name="android:background">?attr/colorPrimary</item>
     </style>
 
+    <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" />
+
+    <style name="SuwGmIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:indeterminate">true</item>
+    </style>
+
     <!-- Navigation bar styles -->
 
     <style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Button">
diff --git a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
new file mode 100644
index 0000000..2ac35ee
--- /dev/null
+++ b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+
+
+<!-- Asset for 4 color indeterminate progress bar, which is a ring with 4 shades of blue -->
+<animated-vector xmlns:aapt="http://schemas.android.com/aapt"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingPrefix">
+    <!-- Ignore MissingPrefix: aapt:attr tags take the name attribute without "android:" prefix -->
+    <!-- TODO(yukl): Update to a newer version of lint which properly handles this case -->
+    <aapt:attr name="android:drawable">
+        <vector android:width="823dp" android:height="823dp" android:viewportHeight="823"
+            android:viewportWidth="823">
+            <group android:name="blue1" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue1_path"
+                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#4688f1"
+                    android:strokeLineCap="round" android:strokeLineJoin="round"
+                    android:strokeWidth="27" />
+            </group>
+            <group android:name="blue2" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue2_path"
+                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#7dacf4"
+                    android:strokeLineCap="round" android:strokeLineJoin="round"
+                    android:strokeWidth="28" />
+            </group>
+            <group android:name="blue3" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue3_path"
+                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#c7dbfb"
+                    android:strokeLineCap="round" android:strokeLineJoin="round"
+                    android:strokeWidth="29" />
+            </group>
+            <group android:name="blue4" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue4_path"
+                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#e8f0fd"
+                    android:strokeLineCap="round" android:strokeLineJoin="round"
+                    android:strokeWidth="30" />
+            </group>
+        </vector>
+    </aapt:attr>
+    <target android:name="blue1_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 l.21,0 c.571,0 .194,.755 .79,1" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue1_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.606,0.315 0.2,1 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue1">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="rotation"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.829,0.228 0.2,0.915 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue2_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 l.21,0 c.571,0 .145,.831 .79,1" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue2_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.606,0.315 0.2,1 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue2">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="rotation"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.792,0.233 0.2,0.915 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue3_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 l.21,0 c.6138,0 .007,.883 .79,1" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue3_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.606,0.315 0.2,1 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue3">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:duration="1983" android:propertyName="rotation"
+                    android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M0,0 c0.762,0.225 0.2,0.915 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="blue4_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 l.21,0 c.572,0 0,1 .79,1" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue4_path">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.606,0.315 0.2,1 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+    <target android:name="blue4">
+        <aapt:attr name="android:animation">
+            <objectAnimator android:duration="1983" android:propertyName="rotation"
+                android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
+                android:valueType="floatType">
+                <aapt:attr name="android:interpolator">
+                    <pathInterpolator android:pathData="M0,0 c0.606,0.172 0.2,0.915 1.0,1.0" />
+                </aapt:attr>
+            </objectAnimator>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/library/main/res/layout/suw_glif_loading_screen.xml b/library/main/res/layout/suw_glif_loading_screen.xml
new file mode 100644
index 0000000..ecf932e
--- /dev/null
+++ b/library/main/res/layout/suw_glif_loading_screen.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="UnusedResources">
+    <!-- Ignore UnusedResources: can be used by clients -->
+
+    <com.android.setupwizardlib.view.FillContentLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <ProgressBar
+            android:id="@+id/suw_large_progress_bar"
+            style="@style/SuwGmIndeterminateProgressBar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.android.setupwizardlib.view.FillContentLayout>
+
+</com.android.setupwizardlib.GlifLayout>
diff --git a/library/main/res/values-v11/styles.xml b/library/main/res/values-v11/styles.xml
new file mode 100644
index 0000000..6903577
--- /dev/null
+++ b/library/main/res/values-v11/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+
+<resources>
+
+    <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Holo.ProgressBar.Large" />
+
+</resources>
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index ab6f887..6e4c0dd 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -42,6 +42,16 @@
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
+    <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" />
+
+    <style name="SuwGmIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:indeterminate">true</item>
+        <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item>
+        <item name="android:indeterminateTint">@null</item>
+        <item name="android:indeterminateTintMode">@null</item>
+    </style>
+
     <!-- Items styles -->
 
     <style name="SuwItemContainer">
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index aea2c03..b6ced57 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -18,6 +18,7 @@ package com.android.setupwizardlib.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.annotation.TargetApi;
@@ -29,6 +30,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
+import android.widget.ProgressBar;
 
 import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
@@ -76,6 +78,15 @@ public class GlifStyleTest {
         assertEquals(0x00000000, activity.getWindow().getStatusBarColor());
     }
 
+    @Test
+    public void glifLoadingScreen_shouldHaveProgressBar() {
+        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+        activity.setContentView(R.layout.suw_glif_loading_screen);
+
+        assertTrue("Progress bar should exist",
+                activity.findViewById(R.id.suw_large_progress_bar) instanceof ProgressBar);
+    }
+
     private static class GlifThemeActivity extends Activity {
 
         @Override

From 46216d0e61318e7af168e9e903ef8d943bb49b2e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 13 Dec 2017 02:48:52 +0000
Subject: [PATCH 32/75] Revert "Changes needed to upgrade to new gradle
 version"

This reverts commit ba1332d1b4dd525a2ef313246482708cb2016052.

Reason for revert: Broke taimen builds in master

Change-Id: Iffffadbacae8c6c69907dcecc447f958cf6ce909
---
 .../view/NavigationBarButton.java             |   2 -
 .../items/ExpandableSwitchItemTest.java       |   3 +-
 .../setupwizardlib/items/SwitchItemTest.java  |   3 +-
 .../util/DimensionConsistencyTest.java        |   3 +-
 library/lint.xml                              |   4 -
 library/main/res/values/styles.xml            |  20 +--
 .../util/WizardManagerHelper.java             |  12 ++
 library/platform/res/values-v23/styles.xml    |   4 +-
 ...ecyclerViewScrollHandlingDelegateTest.java |   3 +-
 library/rules.gradle                          |  10 +-
 library/self.gradle                           |  25 ++--
 .../setupwizardlib/GlifLayoutTest.java        |   2 +-
 .../setupwizardlib/items/ButtonItemTest.java  |   5 +-
 .../setupwizardlib/items/ItemGroupTest.java   |   5 +-
 .../PatchedGradleManifestFactory.java         | 126 ++++++++++++++++++
 .../SuwLibRobolectricTestRunner.java          |  29 ++++
 .../setupwizardlib/span/LinkSpanTest.java     |   4 +-
 .../ListViewScrollHandlingDelegateTest.java   |   3 +-
 .../template/RequireScrollMixinTest.java      |   3 +-
 .../ScrollViewScrollHandlingDelegateTest.java |   3 +-
 .../util/GlifDimensionTest.java               |   3 +-
 .../setupwizardlib/util/GlifStyleTest.java    |   3 +-
 .../setupwizardlib/util/PartnerTest.java      |   2 +
 .../util/WizardManagerHelperTest.java         |   3 +-
 .../view/FillContentLayoutTest.java           |   3 +-
 .../view/IllustrationVideoViewTest.java       |   2 +
 tools/gradle/android.properties               |   4 +-
 27 files changed, 235 insertions(+), 54 deletions(-)
 create mode 100644 library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
index d7a3c2e..5172c47 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
@@ -16,7 +16,6 @@
 
 package com.android.setupwizardlib.view;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
@@ -31,7 +30,6 @@ import android.widget.Button;
  * Button for navigation bar, which includes tinting of its compound drawables to be used for dark
  * and light themes.
  */
-@SuppressLint("AppCompatCustomView")
 public class NavigationBarButton extends Button {
 
     public NavigationBarButton(Context context) {
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
index 3020ed3..4fb3e28 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
@@ -32,6 +32,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -43,7 +44,7 @@ import org.robolectric.annotation.Config;
 import java.util.ArrayList;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ExpandableSwitchItemTest {
 
     private TextView mSummaryView;
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
index fa5bbba..d391d80 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
@@ -31,6 +31,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -39,7 +40,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class SwitchItemTest {
 
     private SwitchCompat mSwitch;
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
index 7a08235..43e7f03 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
@@ -25,6 +25,7 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -34,7 +35,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = Config.ALL_SDKS)
+@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS)
 public class DimensionConsistencyTest {
 
     // Visual height of the framework switch widget
diff --git a/library/lint.xml b/library/lint.xml
index 625b20d..ca22c65 100644
--- a/library/lint.xml
+++ b/library/lint.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <!-- SUW lib prefixes styleable resources -->
-    <issue id="CustomViewStyleable" severity="ignore" />
     <issue id="ExtraTranslation" severity="ignore" />
     <issue id="GradleDependency" severity="ignore" />
     <issue id="MissingTranslation" severity="ignore" />
-    <!-- Stop lint from complaining about SDK version checks in the "platform" variant -->
-    <issue id="ObsoleteSdkInt" severity="ignore" />
     <issue id="RtlEnabled" severity="ignore" />
 </lint>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index e1e229f..0e7685b 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -32,6 +32,9 @@
         <item name="suwScrollIndicators">top|bottom</item>
     </style>
 
+    <!-- Deprecated. Use SuwThemeGlifV2 instead -->
+    <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" />
+
     <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
         <item name="android:colorBackground">@color/suw_glif_background_color_light</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
@@ -45,6 +48,9 @@
         <item name="suwScrollIndicators">top|bottom</item>
     </style>
 
+    <!-- Deprecated. Use SuwThemeGlifV2.Light instead -->
+    <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" />
+
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
     </style>
@@ -88,10 +94,11 @@
         <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
     </style>
 
-    <!-- Ignore UnusedResources: Used by clients -->
-    <style name="TextAppearance.SuwDescription.Secondary"
-        parent="TextAppearance.SuwDescription"
-        tools:ignore="UnusedResources">
+    <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription">
+        <item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item>
+    </style>
+
+    <style name="TextAppearance.SuwDescription.Secondary" parent="TextAppearance.SuwDescription">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
@@ -204,10 +211,7 @@
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item>
     </style>
 
-    <!-- Ignore UnusedResources: used by clients -->
-    <style name="SuwGlifButton.Tertiary"
-        parent="SuwGlifButton.BaseTertiary"
-        tools:ignore="UnusedResources" />
+    <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" />
 
     <!-- The start and end paddings are asymmetric because start buttons are borderless buttons
          which aligns the text label. -->
diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index cf9ddac..f4bb8f5 100644
--- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
@@ -79,12 +79,24 @@ public class WizardManagerHelper {
      */
     public static final String THEME_GLIF_V2 = "glif_v2";
 
+    /**
+     * @deprecated Use {@link #THEME_GLIF_V2} instead.
+     */
+    @Deprecated
+    public static final String THEME_GLIF_PIXEL = THEME_GLIF_V2;
+
     /**
      * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the default theme used in
      * setup wizard for O DR.
      */
     public static final String THEME_GLIF_V2_LIGHT = "glif_v2_light";
 
+    /**
+     * @deprecated Use {@link #THEME_GLIF_V2_LIGHT} instead.
+     */
+    @Deprecated
+    public static final String THEME_GLIF_PIXEL_LIGHT = THEME_GLIF_V2_LIGHT;
+
     /**
      * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the dark variant of the
      * theme used in setup wizard for P.
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 26ab230..aaccd17 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
+        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
         <item name="android:textColorLink">@color/suw_link_color_dark</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowDisablePreview">true</item>
@@ -65,7 +65,7 @@
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
+        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
         <item name="android:textColorLink">@color/suw_link_color_light</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowDisablePreview">true</item>
diff --git a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
index 5912f7f..b509389 100644
--- a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
+++ b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
@@ -27,6 +27,7 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -37,7 +38,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class RecyclerViewScrollHandlingDelegateTest {
 
diff --git a/library/rules.gradle b/library/rules.gradle
index f5face8..6b0acce 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -21,12 +21,9 @@ android {
             res.srcDirs = ['main/res']
         }
 
-        flavorDimensions 'compat'
-
         productFlavors {
             // Platform version that will not include the compatibility libraries
             platform {
-                dimension 'compat'
                 minSdkVersion 23
 
                 dependencies {
@@ -46,17 +43,16 @@ android {
                     //          deps = ['project-name': 'com.example.group:project-name:1.0.0']
                     //      }
                     //
-                    platformImplementation deps['support-annotations']
+                    platformCompile deps['support-annotations']
                 }
             }
 
             // Provides backwards compatibility for Gingerbread or above, using support libraries.
             gingerbreadCompat {
-                dimension 'compat'
                 minSdkVersion 9
                 dependencies {
-                    gingerbreadCompatImplementation deps['support-appcompat-v7']
-                    gingerbreadCompatImplementation deps['support-recyclerview-v7']
+                    gingerbreadCompatCompile deps['support-appcompat-v7']
+                    gingerbreadCompatCompile deps['support-recyclerview-v7']
                 }
             }
         }
diff --git a/library/self.gradle b/library/self.gradle
index a3e5334..69f9654 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -13,12 +13,12 @@ android.sourceSets {
         res.srcDirs = ['test/instrumentation/res']
 
         dependencies {
-            androidTestImplementation 'com.android.support.test:rules:0.5'
-            androidTestImplementation 'com.android.support.test:runner:0.5'
-            androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-            androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-            androidTestImplementation 'junit:junit:4.+'
-            androidTestImplementation 'org.mockito:mockito-core:1.9.5'
+            androidTestCompile 'com.android.support.test:rules:0.5'
+            androidTestCompile 'com.android.support.test:runner:0.5'
+            androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
+            androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
+            androidTestCompile 'junit:junit:4.+'
+            androidTestCompile 'org.mockito:mockito-core:1.9.5'
         }
     }
 
@@ -38,12 +38,12 @@ android.sourceSets {
         java.srcDirs = ['test/robotest/src']
 
         dependencies {
-            testImplementation 'org.robolectric:robolectric:3.4.2'
-            testImplementation 'org.robolectric:framework:3.4.2'
-            testImplementation 'junit:junit:4.+'
-            testImplementation 'org.mockito:mockito-core:1.9.5'
+            testCompile 'org.robolectric:robolectric:3.4.2'
+            testCompile 'org.robolectric:framework:3.4.2'
+            testCompile 'junit:junit:4.+'
+            testCompile 'org.mockito:mockito-core:1.9.5'
             // Workaround for https://github.com/robolectric/robolectric/issues/2566
-            testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+            testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
         }
     }
 
@@ -51,9 +51,6 @@ android.sourceSets {
         java.srcDirs = ['gingerbread/test/robotest/src', 'recyclerview/test/robotest/src']
     }
 }
-
-android.testOptions.unitTests.includeAndroidResources = true
-
 android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 android.lintOptions {
     abortOnError true
diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
index 360dfe2..967a52e 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
@@ -54,7 +54,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class GlifLayoutTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java b/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
index 40e5da8..93b9a6d 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
@@ -39,6 +39,7 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.items.ButtonItem.OnClickListener;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
@@ -49,7 +50,9 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(
+        constants = BuildConfig.class,
+        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ButtonItemTest {
 
     private ViewGroup mParent;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java b/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
index ecaec71..a61b750 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -35,7 +36,9 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(
+        constants = BuildConfig.class,
+        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ItemGroupTest {
 
     private static final Item CHILD_1 = new EqualsItem("Child 1");
diff --git a/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java b/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java
new file mode 100644
index 0000000..64c63e7
--- /dev/null
+++ b/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+package com.android.setupwizardlib.robolectric;
+
+import org.robolectric.annotation.Config;
+import org.robolectric.internal.GradleManifestFactory;
+import org.robolectric.internal.ManifestIdentifier;
+import org.robolectric.res.FileFsFile;
+import org.robolectric.util.Logger;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.io.File;
+import java.net.URL;
+
+/**
+ * Modified GradleManifestFactory to patch an issue where some build variants have merged
+ * resources under res/merged/variant/type while others have it under bundles/variant/type/res.
+ *
+ * The change is that in the .exists() checks below we check for specific folders for the build
+ * variant rather than checking existence at the parent directory.
+ */
+class PatchedGradleManifestFactory extends GradleManifestFactory {
+
+    @Override
+    public ManifestIdentifier identify(Config config) {
+        if (config.constants() == Void.class) {
+            Logger.error("Field 'constants' not specified in @Config annotation");
+            Logger.error("This is required when using Robolectric with Gradle!");
+            throw new RuntimeException("No 'constants' field in @Config annotation!");
+        }
+
+        final String buildOutputDir = getBuildOutputDir(config);
+        final String type = getType(config);
+        final String flavor = getFlavor(config);
+        final String abiSplit = getAbiSplit(config);
+        final String packageName = config.packageName().isEmpty()
+                ? config.constants().getPackage().getName()
+                : config.packageName();
+
+        final FileFsFile res;
+        final FileFsFile assets;
+        final FileFsFile manifest;
+
+        if (FileFsFile.from(buildOutputDir, "data-binding-layout-out", flavor, type).exists()) {
+            // Android gradle plugin 1.5.0+ puts the merged layouts in data-binding-layout-out.
+            // https://github.com/robolectric/robolectric/issues/2143
+            res = FileFsFile.from(buildOutputDir, "data-binding-layout-out", flavor, type);
+        } else if (FileFsFile.from(buildOutputDir, "res", "merged", flavor, type).exists()) {
+            // res/merged added in Android Gradle plugin 1.3-beta1
+            res = FileFsFile.from(buildOutputDir, "res", "merged", flavor, type);
+        } else if (FileFsFile.from(buildOutputDir, "res", flavor, type).exists()) {
+            res = FileFsFile.from(buildOutputDir, "res", flavor, type);
+        } else {
+            res = FileFsFile.from(buildOutputDir, "bundles", flavor, type, "res");
+        }
+
+        if (FileFsFile.from(buildOutputDir, "assets", flavor, type).exists()) {
+            assets = FileFsFile.from(buildOutputDir, "assets", flavor, type);
+        } else {
+            assets = FileFsFile.from(buildOutputDir, "bundles", flavor, type, "assets");
+        }
+
+        String manifestName = config.manifest();
+        URL manifestUrl = getClass().getClassLoader().getResource(manifestName);
+        if (manifestUrl != null && manifestUrl.getProtocol().equals("file")) {
+            manifest = FileFsFile.from(manifestUrl.getPath());
+        } else if (FileFsFile.from(buildOutputDir, "manifests", "full", flavor, abiSplit, type,
+                manifestName).exists()) {
+            manifest = FileFsFile.from(
+                    buildOutputDir, "manifests", "full", flavor, abiSplit, type, manifestName);
+        } else if (FileFsFile.from(buildOutputDir, "manifests", "aapt", flavor, abiSplit, type,
+                manifestName).exists()) {
+            // Android gradle plugin 2.2.0+ can put library manifest files inside of "aapt"
+            // instead of "full"
+            manifest = FileFsFile.from(buildOutputDir, "manifests", "aapt", flavor, abiSplit,
+                    type, manifestName);
+        } else {
+            manifest = FileFsFile.from(buildOutputDir, "bundles", flavor, abiSplit, type,
+                    manifestName);
+        }
+
+        return new ManifestIdentifier(manifest, res, assets, packageName, null);
+    }
+
+    private static String getBuildOutputDir(Config config) {
+        return config.buildDir() + File.separator + "intermediates";
+    }
+
+    private static String getType(Config config) {
+        try {
+            return ReflectionHelpers.getStaticField(config.constants(), "BUILD_TYPE");
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static String getFlavor(Config config) {
+        try {
+            return ReflectionHelpers.getStaticField(config.constants(), "FLAVOR");
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static String getAbiSplit(Config config) {
+        try {
+            return config.abiSplit();
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+}
diff --git a/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java b/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
index 61baa23..509201a 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
@@ -20,13 +20,42 @@ import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.internal.ManifestFactory;
 
 public class SuwLibRobolectricTestRunner extends RobolectricTestRunner {
 
+    private String mModuleRootPath;
+
     public SuwLibRobolectricTestRunner(Class<?> testClass) throws InitializationError {
         super(testClass);
     }
 
+    // Hack to determine the module root path in the build folder (e.g. out/gradle/setup-wizard-lib)
+    private void updateModuleRootPath(Config config) {
+        String moduleRoot = config.constants().getResource("").toString()
+                .replace("file:", "").replace("jar:", "");
+        mModuleRootPath =
+                moduleRoot.substring(0, moduleRoot.lastIndexOf("/build")) + "/setup-wizard-lib";
+    }
+
+    /**
+     * Return the default config used to run Robolectric tests.
+     */
+    @Override
+    protected Config buildGlobalConfig() {
+        Config parent = super.buildGlobalConfig();
+        updateModuleRootPath(parent);
+        return new Config.Builder(parent)
+                .setBuildDir(mModuleRootPath + "/build")
+                .build();
+    }
+
+    @Override
+    protected ManifestFactory getManifestFactory(Config config) {
+        return new PatchedGradleManifestFactory();
+    }
+
     @Override
     protected void runChild(FrameworkMethod method, RunNotifier notifier) {
         System.out.println("===== Running " + method + " =====");
diff --git a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
index fe72e03..f86e057 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
@@ -23,12 +23,15 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.widget.TextView;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
+@Config(constants = BuildConfig.class)
 public class LinkSpanTest {
 
     @Test
@@ -65,7 +68,6 @@ public class LinkSpanTest {
         assertSame("Clicked LinkSpan should be passed to setup", linkSpan, context.clickedSpan);
     }
 
-    @SuppressWarnings("deprecation")
     private static class TestContext extends ContextWrapper implements LinkSpan.OnClickListener {
 
         public LinkSpan clickedSpan = null;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
index ec3622d..fa81dc0 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
@@ -31,6 +31,7 @@ import android.widget.AbsListView.OnScrollListener;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -41,7 +42,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class ListViewScrollHandlingDelegateTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
index c641449..8e39c43 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
@@ -34,6 +34,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.template.RequireScrollMixin.OnRequireScrollStateChangedListener;
@@ -47,7 +48,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class RequireScrollMixinTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
index 429445c..f77e256 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.RuntimeEnvironment.application;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.view.BottomScrollView;
 import com.android.setupwizardlib.view.BottomScrollView.BottomScrollListener;
@@ -35,7 +36,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class ScrollViewScrollHandlingDelegateTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
index c10c122..2be64e1 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
@@ -26,6 +26,7 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -35,7 +36,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = Config.ALL_SDKS)
+@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS)
 public class GlifDimensionTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index 3627806..aea2c03 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -30,6 +30,7 @@ import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -40,7 +41,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
+@Config(constants = BuildConfig.class, sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class GlifStyleTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
index 683e40b..aeb678f 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
@@ -37,6 +37,7 @@ import android.content.res.Resources;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.util.Partner.ResourceEntry;
@@ -56,6 +57,7 @@ import java.util.Collections;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(
+        constants = BuildConfig.class,
         sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK },
         shadows = ShadowApplicationPackageManager.class)
 public class PartnerTest {
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
index 0d15ef4..9195de2 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
@@ -31,6 +31,7 @@ import android.provider.Settings.Global;
 import android.provider.Settings.Secure;
 import android.support.annotation.StyleRes;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -43,7 +44,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = Config.NEWEST_SDK)
+@Config(constants = BuildConfig.class, sdk = Config.NEWEST_SDK)
 public class WizardManagerHelperTest {
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
index ae4f3d1..f1332c0 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
@@ -22,6 +22,7 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.view.View;
 import android.view.View.MeasureSpec;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Test;
@@ -30,7 +31,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
+@Config(constants = BuildConfig.class, sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class FillContentLayoutTest {
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
index 6db8852..ddf59ca 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
@@ -31,6 +31,7 @@ import android.os.Build.VERSION_CODES;
 import android.support.annotation.RawRes;
 import android.view.Surface;
 
+import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.view.IllustrationVideoViewTest.ShadowMockMediaPlayer;
@@ -53,6 +54,7 @@ import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(
+        constants = BuildConfig.class,
         sdk = Config.NEWEST_SDK,
         shadows = {
                 ShadowMockMediaPlayer.class,
diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties
index 3795eee..b4a1e0c 100644
--- a/tools/gradle/android.properties
+++ b/tools/gradle/android.properties
@@ -1,6 +1,6 @@
 // Set the default SDK and build tools version for all apps
-compileSdkVersion 27
-buildToolsVersion = '27.0.0'
+compileSdkVersion 26
+buildToolsVersion = '26.0.0'
 
 // enable Java7
 compileOptions.sourceCompatibility JavaVersion.VERSION_1_7

From 66815fe66392bcbb12e2fc93bbf326a5c2d8782f Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 13 Dec 2017 02:51:32 +0000
Subject: [PATCH 33/75] Revert "Revert "Changes needed to upgrade to new gradle
 version""

This reverts commit 46216d0e61318e7af168e9e903ef8d943bb49b2e.

Reason for revert: Roll forward
- Added ag/3351790 to the topic

Change-Id: I64990e558d3f77165ab3fe89006a02225b712257
---
 .../view/NavigationBarButton.java             |   2 +
 .../items/ExpandableSwitchItemTest.java       |   3 +-
 .../setupwizardlib/items/SwitchItemTest.java  |   3 +-
 .../util/DimensionConsistencyTest.java        |   3 +-
 library/lint.xml                              |   4 +
 library/main/res/values/styles.xml            |  20 ++-
 .../util/WizardManagerHelper.java             |  12 --
 library/platform/res/values-v23/styles.xml    |   4 +-
 ...ecyclerViewScrollHandlingDelegateTest.java |   3 +-
 library/rules.gradle                          |  10 +-
 library/self.gradle                           |  25 ++--
 .../setupwizardlib/GlifLayoutTest.java        |   2 +-
 .../setupwizardlib/items/ButtonItemTest.java  |   5 +-
 .../setupwizardlib/items/ItemGroupTest.java   |   5 +-
 .../PatchedGradleManifestFactory.java         | 126 ------------------
 .../SuwLibRobolectricTestRunner.java          |  29 ----
 .../setupwizardlib/span/LinkSpanTest.java     |   4 +-
 .../ListViewScrollHandlingDelegateTest.java   |   3 +-
 .../template/RequireScrollMixinTest.java      |   3 +-
 .../ScrollViewScrollHandlingDelegateTest.java |   3 +-
 .../util/GlifDimensionTest.java               |   3 +-
 .../setupwizardlib/util/GlifStyleTest.java    |   3 +-
 .../setupwizardlib/util/PartnerTest.java      |   2 -
 .../util/WizardManagerHelperTest.java         |   3 +-
 .../view/FillContentLayoutTest.java           |   3 +-
 .../view/IllustrationVideoViewTest.java       |   2 -
 tools/gradle/android.properties               |   4 +-
 27 files changed, 54 insertions(+), 235 deletions(-)
 delete mode 100644 library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
index 5172c47..d7a3c2e 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
@@ -16,6 +16,7 @@
 
 package com.android.setupwizardlib.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
@@ -30,6 +31,7 @@ import android.widget.Button;
  * Button for navigation bar, which includes tinting of its compound drawables to be used for dark
  * and light themes.
  */
+@SuppressLint("AppCompatCustomView")
 public class NavigationBarButton extends Button {
 
     public NavigationBarButton(Context context) {
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
index 4fb3e28..3020ed3 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
@@ -32,7 +32,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -44,7 +43,7 @@ import org.robolectric.annotation.Config;
 import java.util.ArrayList;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ExpandableSwitchItemTest {
 
     private TextView mSummaryView;
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
index d391d80..fa5bbba 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
@@ -31,7 +31,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -40,7 +39,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class SwitchItemTest {
 
     private SwitchCompat mSwitch;
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
index 43e7f03..7a08235 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java
@@ -25,7 +25,6 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -35,7 +34,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS)
+@Config(sdk = Config.ALL_SDKS)
 public class DimensionConsistencyTest {
 
     // Visual height of the framework switch widget
diff --git a/library/lint.xml b/library/lint.xml
index ca22c65..625b20d 100644
--- a/library/lint.xml
+++ b/library/lint.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <!-- SUW lib prefixes styleable resources -->
+    <issue id="CustomViewStyleable" severity="ignore" />
     <issue id="ExtraTranslation" severity="ignore" />
     <issue id="GradleDependency" severity="ignore" />
     <issue id="MissingTranslation" severity="ignore" />
+    <!-- Stop lint from complaining about SDK version checks in the "platform" variant -->
+    <issue id="ObsoleteSdkInt" severity="ignore" />
     <issue id="RtlEnabled" severity="ignore" />
 </lint>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 0e7685b..e1e229f 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -32,9 +32,6 @@
         <item name="suwScrollIndicators">top|bottom</item>
     </style>
 
-    <!-- Deprecated. Use SuwThemeGlifV2 instead -->
-    <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" />
-
     <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
         <item name="android:colorBackground">@color/suw_glif_background_color_light</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
@@ -48,9 +45,6 @@
         <item name="suwScrollIndicators">top|bottom</item>
     </style>
 
-    <!-- Deprecated. Use SuwThemeGlifV2.Light instead -->
-    <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" />
-
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
     </style>
@@ -94,11 +88,10 @@
         <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
     </style>
 
-    <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription">
-        <item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item>
-    </style>
-
-    <style name="TextAppearance.SuwDescription.Secondary" parent="TextAppearance.SuwDescription">
+    <!-- Ignore UnusedResources: Used by clients -->
+    <style name="TextAppearance.SuwDescription.Secondary"
+        parent="TextAppearance.SuwDescription"
+        tools:ignore="UnusedResources">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
@@ -211,7 +204,10 @@
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item>
     </style>
 
-    <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" />
+    <!-- Ignore UnusedResources: used by clients -->
+    <style name="SuwGlifButton.Tertiary"
+        parent="SuwGlifButton.BaseTertiary"
+        tools:ignore="UnusedResources" />
 
     <!-- The start and end paddings are asymmetric because start buttons are borderless buttons
          which aligns the text label. -->
diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index f4bb8f5..cf9ddac 100644
--- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
@@ -79,24 +79,12 @@ public class WizardManagerHelper {
      */
     public static final String THEME_GLIF_V2 = "glif_v2";
 
-    /**
-     * @deprecated Use {@link #THEME_GLIF_V2} instead.
-     */
-    @Deprecated
-    public static final String THEME_GLIF_PIXEL = THEME_GLIF_V2;
-
     /**
      * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the default theme used in
      * setup wizard for O DR.
      */
     public static final String THEME_GLIF_V2_LIGHT = "glif_v2_light";
 
-    /**
-     * @deprecated Use {@link #THEME_GLIF_V2_LIGHT} instead.
-     */
-    @Deprecated
-    public static final String THEME_GLIF_PIXEL_LIGHT = THEME_GLIF_V2_LIGHT;
-
     /**
      * Passed in a setup wizard intent as {@link #EXTRA_THEME}. This is the dark variant of the
      * theme used in setup wizard for P.
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index aaccd17..26ab230 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
         <item name="android:textColorLink">@color/suw_link_color_dark</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowDisablePreview">true</item>
@@ -65,7 +65,7 @@
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
         <item name="android:textColorLink">@color/suw_link_color_light</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowDisablePreview">true</item>
diff --git a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
index b509389..5912f7f 100644
--- a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
+++ b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
@@ -27,7 +27,6 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -38,7 +37,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class RecyclerViewScrollHandlingDelegateTest {
 
diff --git a/library/rules.gradle b/library/rules.gradle
index 6b0acce..f5face8 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -21,9 +21,12 @@ android {
             res.srcDirs = ['main/res']
         }
 
+        flavorDimensions 'compat'
+
         productFlavors {
             // Platform version that will not include the compatibility libraries
             platform {
+                dimension 'compat'
                 minSdkVersion 23
 
                 dependencies {
@@ -43,16 +46,17 @@ android {
                     //          deps = ['project-name': 'com.example.group:project-name:1.0.0']
                     //      }
                     //
-                    platformCompile deps['support-annotations']
+                    platformImplementation deps['support-annotations']
                 }
             }
 
             // Provides backwards compatibility for Gingerbread or above, using support libraries.
             gingerbreadCompat {
+                dimension 'compat'
                 minSdkVersion 9
                 dependencies {
-                    gingerbreadCompatCompile deps['support-appcompat-v7']
-                    gingerbreadCompatCompile deps['support-recyclerview-v7']
+                    gingerbreadCompatImplementation deps['support-appcompat-v7']
+                    gingerbreadCompatImplementation deps['support-recyclerview-v7']
                 }
             }
         }
diff --git a/library/self.gradle b/library/self.gradle
index 69f9654..a3e5334 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -13,12 +13,12 @@ android.sourceSets {
         res.srcDirs = ['test/instrumentation/res']
 
         dependencies {
-            androidTestCompile 'com.android.support.test:rules:0.5'
-            androidTestCompile 'com.android.support.test:runner:0.5'
-            androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-            androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-            androidTestCompile 'junit:junit:4.+'
-            androidTestCompile 'org.mockito:mockito-core:1.9.5'
+            androidTestImplementation 'com.android.support.test:rules:0.5'
+            androidTestImplementation 'com.android.support.test:runner:0.5'
+            androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+            androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+            androidTestImplementation 'junit:junit:4.+'
+            androidTestImplementation 'org.mockito:mockito-core:1.9.5'
         }
     }
 
@@ -38,12 +38,12 @@ android.sourceSets {
         java.srcDirs = ['test/robotest/src']
 
         dependencies {
-            testCompile 'org.robolectric:robolectric:3.4.2'
-            testCompile 'org.robolectric:framework:3.4.2'
-            testCompile 'junit:junit:4.+'
-            testCompile 'org.mockito:mockito-core:1.9.5'
+            testImplementation 'org.robolectric:robolectric:3.4.2'
+            testImplementation 'org.robolectric:framework:3.4.2'
+            testImplementation 'junit:junit:4.+'
+            testImplementation 'org.mockito:mockito-core:1.9.5'
             // Workaround for https://github.com/robolectric/robolectric/issues/2566
-            testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+            testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
         }
     }
 
@@ -51,6 +51,9 @@ android.sourceSets {
         java.srcDirs = ['gingerbread/test/robotest/src', 'recyclerview/test/robotest/src']
     }
 }
+
+android.testOptions.unitTests.includeAndroidResources = true
+
 android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 android.lintOptions {
     abortOnError true
diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
index 967a52e..360dfe2 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
@@ -54,7 +54,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class GlifLayoutTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java b/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
index 93b9a6d..40e5da8 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/items/ButtonItemTest.java
@@ -39,7 +39,6 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.items.ButtonItem.OnClickListener;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
@@ -50,9 +49,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(
-        constants = BuildConfig.class,
-        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ButtonItemTest {
 
     private ViewGroup mParent;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java b/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
index a61b750..ecaec71 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/items/ItemGroupTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -36,9 +35,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(
-        constants = BuildConfig.class,
-        sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ItemGroupTest {
 
     private static final Item CHILD_1 = new EqualsItem("Child 1");
diff --git a/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java b/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java
deleted file mode 100644
index 64c63e7..0000000
--- a/library/test/robotest/src/com/android/setupwizardlib/robolectric/PatchedGradleManifestFactory.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2017 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.
- */
-
-package com.android.setupwizardlib.robolectric;
-
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.GradleManifestFactory;
-import org.robolectric.internal.ManifestIdentifier;
-import org.robolectric.res.FileFsFile;
-import org.robolectric.util.Logger;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.io.File;
-import java.net.URL;
-
-/**
- * Modified GradleManifestFactory to patch an issue where some build variants have merged
- * resources under res/merged/variant/type while others have it under bundles/variant/type/res.
- *
- * The change is that in the .exists() checks below we check for specific folders for the build
- * variant rather than checking existence at the parent directory.
- */
-class PatchedGradleManifestFactory extends GradleManifestFactory {
-
-    @Override
-    public ManifestIdentifier identify(Config config) {
-        if (config.constants() == Void.class) {
-            Logger.error("Field 'constants' not specified in @Config annotation");
-            Logger.error("This is required when using Robolectric with Gradle!");
-            throw new RuntimeException("No 'constants' field in @Config annotation!");
-        }
-
-        final String buildOutputDir = getBuildOutputDir(config);
-        final String type = getType(config);
-        final String flavor = getFlavor(config);
-        final String abiSplit = getAbiSplit(config);
-        final String packageName = config.packageName().isEmpty()
-                ? config.constants().getPackage().getName()
-                : config.packageName();
-
-        final FileFsFile res;
-        final FileFsFile assets;
-        final FileFsFile manifest;
-
-        if (FileFsFile.from(buildOutputDir, "data-binding-layout-out", flavor, type).exists()) {
-            // Android gradle plugin 1.5.0+ puts the merged layouts in data-binding-layout-out.
-            // https://github.com/robolectric/robolectric/issues/2143
-            res = FileFsFile.from(buildOutputDir, "data-binding-layout-out", flavor, type);
-        } else if (FileFsFile.from(buildOutputDir, "res", "merged", flavor, type).exists()) {
-            // res/merged added in Android Gradle plugin 1.3-beta1
-            res = FileFsFile.from(buildOutputDir, "res", "merged", flavor, type);
-        } else if (FileFsFile.from(buildOutputDir, "res", flavor, type).exists()) {
-            res = FileFsFile.from(buildOutputDir, "res", flavor, type);
-        } else {
-            res = FileFsFile.from(buildOutputDir, "bundles", flavor, type, "res");
-        }
-
-        if (FileFsFile.from(buildOutputDir, "assets", flavor, type).exists()) {
-            assets = FileFsFile.from(buildOutputDir, "assets", flavor, type);
-        } else {
-            assets = FileFsFile.from(buildOutputDir, "bundles", flavor, type, "assets");
-        }
-
-        String manifestName = config.manifest();
-        URL manifestUrl = getClass().getClassLoader().getResource(manifestName);
-        if (manifestUrl != null && manifestUrl.getProtocol().equals("file")) {
-            manifest = FileFsFile.from(manifestUrl.getPath());
-        } else if (FileFsFile.from(buildOutputDir, "manifests", "full", flavor, abiSplit, type,
-                manifestName).exists()) {
-            manifest = FileFsFile.from(
-                    buildOutputDir, "manifests", "full", flavor, abiSplit, type, manifestName);
-        } else if (FileFsFile.from(buildOutputDir, "manifests", "aapt", flavor, abiSplit, type,
-                manifestName).exists()) {
-            // Android gradle plugin 2.2.0+ can put library manifest files inside of "aapt"
-            // instead of "full"
-            manifest = FileFsFile.from(buildOutputDir, "manifests", "aapt", flavor, abiSplit,
-                    type, manifestName);
-        } else {
-            manifest = FileFsFile.from(buildOutputDir, "bundles", flavor, abiSplit, type,
-                    manifestName);
-        }
-
-        return new ManifestIdentifier(manifest, res, assets, packageName, null);
-    }
-
-    private static String getBuildOutputDir(Config config) {
-        return config.buildDir() + File.separator + "intermediates";
-    }
-
-    private static String getType(Config config) {
-        try {
-            return ReflectionHelpers.getStaticField(config.constants(), "BUILD_TYPE");
-        } catch (Throwable e) {
-            return null;
-        }
-    }
-
-    private static String getFlavor(Config config) {
-        try {
-            return ReflectionHelpers.getStaticField(config.constants(), "FLAVOR");
-        } catch (Throwable e) {
-            return null;
-        }
-    }
-
-    private static String getAbiSplit(Config config) {
-        try {
-            return config.abiSplit();
-        } catch (Throwable e) {
-            return null;
-        }
-    }
-}
diff --git a/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java b/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
index 509201a..61baa23 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/robolectric/SuwLibRobolectricTestRunner.java
@@ -20,42 +20,13 @@ import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.ManifestFactory;
 
 public class SuwLibRobolectricTestRunner extends RobolectricTestRunner {
 
-    private String mModuleRootPath;
-
     public SuwLibRobolectricTestRunner(Class<?> testClass) throws InitializationError {
         super(testClass);
     }
 
-    // Hack to determine the module root path in the build folder (e.g. out/gradle/setup-wizard-lib)
-    private void updateModuleRootPath(Config config) {
-        String moduleRoot = config.constants().getResource("").toString()
-                .replace("file:", "").replace("jar:", "");
-        mModuleRootPath =
-                moduleRoot.substring(0, moduleRoot.lastIndexOf("/build")) + "/setup-wizard-lib";
-    }
-
-    /**
-     * Return the default config used to run Robolectric tests.
-     */
-    @Override
-    protected Config buildGlobalConfig() {
-        Config parent = super.buildGlobalConfig();
-        updateModuleRootPath(parent);
-        return new Config.Builder(parent)
-                .setBuildDir(mModuleRootPath + "/build")
-                .build();
-    }
-
-    @Override
-    protected ManifestFactory getManifestFactory(Config config) {
-        return new PatchedGradleManifestFactory();
-    }
-
     @Override
     protected void runChild(FrameworkMethod method, RunNotifier notifier) {
         System.out.println("===== Running " + method + " =====");
diff --git a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
index f86e057..fe72e03 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
@@ -23,15 +23,12 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
 public class LinkSpanTest {
 
     @Test
@@ -68,6 +65,7 @@ public class LinkSpanTest {
         assertSame("Clicked LinkSpan should be passed to setup", linkSpan, context.clickedSpan);
     }
 
+    @SuppressWarnings("deprecation")
     private static class TestContext extends ContextWrapper implements LinkSpan.OnClickListener {
 
         public LinkSpan clickedSpan = null;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
index fa81dc0..ec3622d 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegateTest.java
@@ -31,7 +31,6 @@ import android.widget.AbsListView.OnScrollListener;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Before;
@@ -42,7 +41,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class ListViewScrollHandlingDelegateTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
index 8e39c43..c641449 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/RequireScrollMixinTest.java
@@ -34,7 +34,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.template.RequireScrollMixin.OnRequireScrollStateChangedListener;
@@ -48,7 +47,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class RequireScrollMixinTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
index f77e256..429445c 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.RuntimeEnvironment.application;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.view.BottomScrollView;
 import com.android.setupwizardlib.view.BottomScrollView.BottomScrollListener;
@@ -36,7 +35,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 @RunWith(SuwLibRobolectricTestRunner.class)
 public class ScrollViewScrollHandlingDelegateTest {
 
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
index 2be64e1..c10c122 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
@@ -26,7 +26,6 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -36,7 +35,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS)
+@Config(sdk = Config.ALL_SDKS)
 public class GlifDimensionTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index aea2c03..3627806 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -30,7 +30,6 @@ import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -41,7 +40,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
+@Config(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class GlifStyleTest {
 
     private Context mContext;
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
index aeb678f..683e40b 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
@@ -37,7 +37,6 @@ import android.content.res.Resources;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.util.Partner.ResourceEntry;
@@ -57,7 +56,6 @@ import java.util.Collections;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(
-        constants = BuildConfig.class,
         sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK },
         shadows = ShadowApplicationPackageManager.class)
 public class PartnerTest {
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
index 9195de2..0d15ef4 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java
@@ -31,7 +31,6 @@ import android.provider.Settings.Global;
 import android.provider.Settings.Secure;
 import android.support.annotation.StyleRes;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
@@ -44,7 +43,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = Config.NEWEST_SDK)
+@Config(sdk = Config.NEWEST_SDK)
 public class WizardManagerHelperTest {
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
index f1332c0..ae4f3d1 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
@@ -22,7 +22,6 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.view.View;
 import android.view.View.MeasureSpec;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
 import org.junit.Test;
@@ -31,7 +30,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
+@Config(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class FillContentLayoutTest {
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
index ddf59ca..6db8852 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
@@ -31,7 +31,6 @@ import android.os.Build.VERSION_CODES;
 import android.support.annotation.RawRes;
 import android.view.Surface;
 
-import com.android.setupwizardlib.BuildConfig;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.view.IllustrationVideoViewTest.ShadowMockMediaPlayer;
@@ -54,7 +53,6 @@ import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(
-        constants = BuildConfig.class,
         sdk = Config.NEWEST_SDK,
         shadows = {
                 ShadowMockMediaPlayer.class,
diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties
index b4a1e0c..3795eee 100644
--- a/tools/gradle/android.properties
+++ b/tools/gradle/android.properties
@@ -1,6 +1,6 @@
 // Set the default SDK and build tools version for all apps
-compileSdkVersion 26
-buildToolsVersion = '26.0.0'
+compileSdkVersion 27
+buildToolsVersion = '27.0.0'
 
 // enable Java7
 compileOptions.sourceCompatibility JavaVersion.VERSION_1_7

From 60c18c807b38550403284997db6d79aa416eb9fa Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Tue, 12 Dec 2017 11:43:35 -0800
Subject: [PATCH 34/75] Update text field style to Material 2 for suw

bug: 69930300
Test: Manually tested
Change-Id: I3079891881f00ab38d5d3bab8291e8ff1829e491
---
 .../drawable-v21/suw_edit_text_bg_shape.xml   | 21 ++++++++
 .../main/res/drawable-v21/suw_edittext_bg.xml | 52 +++++++++++++++++++
 library/main/res/values-v21/styles.xml        |  5 ++
 library/main/res/values/attrs.xml             |  1 +
 library/main/res/values/colors.xml            |  1 +
 library/main/res/values/dimens.xml            |  3 ++
 library/main/res/values/styles.xml            |  9 ++++
 7 files changed, 92 insertions(+)
 create mode 100644 library/main/res/drawable-v21/suw_edit_text_bg_shape.xml
 create mode 100644 library/main/res/drawable-v21/suw_edittext_bg.xml

diff --git a/library/main/res/drawable-v21/suw_edit_text_bg_shape.xml b/library/main/res/drawable-v21/suw_edit_text_bg_shape.xml
new file mode 100644
index 0000000..ad55ec6
--- /dev/null
+++ b/library/main/res/drawable-v21/suw_edit_text_bg_shape.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="4dp" android:topRightRadius="4dp"/>
+    <solid android:color="?attr/suwEditTextBackgroundColor"/>
+</shape>
\ No newline at end of file
diff --git a/library/main/res/drawable-v21/suw_edittext_bg.xml b/library/main/res/drawable-v21/suw_edittext_bg.xml
new file mode 100644
index 0000000..b69c10b
--- /dev/null
+++ b/library/main/res/drawable-v21/suw_edittext_bg.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <layer-list>
+            <item android:drawable="@drawable/suw_edit_text_bg_shape" android:bottom="1dp"/>
+            <item android:gravity="bottom">
+                <shape>
+                    <size android:height="1dp"/>
+                    <solid android:color="?android:attr/textColorSecondary"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_focused="false" android:state_pressed="false">
+        <layer-list>
+            <item android:drawable="@drawable/suw_edit_text_bg_shape" android:bottom="1dp" />
+            <item android:gravity="bottom">
+                <shape>
+                    <size android:height="1dp"/>
+                    <solid android:color="?android:attr/textColorSecondary"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item android:drawable="@drawable/suw_edit_text_bg_shape" android:bottom="2dp" />
+            <item android:gravity="bottom">
+                <shape>
+                    <size android:height="2dp"/>
+                    <solid android:color="?android:attr/colorAccent"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index 6e4c0dd..f78149b 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -93,4 +93,9 @@
         <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg</item>
     </style>
 
+    <style name="SuwEditText" parent="@android:style/Widget.Material.EditText">
+        <item name="android:minHeight">@dimen/suw_edit_text_min_height</item>
+        <item name="android:background">@drawable/suw_edittext_bg</item>
+    </style>
+
 </resources>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index ec21f87..7820a6d 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -21,6 +21,7 @@
     <attr name="suwLayoutTheme" format="reference" />
     <attr name="suwMarginSides" format="dimension|reference" />
     <attr name="suwButtonColor" format="color" />
+    <attr name="suwEditTextBackgroundColor" format="color" />
 
     <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only
          horizontal values are listed here as the header does not support vertical gravity. -->
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index 7d2575e..b653c98 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -45,5 +45,6 @@
     <color name="suw_glif_background_color_dark">#ff000000</color>
     <color name="suw_glif_background_color_light">#ffffffff</color>
     <color name="suw_glif_v3_footer_button_color">#ff1a73e8</color>
+    <color name="suw_glif_edittext_bg_light_color">#F1F3F4</color>
 
 </resources>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 5978a4e..f5c2563 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -135,4 +135,7 @@
     <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen>
     <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen>
 
+    <!-- Edit Text dimensions -->
+    <dimen name="suw_edit_text_min_height">56dp</dimen>
+
 </resources>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 0e7685b..e315795 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -30,6 +30,8 @@
         <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
         <item name="suwGlifHeaderGravity">center_horizontal</item>
         <item name="suwScrollIndicators">top|bottom</item>
+        <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <!-- TODO: Change color -->
+        <item name="android:editTextStyle">@style/SuwEditText</item>
     </style>
 
     <!-- Deprecated. Use SuwThemeGlifV2 instead -->
@@ -46,6 +48,8 @@
         <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
         <item name="suwGlifHeaderGravity">center_horizontal</item>
         <item name="suwScrollIndicators">top|bottom</item>
+        <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item>
+        <item name="android:editTextStyle">@style/SuwEditText</item>
     </style>
 
     <!-- Deprecated. Use SuwThemeGlifV2.Light instead -->
@@ -317,4 +321,9 @@
         <item name="suwNavBarTextColor">?android:attr/textColorPrimary</item>
     </style>
 
+
+    <style name="SuwEditText" parent="@android:style/Widget.EditText">
+        <item name="android:minHeight">@dimen/suw_edit_text_min_height</item>
+    </style>
+
 </resources>

From a820a7f85d1e7933a9d3e8b6d1e80fd7a1ca37bf Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Thu, 14 Dec 2017 14:48:22 -0800
Subject: [PATCH 35/75] Add 'compat' flavor dimension to SUW lib.

Change-Id: I6538454ba777730f3a75cffda737a07901521733
Test: Gradle sync with 2.3 plugin.
---
 library/rules.gradle | 79 ++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/library/rules.gradle b/library/rules.gradle
index f5face8..54ea68b 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -13,6 +13,22 @@ android {
 
     publishNonDefault true
 
+    flavorDimensions 'compat'
+
+    productFlavors {
+        // Platform version that will not include the compatibility libraries
+        platform {
+            dimension 'compat'
+            minSdkVersion 23
+        }
+
+        // Provides backwards compatibility for Gingerbread or above, using support libraries.
+        gingerbreadCompat {
+            dimension 'compat'
+            minSdkVersion 9
+        }
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'main/AndroidManifest.xml'
@@ -21,46 +37,6 @@ android {
             res.srcDirs = ['main/res']
         }
 
-        flavorDimensions 'compat'
-
-        productFlavors {
-            // Platform version that will not include the compatibility libraries
-            platform {
-                dimension 'compat'
-                minSdkVersion 23
-
-                dependencies {
-                    // Read the dependencies from the "deps" map in the extra properties.
-                    //
-                    // For builds in the Android tree we want to build the dependencies from source
-                    // for reproducible builds, for example in build.gradle define something like
-                    // this:
-                    //      ext {
-                    //          deps = ['project-name': project(':project-path')]
-                    //      }
-                    //
-                    // For standalone project clients, since the source may not be available, we
-                    // fetch the dependencies from maven. For example in standalone.gradle define
-                    // something like this:
-                    //      ext {
-                    //          deps = ['project-name': 'com.example.group:project-name:1.0.0']
-                    //      }
-                    //
-                    platformImplementation deps['support-annotations']
-                }
-            }
-
-            // Provides backwards compatibility for Gingerbread or above, using support libraries.
-            gingerbreadCompat {
-                dimension 'compat'
-                minSdkVersion 9
-                dependencies {
-                    gingerbreadCompatImplementation deps['support-appcompat-v7']
-                    gingerbreadCompatImplementation deps['support-recyclerview-v7']
-                }
-            }
-        }
-
         platform {
             java.srcDirs = ['platform/src']
             res.srcDirs = ['platform/res']
@@ -72,3 +48,26 @@ android {
         }
     }
 }
+
+dependencies {
+    // Read the dependencies from the "deps" map in the extra properties.
+    //
+    // For builds in the Android tree we want to build the dependencies from source
+    // for reproducible builds, for example in build.gradle define something like
+    // this:
+    //      ext {
+    //          deps = ['project-name': project(':project-path')]
+    //      }
+    //
+    // For standalone project clients, since the source may not be available, we
+    // fetch the dependencies from maven. For example in standalone.gradle define
+    // something like this:
+    //      ext {
+    //          deps = ['project-name': 'com.example.group:project-name:1.0.0']
+    //      }
+    //
+    platformCompile deps['support-annotations']
+
+    gingerbreadCompatCompile deps['support-appcompat-v7']
+    gingerbreadCompatCompile deps['support-recyclerview-v7']
+}

From 2cb1021b95ed1d74aa0357db93f3f8155698a4af Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 14 Dec 2017 16:22:40 -0800
Subject: [PATCH 36/75] Rename GM progress bar to FourColor

Test: Existing tests pass
Bug: 63074068
Change-Id: Ib0ab34b556934de71920862fbd1d4b194f3db8a8
---
 library/gingerbread/res/values/styles.xml           | 2 +-
 library/main/res/layout/suw_glif_loading_screen.xml | 2 +-
 library/main/res/values-v21/styles.xml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 1653938..ff8a685 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -248,7 +248,7 @@
 
     <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" />
 
-    <style name="SuwGmIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
+    <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
         <item name="android:layout_gravity">center</item>
         <item name="android:indeterminate">true</item>
     </style>
diff --git a/library/main/res/layout/suw_glif_loading_screen.xml b/library/main/res/layout/suw_glif_loading_screen.xml
index ecf932e..676ab34 100644
--- a/library/main/res/layout/suw_glif_loading_screen.xml
+++ b/library/main/res/layout/suw_glif_loading_screen.xml
@@ -31,7 +31,7 @@
 
         <ProgressBar
             android:id="@+id/suw_large_progress_bar"
-            style="@style/SuwGmIndeterminateProgressBar"
+            style="@style/SuwFourColorIndeterminateProgressBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index f78149b..a77c32c 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -44,7 +44,7 @@
 
     <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" />
 
-    <style name="SuwGmIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
+    <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
         <item name="android:layout_gravity">center</item>
         <item name="android:indeterminate">true</item>
         <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item>

From 6cd5a7230264c8b0fc2969ff70192eb7b165c689 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 14 Dec 2017 11:07:05 -0800
Subject: [PATCH 37/75] Mark platform build as deprecated on gradle

Test: ./gradlew buildProjectFull
Bug: 33298315
Change-Id: I265ab8468a75dbe23749259a36f9aba06abbc8ed
---
 library/rules.gradle | 8 ++++----
 library/self.gradle  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/rules.gradle b/library/rules.gradle
index 54ea68b..e261a4c 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -16,8 +16,8 @@ android {
     flavorDimensions 'compat'
 
     productFlavors {
-        // Platform version that will not include the compatibility libraries
-        platform {
+        // DEPRECATED: Platform version that will not include the compatibility libraries
+        platformDeprecated {
             dimension 'compat'
             minSdkVersion 23
         }
@@ -37,7 +37,7 @@ android {
             res.srcDirs = ['main/res']
         }
 
-        platform {
+        platformDeprecated {
             java.srcDirs = ['platform/src']
             res.srcDirs = ['platform/res']
         }
@@ -66,7 +66,7 @@ dependencies {
     //          deps = ['project-name': 'com.example.group:project-name:1.0.0']
     //      }
     //
-    platformCompile deps['support-annotations']
+    platformDeprecatedCompile deps['support-annotations']
 
     gingerbreadCompatCompile deps['support-appcompat-v7']
     gingerbreadCompatCompile deps['support-recyclerview-v7']
diff --git a/library/self.gradle b/library/self.gradle
index a3e5334..6477171 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -22,7 +22,7 @@ android.sourceSets {
         }
     }
 
-    androidTestPlatform {
+    androidTestPlatformDeprecated {
         java.srcDirs = ['platform/test/src']
     }
 

From c508544bbe3febd8d8d9d4a9f561fee8d273bb3d Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 15 Dec 2017 16:04:36 -0800
Subject: [PATCH 38/75] Add root.mk file to build

So we can avoid pulling in all the make machinery from platform/build

Test: `make` builds the project
Bug: 70287447
Change-Id: I97250208ad4650a85c75924b0a501c604816c441
---
 tools/root.mk | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tools/root.mk

diff --git a/tools/root.mk b/tools/root.mk
new file mode 100644
index 0000000..11597ea
--- /dev/null
+++ b/tools/root.mk
@@ -0,0 +1,2 @@
+default:
+	TARGET_BUILD_APPS=setup-wizard-lib ./gradlew

From f2bfcde52be3543cfccd5666479253f1e4ae5a14 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 15 Dec 2017 17:25:19 -0800
Subject: [PATCH 39/75] Remove test APK rename

Test configuration on the server has been updated.

Test: Builds with ./gradlew buildProjectFull
Bug: 70287447
Change-Id: Ie82011e5c4ff86e0b3400076f91247663589fbe4
---
 library/self.gradle | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/library/self.gradle b/library/self.gradle
index 6477171..f455952 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -67,14 +67,3 @@ android.lintOptions {
 android.libraryVariants.all { variant ->
     variant.assemble.dependsOn(tasks.findByName('lint'))
 }
-
-// For compatibility with existing continuous test configurations, copy the file to
-// setup-wizard-libTest.apk
-// TODO: Remove this once continuous test configurations are updated to handle the new file name
-task createLegacyTestApk(type: Copy) {
-    from "${project.ext.distDir}/setup-wizard-lib-gingerbreadCompat-debug-androidTest.apk"
-    into "${project.ext.distDir}"
-    rename ('setup-wizard-lib-gingerbreadCompat-debug-androidTest.apk', 'setup-wizard-libTest.apk')
-}
-
-tasks.dist.finalizedBy createLegacyTestApk

From e22d7c2b358d9c0f362627d3194b051719f2ba5c Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 15 Dec 2017 17:03:23 -0800
Subject: [PATCH 40/75] Change accent color in GLIF V3

Change the accent color to Google Blue 600 for better contrast. The
button color change in ag/3301076 was mostly reverted because the
color will be automatically picked up from the updated accent color.

Test: Manual, Existing tests pass
Bug: 69930196
Change-Id: I2fad5b029357afec9402ef8de5810fa0e092a713
---
 library/gingerbread/res/values/styles.xml     | 17 +++--
 .../items/ButtonItemDrawingTest.java          | 65 ++++++++++++-------
 .../color-v23/suw_flat_button_highlight.xml   |  2 +-
 library/main/res/values/attrs.xml             |  1 -
 library/main/res/values/colors.xml            |  4 +-
 library/main/res/values/styles.xml            | 12 +---
 library/platform/res/values-v23/styles.xml    | 12 ++--
 7 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 1653938..6cdbe3c 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -39,7 +39,6 @@
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
-        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
         <item name="suwDividerInsetEnd">0dp</item>
         <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
@@ -72,7 +71,6 @@
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
-        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_light</item>
         <item name="suwDividerInsetEnd">0dp</item>
         <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
@@ -105,7 +103,6 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_dark</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
-        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -141,7 +138,6 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_light</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
-        <item name="suwButtonColor">?attr/colorAccent</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -157,6 +153,14 @@
         <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
     </style>
 
+    <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
+        <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
+    </style>
+
+    <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
+        <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
+    </style>
+
     <!-- Content styles -->
 
     <style name="TextAppearance.SuwDescription" parent="TextAppearance.AppCompat.Medium">
@@ -209,10 +213,6 @@
         <!-- Values used in styles -->
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
-
-        <!-- Values used in themes -->
-        <item name="android:backgroundTint" tools:targetApi="lollipop">?attr/suwButtonColor</item>
-        <item name="backgroundTint">?attr/suwButtonColor</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -227,7 +227,6 @@
         <item name="android:minWidth">0dp</item>
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
-        <item name="android:textColor">?attr/suwButtonColor</item>
 
         <!-- Values used in themes -->
         <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item>
diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
index 74d3be6..b97905c 100644
--- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
@@ -18,6 +18,7 @@ package com.android.setupwizardlib.items;
 
 import static org.junit.Assert.assertTrue;
 
+import android.support.annotation.StyleRes;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.UiThreadTestRule;
@@ -29,7 +30,6 @@ import android.widget.LinearLayout;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.test.util.DrawingTestHelper;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,40 +38,61 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class ButtonItemDrawingTest {
 
-    private static final int GOOGLE_BLUE = 0xff4285f4;
+    private static final int GLIF_ACCENT_COLOR = 0xff4285f4;
+    private static final int GLIF_V3_ACCENT_COLOR = 0xff1a73e8;
 
     // These tests need to be run on UI thread because button uses ValueAnimator
     @Rule
     public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();
 
-    private ViewGroup mParent;
-
-    @Before
-    public void setUp() throws Exception {
-        mParent = new LinearLayout(
-                DrawingTestHelper.createCanvasActivity(R.style.SuwThemeGlif_Light));
-    }
-
     @Test
     @UiThreadTest
-    public void testColoredButtonTheme() {
-        TestButtonItem item = new TestButtonItem();
-        item.setTheme(R.style.SuwButtonItem_Colored);
-        item.setText("foobar");
-
-        final Button button = item.createButton(mParent);
+    public void drawButton_glif_shouldHaveAccentColoredButton()
+            throws InstantiationException, IllegalAccessException {
+        Button button = createButton(R.style.SuwThemeGlif_Light);
 
         DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50);
         drawingTestHelper.drawView(button);
 
-        int googleBluePixelCount = 0;
-        for (int pixel : drawingTestHelper.getPixels()) {
-            if (pixel == GOOGLE_BLUE) {
-                googleBluePixelCount++;
+        int accentPixelCount =
+                countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_ACCENT_COLOR);
+        assertTrue("> 10 pixels should be #4285f4. Found " + accentPixelCount,
+                accentPixelCount > 10);
+    }
+
+    @Test
+    @UiThreadTest
+    public void drawButton_glifV3_shouldHaveAccentColoredButton()
+            throws InstantiationException, IllegalAccessException {
+        Button button = createButton(R.style.SuwThemeGlifV3_Light);
+
+        DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50);
+        drawingTestHelper.drawView(button);
+
+        int accentPixelCount =
+                countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_V3_ACCENT_COLOR);
+        assertTrue("> 10 pixels should be #1a73e8. Found " + accentPixelCount,
+                accentPixelCount > 10);
+    }
+
+    private Button createButton(@StyleRes int theme)
+            throws InstantiationException, IllegalAccessException {
+        final ViewGroup parent = new LinearLayout(DrawingTestHelper.createCanvasActivity(theme));
+        TestButtonItem item = new TestButtonItem();
+        item.setTheme(R.style.SuwButtonItem_Colored);
+        item.setText("foobar");
+
+        return item.createButton(parent);
+    }
+
+    private int countPixelsWithColor(int[] pixels, int color) {
+        int count = 0;
+        for (int pixel : pixels) {
+            if (pixel == color) {
+                count++;
             }
         }
-        assertTrue("> 10 pixels should be Google blue. Found " + googleBluePixelCount,
-                googleBluePixelCount > 10);
+        return count;
     }
 
     private static class TestButtonItem extends ButtonItem {
diff --git a/library/main/res/color-v23/suw_flat_button_highlight.xml b/library/main/res/color-v23/suw_flat_button_highlight.xml
index 4d90570..c5be14f 100644
--- a/library/main/res/color-v23/suw_flat_button_highlight.xml
+++ b/library/main/res/color-v23/suw_flat_button_highlight.xml
@@ -16,6 +16,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/suwButtonColor"
+    <item android:color="?android:attr/colorAccent"
         android:alpha="0.24" />
 </selector>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 7820a6d..ffdf365 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -20,7 +20,6 @@
     <!-- Theme attributes -->
     <attr name="suwLayoutTheme" format="reference" />
     <attr name="suwMarginSides" format="dimension|reference" />
-    <attr name="suwButtonColor" format="color" />
     <attr name="suwEditTextBackgroundColor" format="color" />
 
     <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index b653c98..e919f4b 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -42,9 +42,9 @@
     <!-- GLIF colors -->
     <color name="suw_color_accent_glif_dark">#ff4285f4</color>
     <color name="suw_color_accent_glif_light">#ff4285f4</color>
+    <color name="suw_color_accent_glif_v3">#ff1a73e8</color>
     <color name="suw_glif_background_color_dark">#ff000000</color>
     <color name="suw_glif_background_color_light">#ffffffff</color>
-    <color name="suw_glif_v3_footer_button_color">#ff1a73e8</color>
-    <color name="suw_glif_edittext_bg_light_color">#F1F3F4</color>
+    <color name="suw_glif_edit_text_bg_light_color">#fff1f3f4</color>
 
 </resources>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 1d7d28b..022efe4 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -30,7 +30,7 @@
         <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
         <item name="suwGlifHeaderGravity">center_horizontal</item>
         <item name="suwScrollIndicators">top|bottom</item>
-        <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <!-- TODO: Change color -->
+        <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> <!-- TODO: Change color -->
         <item name="android:editTextStyle">@style/SuwEditText</item>
     </style>
 
@@ -45,18 +45,10 @@
         <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
         <item name="suwGlifHeaderGravity">center_horizontal</item>
         <item name="suwScrollIndicators">top|bottom</item>
-        <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item>
+        <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item>
         <item name="android:editTextStyle">@style/SuwEditText</item>
     </style>
 
-    <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
-        <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
-    </style>
-
-    <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
-        <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
-    </style>
-
     <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity">
         <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item>
         <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item>
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 26ab230..61a75fb 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -41,7 +41,6 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
-        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -71,7 +70,6 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
-        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -104,7 +102,6 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
-        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -137,7 +134,6 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
-        <item name="suwButtonColor">?android:attr/colorAccent</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -151,6 +147,14 @@
         <item name="suwScrollIndicators">bottom</item>
     </style>
 
+    <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
+        <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
+    </style>
+
+    <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
+        <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
+    </style>
+
     <!-- Button styles -->
 
     <style name="SuwGlifButton.Primary" parent="android:Widget.Material.Button.Colored">

From 7e2975b101dfd7a4e24c52918d3ed5e7d3ae820a Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Thu, 14 Dec 2017 17:34:32 -0800
Subject: [PATCH 41/75] Update dialog styles to material 2

bug: 69930374
Test: Manually tested
Change-Id: I3921dc09dca9c11e7c5b86e29f3ab88436559578
---
 library/gingerbread/res/values/styles.xml |  4 ++++
 library/main/res/values-v22/styles.xml    | 23 +++++++++++++++++++++++
 library/main/res/values/styles.xml        |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 library/main/res/values-v22/styles.xml

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 1653938..5dab7db 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -277,4 +277,8 @@
         <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg_light</item>
     </style>
 
+
+    <style name="SuwAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert" />
+
+    <style name="SuwAlertDialogTheme.Light" parent="Theme.AppCompat.Light.Dialog.Alert" />
 </resources>
diff --git a/library/main/res/values-v22/styles.xml b/library/main/res/values-v22/styles.xml
new file mode 100644
index 0000000..fc7efbf
--- /dev/null
+++ b/library/main/res/values-v22/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+
+<resources>
+
+    <style name="SuwAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert" />
+
+    <style name="SuwAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog" />
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 1d7d28b..ba93705 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -32,6 +32,7 @@
         <item name="suwScrollIndicators">top|bottom</item>
         <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <!-- TODO: Change color -->
         <item name="android:editTextStyle">@style/SuwEditText</item>
+        <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme</item>
     </style>
 
     <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
@@ -47,6 +48,7 @@
         <item name="suwScrollIndicators">top|bottom</item>
         <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item>
         <item name="android:editTextStyle">@style/SuwEditText</item>
+        <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme.Light</item>
     </style>
 
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">

From 7285677e040945d6b4235b40a7f70317b9b0eaad Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Tue, 19 Dec 2017 12:28:25 -0800
Subject: [PATCH 42/75] Extend Alert theme and not dialog

bug: 69930374
Test: Manually tested and verified
Change-Id: Id005df7bd78c8fc25ba61fca417be237ceebb046
---
 library/main/res/values-v22/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/main/res/values-v22/styles.xml b/library/main/res/values-v22/styles.xml
index fc7efbf..7d2d219 100644
--- a/library/main/res/values-v22/styles.xml
+++ b/library/main/res/values-v22/styles.xml
@@ -19,5 +19,5 @@
 
     <style name="SuwAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert" />
 
-    <style name="SuwAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog" />
+    <style name="SuwAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert" />
 </resources>
\ No newline at end of file

From a073b842bb91a2b0af0ce8f51f51115ca5f92d2b Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 21 Dec 2017 19:19:06 -0800
Subject: [PATCH 43/75] Deprecate SUW lib platform variant

It's becoming too hard to develop without support lib with the lack
of recycler view and other newer support lib features. Please migrate
to common-gingerbread at your convenience.

Test: Builds. This change should be a no-op (simply renaming files)
Bug: 33298315
Change-Id: I2e2a23ae5c1f554d8c62728b60d3ba59a60e458c
---
 library/{common.mk => common-platform-deprecated.mk} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename library/{common.mk => common-platform-deprecated.mk} (83%)

diff --git a/library/common.mk b/library/common-platform-deprecated.mk
similarity index 83%
rename from library/common.mk
rename to library/common-platform-deprecated.mk
index 3372cf2..bc190d0 100644
--- a/library/common.mk
+++ b/library/common-platform-deprecated.mk
@@ -1,3 +1,4 @@
+# DEPRECATED: This variant is no longer maintained. Use common-gingerbread instead
 #
 # Include this make file to build your application against this module.
 #
@@ -9,7 +10,7 @@
 #   LOCAL_RESOURCE_DIR := \
 #        $(LOCAL_PATH)/res
 #
-#   include frameworks/opt/setupwizard/library/common.mk
+#   include frameworks/opt/setupwizard/library/common-platform-deprecated.mk
 #
 
 # Path to directory of setup wizard lib (e.g. frameworks/opt/setupwizard/library)

From 9cd96c1c7b8ce846e1ba515ba98eb5548066b30b Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 21 Dec 2017 19:12:31 -0800
Subject: [PATCH 44/75] Upgrade to new version of support-test libs

The new libraries fixes bugs with UiThreadTest, and also is also
able to run Parameterized tests on continuous infrastructure.

Test: Run forrest command (go/paste/5209188573642752)
Bug: 70986599
Bug: 70986575
Change-Id: Idbb4513cfb7cb518d59c5c2c15c30230618c384d
---
 library/self.gradle                              | 4 ++--
 library/test/instrumentation/AndroidManifest.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/self.gradle b/library/self.gradle
index f455952..8a225c8 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -13,8 +13,8 @@ android.sourceSets {
         res.srcDirs = ['test/instrumentation/res']
 
         dependencies {
-            androidTestImplementation 'com.android.support.test:rules:0.5'
-            androidTestImplementation 'com.android.support.test:runner:0.5'
+            androidTestImplementation 'com.android.support.test:rules:1.0.0'
+            androidTestImplementation 'com.android.support.test:runner:1.0.0'
             androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
             androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
             androidTestImplementation 'junit:junit:4.+'
diff --git a/library/test/instrumentation/AndroidManifest.xml b/library/test/instrumentation/AndroidManifest.xml
index 44d923f..0cbc9c1 100644
--- a/library/test/instrumentation/AndroidManifest.xml
+++ b/library/test/instrumentation/AndroidManifest.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android.setupwizardlib.test">
 
-    <uses-sdk tools:overrideLibrary="android.support.test,android.app,android.support.test.rule" />
+    <uses-sdk tools:overrideLibrary="android.support.test.rules,android.support.test.runner" />
 
     <application>
         <activity android:name=".util.DrawingTestActivity" />

From 3a3d478a4b8805992f9558fa8128261970d2ee99 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 2 Jan 2018 20:45:07 -0800
Subject: [PATCH 45/75] More app bar support in GlifLayout

- Add app:suwStickyHeader attribute to GlifLayout to specify a
  custom app bar layout, which can be a Toolbar.
- Create indirection attribute ?attr/suwGlifIconStyle to allow apps
  to override the GLIF icon style.

Test: ./gradlew test
Bug: 68826871
Change-Id: I6384db970582c56431b6085bb172f6ca28099f9d
---
 library/gingerbread/res/values/styles.xml     |  2 +
 .../suw_glif_blank_template_content.xml       |  5 +++
 library/main/res/layout/suw_glif_header.xml   |  2 +-
 .../layout/suw_glif_list_template_content.xml |  5 +++
 .../res/layout/suw_glif_template_content.xml  |  5 +++
 library/main/res/values/attrs.xml             |  4 +-
 .../android/setupwizardlib/GlifLayout.java    | 23 ++++++++++-
 .../setupwizardlib/TemplateLayout.java        |  2 +-
 library/platform/res/values-v23/styles.xml    |  2 +
 .../suw_glif_recycler_template_content.xml    |  5 +++
 .../setupwizardlib/GlifRecyclerLayout.java    |  4 +-
 .../SetupWizardRecyclerLayout.java            |  4 +-
 .../setupwizardlib/GlifLayoutTest.java        | 41 +++++++++++++++++++
 13 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 3399178..d9930f4 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -109,6 +109,7 @@
         <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
         <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
         <item name="suwGlifHeaderGravity">start</item>
+        <item name="suwGlifIconStyle">@style/SuwGlifIcon</item>
         <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
@@ -144,6 +145,7 @@
         <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
         <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
         <item name="suwGlifHeaderGravity">start</item>
+        <item name="suwGlifIconStyle">@style/SuwGlifIcon</item>
         <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
diff --git a/library/main/res/layout/suw_glif_blank_template_content.xml b/library/main/res/layout/suw_glif_blank_template_content.xml
index ed81126..6d864cd 100644
--- a/library/main/res/layout/suw_glif_blank_template_content.xml
+++ b/library/main/res/layout/suw_glif_blank_template_content.xml
@@ -21,6 +21,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <ViewStub
+        android:id="@+id/suw_layout_sticky_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <FrameLayout
         android:id="@+id/suw_layout_content"
         android:layout_width="match_parent"
diff --git a/library/main/res/layout/suw_glif_header.xml b/library/main/res/layout/suw_glif_header.xml
index cfabcb1..420e989 100644
--- a/library/main/res/layout/suw_glif_header.xml
+++ b/library/main/res/layout/suw_glif_header.xml
@@ -23,7 +23,7 @@
 
     <ImageView
         android:id="@+id/suw_layout_icon"
-        style="@style/SuwGlifIcon"
+        style="?attr/suwGlifIconStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@null"
diff --git a/library/main/res/layout/suw_glif_list_template_content.xml b/library/main/res/layout/suw_glif_list_template_content.xml
index d0c5cc4..58ca178 100644
--- a/library/main/res/layout/suw_glif_list_template_content.xml
+++ b/library/main/res/layout/suw_glif_list_template_content.xml
@@ -22,6 +22,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <ViewStub
+        android:id="@+id/suw_layout_sticky_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <!-- Ignore UnusedAttribute: scrollIndicators is new in M. Default to no indicators in older
          versions. -->
     <com.android.setupwizardlib.view.StickyHeaderListView
diff --git a/library/main/res/layout/suw_glif_template_content.xml b/library/main/res/layout/suw_glif_template_content.xml
index 0fe35a0..5226f63 100644
--- a/library/main/res/layout/suw_glif_template_content.xml
+++ b/library/main/res/layout/suw_glif_template_content.xml
@@ -22,6 +22,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <ViewStub
+        android:id="@+id/suw_layout_sticky_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <!-- Ignore UnusedAttribute: scrollIndicators is new in M. Default to no indicators in older
          versions. -->
     <com.android.setupwizardlib.view.BottomScrollView
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index ffdf365..93e4da6 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -38,13 +38,14 @@
         <!-- Push object to the end of its container, not changing its size. -->
         <flag name="end" value="0x00800005" />
     </attr>
+    <attr name="suwGlifIconStyle" format="reference" />
 
     <attr name="suwCardBackground" format="color|reference" />
-    <attr name="suwFillContentLayoutStyle" format="reference" />
     <attr name="suwDividerCondition">
         <enum name="either" value="0" />
         <enum name="both" value="1" />
     </attr>
+    <attr name="suwFillContentLayoutStyle" format="reference" />
     <attr name="suwListItemIconColor" format="color" />
     <attr name="suwNavBarBackgroundColor" format="color" />
     <attr name="suwNavBarButtonBackground" format="color|reference" />
@@ -104,6 +105,7 @@
         <attr name="suwColorPrimary" />
         <attr name="suwFooter" format="reference" />
         <attr name="suwLayoutFullscreen" format="boolean" />
+        <attr name="suwStickyHeader" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="SuwStatusBarBackgroundLayout">
diff --git a/library/main/src/com/android/setupwizardlib/GlifLayout.java b/library/main/src/com/android/setupwizardlib/GlifLayout.java
index dd0963b..e1d9d70 100644
--- a/library/main/src/com/android/setupwizardlib/GlifLayout.java
+++ b/library/main/src/com/android/setupwizardlib/GlifLayout.java
@@ -141,6 +141,11 @@ public class GlifLayout extends TemplateLayout {
             inflateFooter(footer);
         }
 
+        final int stickyHeader = a.getResourceId(R.styleable.SuwGlifLayout_suwStickyHeader, 0);
+        if (stickyHeader != 0) {
+            inflateStickyHeader(stickyHeader);
+        }
+
         mLayoutFullscreen = a.getBoolean(R.styleable.SuwGlifLayout_suwLayoutFullscreen, true);
 
         a.recycle();
@@ -168,17 +173,31 @@ public class GlifLayout extends TemplateLayout {
 
     /**
      * Sets the footer of the layout, which is at the bottom of the content area outside the
-     * scrolling container. The footer can only be inflated once per layout.
+     * scrolling container. The footer can only be inflated once per instance of this layout.
      *
      * @param footer The layout to be inflated as footer.
      * @return The root of the inflated footer view.
      */
     public View inflateFooter(@LayoutRes int footer) {
-        ViewStub footerStub = (ViewStub) findManagedViewById(R.id.suw_layout_footer);
+        ViewStub footerStub = findManagedViewById(R.id.suw_layout_footer);
         footerStub.setLayoutResource(footer);
         return footerStub.inflate();
     }
 
+    /**
+     * Sets the sticky header (i.e. header that doesn't scroll) of the layout, which is at the top
+     * of the content area outside of the scrolling container. The header can only be inflated once
+     * per instance of this layout.
+     *
+     * @param header The layout to be inflated as the header.
+     * @return The root of the inflated header view.
+     */
+    public View inflateStickyHeader(@LayoutRes int header) {
+        ViewStub stickyHeaderStub = findManagedViewById(R.id.suw_layout_sticky_header);
+        stickyHeaderStub.setLayoutResource(header);
+        return stickyHeaderStub.inflate();
+    }
+
     public ScrollView getScrollView() {
         final View view = findManagedViewById(R.id.suw_scroll_view);
         return view instanceof ScrollView ? (ScrollView) view : null;
diff --git a/library/main/src/com/android/setupwizardlib/TemplateLayout.java b/library/main/src/com/android/setupwizardlib/TemplateLayout.java
index 771592f..bd430db 100644
--- a/library/main/src/com/android/setupwizardlib/TemplateLayout.java
+++ b/library/main/src/com/android/setupwizardlib/TemplateLayout.java
@@ -103,7 +103,7 @@ public class TemplateLayout extends FrameLayout {
      * by this view but not currently added to the view hierarchy. e.g. recycler view or list view
      * headers that are not currently shown.
      */
-    public View findManagedViewById(int id) {
+    public <T extends View> T findManagedViewById(int id) {
         return findViewById(id);
     }
 
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 61a75fb..2f06636 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -108,6 +108,7 @@
         <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
         <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
         <item name="suwGlifHeaderGravity">start</item>
+        <item name="suwGlifIconStyle">@style/SuwGlifIcon</item>
         <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
@@ -140,6 +141,7 @@
         <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
         <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
         <item name="suwGlifHeaderGravity">start</item>
+        <item name="suwGlifIconStyle">@style/SuwGlifIcon</item>
         <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
diff --git a/library/recyclerview/res/layout/suw_glif_recycler_template_content.xml b/library/recyclerview/res/layout/suw_glif_recycler_template_content.xml
index e8d209b..c16f85a 100644
--- a/library/recyclerview/res/layout/suw_glif_recycler_template_content.xml
+++ b/library/recyclerview/res/layout/suw_glif_recycler_template_content.xml
@@ -23,6 +23,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <ViewStub
+        android:id="@+id/suw_layout_sticky_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <!-- Ignore UnusedAttribute: scrollIndicators is new in M. Default to no indicators in older
          versions. -->
     <com.android.setupwizardlib.view.HeaderRecyclerView
diff --git a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
index 75b1c7a..b681dee 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
@@ -107,10 +107,10 @@ public class GlifRecyclerLayout extends GlifLayout {
     }
 
     @Override
-    public View findManagedViewById(int id) {
+    public <T extends View> T findManagedViewById(int id) {
         final View header = mRecyclerMixin.getHeader();
         if (header != null) {
-            final View view = header.findViewById(id);
+            final T view = header.findViewById(id);
             if (view != null) {
                 return view;
             }
diff --git a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
index 5ff825d..c5b5afc 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
@@ -127,10 +127,10 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout {
     }
 
     @Override
-    public View findManagedViewById(int id) {
+    public <T extends View> T findManagedViewById(int id) {
         final View header = mRecyclerMixin.getHeader();
         if (header != null) {
-            final View view = header.findViewById(id);
+            final T view = header.findViewById(id);
             if (view != null) {
                 return view;
             }
diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
index 360dfe2..e07d5fa 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
@@ -267,6 +267,47 @@ public class GlifLayoutTest {
         assertNotNull(layout.findViewById(android.R.id.text1));
     }
 
+    @Test
+    public void inflateStickyHeader_shouldAddViewToLayout() {
+        GlifLayout layout = new GlifLayout(mContext);
+
+        final View view = layout.inflateStickyHeader(android.R.layout.simple_list_item_1);
+        assertEquals(android.R.id.text1, view.getId());
+        assertNotNull(layout.findViewById(android.R.id.text1));
+    }
+
+    @Config(qualifiers = "sw600dp")
+    @Test
+    public void inflateStickyHeader_whenOnTablets_shouldAddViewToLayout() {
+        inflateStickyHeader_shouldAddViewToLayout();
+    }
+
+    @Test
+    public void inflateStickyHeader_whenInXml_shouldAddViewToLayout() {
+        GlifLayout layout = new GlifLayout(
+                mContext,
+                Robolectric.buildAttributeSet()
+                        .addAttribute(R.attr.suwStickyHeader, "@android:layout/simple_list_item_1")
+                        .build());
+
+        assertNotNull(layout.findViewById(android.R.id.text1));
+    }
+
+    @Test
+    public void inflateStickyHeader_whenOnBlankTemplate_shouldAddViewToLayout() {
+        GlifLayout layout = new GlifLayout(mContext, R.layout.suw_glif_blank_template);
+
+        final View view = layout.inflateStickyHeader(android.R.layout.simple_list_item_1);
+        assertEquals(android.R.id.text1, view.getId());
+        assertNotNull(layout.findViewById(android.R.id.text1));
+    }
+
+    @Config(qualifiers = "sw600dp")
+    @Test
+    public void inflateStickyHeader_whenOnBlankTemplateTablet_shouldAddViewToLayout() {
+        inflateStickyHeader_whenOnBlankTemplate_shouldAddViewToLayout();
+    }
+
     @Config(sdk = { VERSION_CODES.M, Config.NEWEST_SDK })
     @Test
     public void createFromXml_shouldSetLayoutFullscreen_whenLayoutFullscreenIsNotSet() {

From f344307345a421dc89650799c38ad74ced44ee38 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 10 Jan 2018 15:27:42 -0800
Subject: [PATCH 46/75] Add error-prone to gradle build

So that error prone failures can be caught before dropping to
Google3.

Test: make
Change-Id: I0ff6f7a4c124433d907703fd1204395c34bab6bf
---
 .../android/setupwizardlib/items/ButtonBarItem.java  |  1 +
 library/self.gradle                                  | 12 ++++++++++++
 .../setupwizardlib/test/GlifPatternDrawableTest.java |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java b/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java
index 55bbe75..06ce4ac 100644
--- a/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java
+++ b/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java
@@ -83,6 +83,7 @@ public class ButtonBarItem extends AbstractItem implements ItemInflater.ItemPare
         return mVisible;
     }
 
+    @Override
     public int getViewId() {
         return getId();
     }
diff --git a/library/self.gradle b/library/self.gradle
index 8a225c8..4f9c5ba 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -5,6 +5,18 @@ apply from: 'standalone-rules.gradle'
 apply from: '../tools/gradle/dist-library-instrumentation-tests.gradle'
 apply from: '../tools/gradle/dist-unit-tests.gradle'
 
+apply plugin: 'net.ltgt.errorprone'
+
+buildscript {
+    repositories {
+        maven { url "$rootDir/prebuilts/tools/common/m2/repository" }
+    }
+
+    dependencies {
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
+    }
+}
+
 // Add targets for tests
 android.sourceSets {
     androidTest {
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java
index 99c87fb..37ac41a 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java
@@ -137,7 +137,7 @@ public class GlifPatternDrawableTest {
         assertEquals("Matrices should match", expected, canvas.getMatrix());
     }
 
-    @SmallTest
+    @Test
     public void testScaleToCanvasMaxSize() {
         final Canvas canvas = new Canvas();
         final Matrix expected = new Matrix(canvas.getMatrix());

From cd62078b7cc0eb272104769e48156e66463a95a2 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 8 Jan 2018 17:34:01 -0800
Subject: [PATCH 47/75] Use light nav bar for GLIF V3 on API v27+

Test: ./gradlew test
Bug: 70896202
Change-Id: I742e807bca40b0a77158293f0d0cce52bc0cad3f
---
 library/gingerbread/res/values-v27/styles.xml | 27 ++++++++
 library/gingerbread/res/values/styles.xml     |  3 +-
 library/main/res/values/colors.xml            |  1 +
 .../res/{values-v23 => values-v27}/styles.xml |  2 +
 library/rules.gradle                          |  2 +-
 library/self.gradle                           |  4 +-
 .../setupwizardlib/GlifLayoutTest.java        | 12 ++--
 .../setupwizardlib/util/GlifV3StyleTest.java  | 67 +++++++++++++++++++
 8 files changed, 109 insertions(+), 9 deletions(-)
 create mode 100644 library/gingerbread/res/values-v27/styles.xml
 rename library/platform/res/{values-v23 => values-v27}/styles.xml (98%)
 create mode 100644 library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java

diff --git a/library/gingerbread/res/values-v27/styles.xml b/library/gingerbread/res/values-v27/styles.xml
new file mode 100644
index 0000000..babfb46
--- /dev/null
+++ b/library/gingerbread/res/values-v27/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 Google Inc.
+
+    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.
+-->
+
+<resources>
+
+    <!-- Not needed for dark theme, as default nav bar bg color is black. We need a separate style
+         override here since windowLightNavigationBar is new in v27, and these two styles need to be
+         applied together as a unit. -->
+    <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light">
+        <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index d9930f4..60a39a0 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -159,9 +159,10 @@
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
     </style>
 
-    <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
+    <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
     </style>
+    <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" />
 
     <!-- Content styles -->
 
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index e919f4b..aaaf39f 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -46,5 +46,6 @@
     <color name="suw_glif_background_color_dark">#ff000000</color>
     <color name="suw_glif_background_color_light">#ffffffff</color>
     <color name="suw_glif_edit_text_bg_light_color">#fff1f3f4</color>
+    <color name="suw_glif_v3_nav_bar_color_light">#ffffffff</color>
 
 </resources>
diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v27/styles.xml
similarity index 98%
rename from library/platform/res/values-v23/styles.xml
rename to library/platform/res/values-v27/styles.xml
index 2f06636..4704ccf 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -155,6 +155,8 @@
 
     <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
+        <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <!-- Button styles -->
diff --git a/library/rules.gradle b/library/rules.gradle
index e261a4c..f6dfafc 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -19,7 +19,7 @@ android {
         // DEPRECATED: Platform version that will not include the compatibility libraries
         platformDeprecated {
             dimension 'compat'
-            minSdkVersion 23
+            minSdkVersion 27
         }
 
         // Provides backwards compatibility for Gingerbread or above, using support libraries.
diff --git a/library/self.gradle b/library/self.gradle
index 4f9c5ba..008797a 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -50,8 +50,8 @@ android.sourceSets {
         java.srcDirs = ['test/robotest/src']
 
         dependencies {
-            testImplementation 'org.robolectric:robolectric:3.4.2'
-            testImplementation 'org.robolectric:framework:3.4.2'
+            testImplementation 'org.robolectric:robolectric:3.6.1'
+            testImplementation 'org.robolectric:shadows-framework:3.6.1'
             testImplementation 'junit:junit:4.+'
             testImplementation 'org.mockito:mockito-core:1.9.5'
             // Workaround for https://github.com/robolectric/robolectric/issues/2566
diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
index e07d5fa..d2d1ee0 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java
@@ -32,6 +32,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.IdRes;
 import android.view.ContextThemeWrapper;
@@ -308,17 +309,18 @@ public class GlifLayoutTest {
         inflateStickyHeader_whenOnBlankTemplate_shouldAddViewToLayout();
     }
 
-    @Config(sdk = { VERSION_CODES.M, Config.NEWEST_SDK })
+    @Config(minSdk = Config.OLDEST_SDK, maxSdk = Config.NEWEST_SDK)
     @Test
     public void createFromXml_shouldSetLayoutFullscreen_whenLayoutFullscreenIsNotSet() {
         GlifLayout layout = new GlifLayout(
                 mContext,
                 Robolectric.buildAttributeSet()
                         .build());
-
-        assertEquals(
-                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
-                layout.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+        if (VERSION.SDK_INT >= VERSION_CODES.M) {
+            assertEquals(
+                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
+                    layout.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+        }
     }
 
     @Test
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
new file mode 100644
index 0000000..ffc40da
--- /dev/null
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+package com.android.setupwizardlib.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.android.setupwizardlib.R;
+import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+
+@RunWith(SuwLibRobolectricTestRunner.class)
+@Config(minSdk = Config.OLDEST_SDK, maxSdk = Config.NEWEST_SDK)
+public class GlifV3StyleTest {
+
+    @Test
+    public void activityWithGlifV3Theme_shouldUseLightNavBarOnV27OrAbove() {
+        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+        if (VERSION.SDK_INT >= VERSION_CODES.O_MR1) {
+            assertEquals(
+                    activity.getWindow().getNavigationBarColor(),
+                    Color.WHITE);
+            int vis = activity.getWindow().getDecorView().getSystemUiVisibility();
+            assertTrue((vis & View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0);
+        } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+            assertEquals(
+                    activity.getWindow().getNavigationBarColor(),
+                    Color.BLACK);
+        }
+        // Nav bar color is not customizable pre-L
+    }
+
+    private static class GlifThemeActivity extends Activity {
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            setTheme(R.style.SuwThemeGlifV3_Light);
+            super.onCreate(savedInstanceState);
+        }
+    }
+}

From 78bc2e0c900935ed00e111a0c4b93b50d883e2b9 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 11 Jan 2018 18:43:23 -0800
Subject: [PATCH 48/75] Implement GLIF v3 button style

Buttons are now sentence case and uses Google sans font if available.

Test: ./gradlew test
Bug: 71759812
Change-Id: Ibb42b58306163f387837600ca52e73065c2b0d9d
---
 library/gingerbread/res/values/styles.xml      | 18 ++++++++++++++++++
 library/main/res/values/attrs.xml              |  2 ++
 library/main/res/values/config.xml             |  3 +++
 library/main/res/values/styles.xml             |  4 +++-
 library/platform/res/values-v27/styles.xml     | 18 ++++++++++++++++++
 library/self.gradle                            |  1 +
 .../setupwizardlib/util/GlifV3StyleTest.java   | 17 +++++++++++++++++
 7 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 60a39a0..7a01fe7 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -39,6 +39,8 @@
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
         <item name="suwDividerInsetEnd">0dp</item>
         <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
@@ -71,6 +73,8 @@
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_light</item>
         <item name="suwDividerInsetEnd">0dp</item>
         <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
@@ -103,6 +107,8 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_dark</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -139,6 +145,8 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_light</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -157,10 +165,14 @@
 
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
+        <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
     </style>
 
     <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
+        <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
     </style>
     <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" />
 
@@ -214,8 +226,11 @@
         <item name="buttonStyle">@style/SuwGlifButton.Primary</item>
 
         <!-- Values used in styles -->
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">?attr/suwButtonFontFamily</item>
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
+        <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/suwButtonAllCaps</item>
+        <item name="textAllCaps">?attr/suwButtonAllCaps</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -227,9 +242,12 @@
         <item name="buttonStyle">@style/SuwGlifButton.Secondary</item>
 
         <!-- Values used in styles -->
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">?attr/suwButtonFontFamily</item>
         <item name="android:minWidth">0dp</item>
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
+        <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/suwButtonAllCaps</item>
+        <item name="textAllCaps">?attr/suwButtonAllCaps</item>
 
         <!-- Values used in themes -->
         <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 93e4da6..7a7580d 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -40,6 +40,8 @@
     </attr>
     <attr name="suwGlifIconStyle" format="reference" />
 
+    <attr name="suwButtonAllCaps" format="boolean" />
+    <attr name="suwButtonFontFamily" format="string|reference" />
     <attr name="suwCardBackground" format="color|reference" />
     <attr name="suwDividerCondition">
         <enum name="either" value="0" />
diff --git a/library/main/res/values/config.xml b/library/main/res/values/config.xml
index a81b177..7fe5f9f 100644
--- a/library/main/res/values/config.xml
+++ b/library/main/res/values/config.xml
@@ -27,4 +27,7 @@
          ButtonBarLayout -->
     <item name="suw_original_weight" type="id" />
 
+    <!-- Secondary font for use with headings, title, and other non-body text -->
+    <string name="suwFontSecondary" translatable="false">google-sans</string>
+
 </resources>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 89cbb63..dbd5358 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -199,6 +199,8 @@
         <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
         <item name="android:layout_gravity">?attr/suwGlifHeaderGravity</item>
         <item name="android:padding">0dp</item>
+        <!-- Always lowercase instead of reading attr/suwButtonAllCaps, since this is a tertiary
+             button -->
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item>
     </style>
 
@@ -268,7 +270,7 @@
         <item name="android:layout_marginLeft">?attr/suwMarginSides</item>
         <item name="android:layout_marginRight">?attr/suwMarginSides</item>
         <item name="android:layout_marginTop">@dimen/suw_glif_header_title_margin_top</item>
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">google-sans</item>
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/suwFontSecondary</item>
         <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index 4704ccf..1dcb1d9 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -41,6 +41,8 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -70,6 +72,8 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -102,6 +106,8 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -135,6 +141,8 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
         <item name="suwDividerInsetEnd">0dp</item>
@@ -151,12 +159,18 @@
 
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
+
+        <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
     </style>
 
     <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
         <item name="android:windowLightNavigationBar">true</item>
+
+        <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
     </style>
 
     <!-- Button styles -->
@@ -168,8 +182,10 @@
         <item name="android:buttonStyle">@style/SuwGlifButton.Primary</item>
 
         <!-- Values used in styles -->
+        <item name="android:fontFamily">?attr/suwButtonFontFamily</item>
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
+        <item name="android:textAllCaps">?attr/suwButtonAllCaps</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="android:Widget.Material.Button.Borderless.Colored">
@@ -180,9 +196,11 @@
         <item name="android:theme">@style/SuwGlifButton.Secondary</item>
 
         <!-- Values used in styles -->
+        <item name="android:fontFamily">?attr/suwButtonFontFamily</item>
         <item name="android:minWidth">0dp</item>
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
+        <item name="android:textAllCaps">?attr/suwButtonAllCaps</item>
 
         <!-- Values used in themes -->
         <item name="android:colorControlHighlight">@color/suw_flat_button_highlight</item>
diff --git a/library/self.gradle b/library/self.gradle
index 008797a..86dea0e 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -53,6 +53,7 @@ android.sourceSets {
             testImplementation 'org.robolectric:robolectric:3.6.1'
             testImplementation 'org.robolectric:shadows-framework:3.6.1'
             testImplementation 'junit:junit:4.+'
+            testImplementation 'com.google.truth:truth:0.31'
             testImplementation 'org.mockito:mockito-core:1.9.5'
             // Workaround for https://github.com/robolectric/robolectric/issues/2566
             testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
index ffc40da..613f2aa 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
@@ -16,16 +16,20 @@
 
 package com.android.setupwizardlib.util;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.Button;
 
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
@@ -56,6 +60,19 @@ public class GlifV3StyleTest {
         // Nav bar color is not customizable pre-L
     }
 
+    @Test
+    public void buttonWithGlifV3_shouldBeGoogleSans() {
+        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+        Button button = new Button(
+                activity,
+                Robolectric.buildAttributeSet()
+                        .setStyleAttribute("@style/SuwGlifButton.Primary")
+                        .build());
+        assertThat(button.getTypeface()).isEqualTo(Typeface.create("google-sans", 0));
+        // Button should not be all caps
+        assertThat(button.getTransformationMethod()).isNull();
+    }
+
     private static class GlifThemeActivity extends Activity {
 
         @Override

From f2c8c89ad6048dd304f36928f1cddacbe7dbd920 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 29 Jan 2018 16:12:44 -0800
Subject: [PATCH 49/75] Add timeout to consecutive tap gesture

Test: ./gradlew test
Bug: 72202690
Change-Id: Ia227cc38cfb54e4f33d34adfffdc6c38543060d5
---
 .../ConsecutiveTapsGestureDetector.java       |   6 +-
 .../ConsecutiveTapsGestureDetectorTest.java   | 118 ++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 library/test/robotest/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetectorTest.java

diff --git a/library/main/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetector.java b/library/main/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetector.java
index 8325232..f438691 100644
--- a/library/main/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetector.java
+++ b/library/main/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetector.java
@@ -39,6 +39,7 @@ public final class ConsecutiveTapsGestureDetector {
     private final View mView;
     private final OnConsecutiveTapsListener mListener;
     private final int mConsecutiveTapTouchSlopSquare;
+    private final int mConsecutiveTapTimeout;
 
     private int mConsecutiveTapsCounter = 0;
     private MotionEvent mPreviousTapEvent;
@@ -54,6 +55,7 @@ public final class ConsecutiveTapsGestureDetector {
         mView = view;
         int doubleTapSlop = ViewConfiguration.get(mView.getContext()).getScaledDoubleTapSlop();
         mConsecutiveTapTouchSlopSquare = doubleTapSlop * doubleTapSlop;
+        mConsecutiveTapTimeout = ViewConfiguration.getDoubleTapTimeout();
     }
 
     /**
@@ -109,6 +111,8 @@ public final class ConsecutiveTapsGestureDetector {
 
         double deltaX = mPreviousTapEvent.getX() - currentTapEvent.getX();
         double deltaY = mPreviousTapEvent.getY() - currentTapEvent.getY();
-        return (deltaX * deltaX + deltaY * deltaY <= mConsecutiveTapTouchSlopSquare);
+        long deltaTime = currentTapEvent.getEventTime() - mPreviousTapEvent.getEventTime();
+        return (deltaX * deltaX + deltaY * deltaY <= mConsecutiveTapTouchSlopSquare)
+                && deltaTime < mConsecutiveTapTimeout;
     }
 }
diff --git a/library/test/robotest/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetectorTest.java b/library/test/robotest/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetectorTest.java
new file mode 100644
index 0000000..aa2cce3
--- /dev/null
+++ b/library/test/robotest/src/com/android/setupwizardlib/gesture/ConsecutiveTapsGestureDetectorTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+package com.android.setupwizardlib.gesture;
+
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+
+import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
+@RunWith(SuwLibRobolectricTestRunner.class)
+public class ConsecutiveTapsGestureDetectorTest {
+
+    @Mock
+    private ConsecutiveTapsGestureDetector.OnConsecutiveTapsListener mListener;
+
+    private ConsecutiveTapsGestureDetector mDetector;
+    private int mSlop;
+    private int mTapTimeout;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        View view = new View(application);
+        view.measure(500, 500);
+        view.layout(0, 0, 500, 500);
+        mDetector = new ConsecutiveTapsGestureDetector(mListener, view);
+
+        mSlop = ViewConfiguration.get(application).getScaledDoubleTapSlop();
+        mTapTimeout = ViewConfiguration.getDoubleTapTimeout();
+    }
+
+    @Test
+    public void onTouchEvent_shouldTriggerCallbackOnFourTaps() {
+        InOrder inOrder = inOrder(mListener);
+
+        tap(0, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(1));
+
+        tap(100, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(2));
+
+        tap(200, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(3));
+
+        tap(300, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(4));
+    }
+
+    @Test
+    public void onTouchEvent_tapOnDifferentLocation_shouldResetCounter() {
+        InOrder inOrder = inOrder(mListener);
+
+        tap(0, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(1));
+
+        tap(100, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(2));
+
+        tap(200, 25f + mSlop * 2, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(1));
+
+        tap(300, 25f + mSlop * 2, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(2));
+    }
+
+    @Test
+    public void onTouchEvent_tapAfterTimeout_shouldResetCounter() {
+        InOrder inOrder = inOrder(mListener);
+
+        tap(0, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(1));
+
+        tap(100, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(2));
+
+        tap(200 + mTapTimeout, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(1));
+
+        tap(300 + mTapTimeout, 25f, 25f);
+        inOrder.verify(mListener).onConsecutiveTaps(eq(2));
+    }
+
+    private void tap(int timeMillis, float x, float y) {
+        mDetector.onTouchEvent(
+                MotionEvent.obtain(timeMillis, timeMillis, MotionEvent.ACTION_DOWN, x, y, 0));
+        mDetector.onTouchEvent(
+                MotionEvent.obtain(timeMillis, timeMillis + 10, MotionEvent.ACTION_UP, x, y, 0));
+    }
+}

From c9c5c4431a920e8a22d96bf3721e2c5377c9b57b Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 1 Feb 2018 18:01:33 -0800
Subject: [PATCH 50/75] Set the back button sysUiVisibility as well

Changes to window sysUiVisibility is not picked up after the window
is laid out, so add a call to set the decor view's sysUiVisibility as
well.

Test: ./gradlew connectedAndroidTest
Bug: 72840994
Change-Id: I6f0744599f46adf1840738f226b4394e5b7ed1df
---
 .../setupwizardlib/util/SystemBarHelper.java  | 18 +++++++++++++++--
 library/self.gradle                           |  1 +
 .../test/SystemBarHelperTest.java             | 20 ++++++++++++++-----
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java b/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java
index 1c5f3d3..b31e82e 100644
--- a/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java
@@ -24,6 +24,7 @@ import android.content.res.TypedArray;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Handler;
+import android.support.annotation.RequiresPermission;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -183,12 +184,25 @@ public class SystemBarHelper {
         }
     }
 
+    /**
+     * Sets whether the back button on the software navigation bar is visible. This only works if
+     * you have the STATUS_BAR permission. Otherwise framework will filter out this flag and this
+     * method call will not have any effect.
+     *
+     * <p>IMPORTANT: Do not assume that users have no way to go back when the back button is hidden.
+     * Many devices have physical back buttons, and accessibility services like TalkBack may have
+     * gestures mapped to back. Please use onBackPressed, onKeyDown, or other similar ways to
+     * make sure back button events are still handled (or ignored) properly.
+     */
+    @RequiresPermission("android.permission.STATUS_BAR")
     public static void setBackButtonVisible(final Window window, final boolean visible) {
         if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
             if (visible) {
                 removeVisibilityFlag(window, STATUS_BAR_DISABLE_BACK);
+                removeImmersiveFlagsFromDecorView(window, STATUS_BAR_DISABLE_BACK);
             } else {
                 addVisibilityFlag(window, STATUS_BAR_DISABLE_BACK);
+                addImmersiveFlagsToDecorView(window, STATUS_BAR_DISABLE_BACK);
             }
         }
     }
@@ -217,7 +231,7 @@ public class SystemBarHelper {
      * {@link View#SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN} only takes effect when it is added to a view
      * instead of the window.
      */
-    @TargetApi(VERSION_CODES.LOLLIPOP)
+    @TargetApi(VERSION_CODES.HONEYCOMB)
     private static void addImmersiveFlagsToDecorView(final Window window, final int vis) {
         getDecorView(window, new OnDecorViewInstalledListener() {
             @Override
@@ -227,7 +241,7 @@ public class SystemBarHelper {
         });
     }
 
-    @TargetApi(VERSION_CODES.LOLLIPOP)
+    @TargetApi(VERSION_CODES.HONEYCOMB)
     private static void removeImmersiveFlagsFromDecorView(final Window window, final int vis) {
         getDecorView(window, new OnDecorViewInstalledListener() {
             @Override
diff --git a/library/self.gradle b/library/self.gradle
index 86dea0e..a4bff4e 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -29,6 +29,7 @@ android.sourceSets {
             androidTestImplementation 'com.android.support.test:runner:1.0.0'
             androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
             androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+            androidTestImplementation 'com.google.truth:truth:0.31'
             androidTestImplementation 'junit:junit:4.+'
             androidTestImplementation 'org.mockito:mockito-core:1.9.5'
         }
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
index d3142f1..98c28f6 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
@@ -16,6 +16,8 @@
 
 package com.android.setupwizardlib.test;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 
 import android.annotation.SuppressLint;
@@ -194,11 +196,15 @@ public class SystemBarHelperTest {
     @UiThreadTest
     @Test
     public void testSetBackButtonVisibleTrue() {
-        final Window window = createWindowWithSystemUiVisibility(0x456);
+        final Window window = createWindowWithSystemUiVisibility(STATUS_BAR_DISABLE_BACK | 0x456);
         SystemBarHelper.setBackButtonVisible(window, true);
         if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
-            assertEquals("View visibility should be 0x456", 0x456,
-                    window.getAttributes().systemUiVisibility);
+            assertThat(window.getAttributes().systemUiVisibility)
+                    .named("window sysUiVisibility")
+                    .isEqualTo(0x456);
+            assertThat(window.getDecorView().getSystemUiVisibility())
+                    .named("decor view sysUiVisibility")
+                    .isEqualTo(0x456);
         }
     }
 
@@ -208,8 +214,12 @@ public class SystemBarHelperTest {
         final Window window = createWindowWithSystemUiVisibility(0x456);
         SystemBarHelper.setBackButtonVisible(window, false);
         if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
-            assertEquals("STATUS_BAR_DISABLE_BACK should be added to systemUiVisibility",
-                    0x456 | STATUS_BAR_DISABLE_BACK, window.getAttributes().systemUiVisibility);
+            assertThat(window.getAttributes().systemUiVisibility)
+                    .named("window sysUiVisibility")
+                    .isEqualTo(0x456 | STATUS_BAR_DISABLE_BACK);
+            assertThat(window.getDecorView().getSystemUiVisibility())
+                    .named("decor view sysUiVisibility")
+                    .isEqualTo(0x456 | STATUS_BAR_DISABLE_BACK);
         }
     }
 

From 267a0cc22a71b37b71b3e79da2ccaace5a185123 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 12 Feb 2018 17:25:51 -0800
Subject: [PATCH 51/75] Add navigation bar divider color

Test: Manual
Bug: 72750512
Change-Id: Id2d80d618134056edf95b183943690c33fdbd763
---
 library/gingerbread/res/values-v27/styles.xml | 1 +
 library/main/res/values/colors.xml            | 1 +
 library/platform/res/values-v27/styles.xml    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/library/gingerbread/res/values-v27/styles.xml b/library/gingerbread/res/values-v27/styles.xml
index babfb46..a81b86b 100644
--- a/library/gingerbread/res/values-v27/styles.xml
+++ b/library/gingerbread/res/values-v27/styles.xml
@@ -22,6 +22,7 @@
          applied together as a unit. -->
     <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light">
         <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
+        <item name="android:navigationBarDividerColor">@color/suw_glif_v3_nav_bar_divider_color_light</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 </resources>
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index aaaf39f..005d1c6 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -47,5 +47,6 @@
     <color name="suw_glif_background_color_light">#ffffffff</color>
     <color name="suw_glif_edit_text_bg_light_color">#fff1f3f4</color>
     <color name="suw_glif_v3_nav_bar_color_light">#ffffffff</color>
+    <color name="suw_glif_v3_nav_bar_divider_color_light">#1f000000</color>
 
 </resources>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index 1dcb1d9..7ef0fee 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -167,6 +167,7 @@
     <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
+        <item name="android:navigationBarDividerColor">@color/suw_glif_v3_nav_bar_divider_color_light</item>
         <item name="android:windowLightNavigationBar">true</item>
 
         <item name="suwButtonAllCaps">false</item>

From 9f0065b61120ff3814a28395b57f79d499079bb4 Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Tue, 13 Feb 2018 15:02:56 -0800
Subject: [PATCH 52/75] Add method to retrieve color from partner apk

bug: 73077257
Test: Manually tested and verified
Change-Id: Ia90998780913966d3953011591d9f46e088ef963
---
 .../com/android/setupwizardlib/util/Partner.java   | 10 ++++++++++
 .../android/setupwizardlib/util/PartnerTest.java   | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/library/main/src/com/android/setupwizardlib/util/Partner.java b/library/main/src/com/android/setupwizardlib/util/Partner.java
index 67f5546..3a603ee 100644
--- a/library/main/src/com/android/setupwizardlib/util/Partner.java
+++ b/library/main/src/com/android/setupwizardlib/util/Partner.java
@@ -27,6 +27,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.AnyRes;
+import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.StringRes;
 import android.support.annotation.VisibleForTesting;
@@ -75,6 +76,15 @@ public class Partner {
         return entry.resources.getString(entry.id);
     }
 
+    /**
+     * Convenience method to get color from partner overlay, or if not available, the color from
+     * the original context.
+     */
+    public static int getColor(Context context, @ColorRes int id) {
+        final ResourceEntry resourceEntry = getResourceEntry(context, id);
+        return resourceEntry.resources.getColor(resourceEntry.id);
+    }
+
     /**
      * Convenience method to get a CharSequence from partner overlay, or if not available, the text
      * from the original context.
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
index 683e40b..f8e71be 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java
@@ -131,6 +131,20 @@ public class PartnerTest {
         assertTrue("Partner value should come from overlay", entry.isOverlay);
     }
 
+    @Test
+    public void getColor_shouldReturnPartnerValueIfPresent() {
+        final int expectedPartnerColor = 1111;
+        doReturn(12345).when(mPartnerResources)
+                .getIdentifier(eq("suw_color_accent_dark"), eq("color"), anyString());
+        doReturn(expectedPartnerColor).when(mPartnerResources).getColor(eq(12345));
+        mPackageManager.addResolveInfoForIntent(
+                new Intent(ACTION_PARTNER_CUSTOMIZATION),
+                Arrays.asList(createResolveInfo("test.partner.package", true, true)));
+        final int foundColor = Partner.getColor(mContext, R.color.suw_color_accent_dark);
+        assertEquals("Partner color should be overlayed to: " + expectedPartnerColor,
+                expectedPartnerColor, foundColor);
+    }
+
     @Test
     public void testLoadDefaultValue() {
         mPackageManager.addResolveInfoForIntent(

From 97d3a11d5e6a2bf9ec3f50de7b77ef94333110d3 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 13 Feb 2018 17:41:33 -0800
Subject: [PATCH 53/75] Add setIcon(int) to IconMixin

This allows vector drawable compat to be used on pre-L.

Test: ./gradlew connectedAndroidTest
Change-Id: I405f28eae11e68532165f89b1c1a226972ee06a3
---
 .../setupwizardlib/template/IconMixin.java    | 20 +++++++++++++++++--
 .../template/IconMixinTest.java               | 14 +++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/library/main/src/com/android/setupwizardlib/template/IconMixin.java b/library/main/src/com/android/setupwizardlib/template/IconMixin.java
index c42299b..7f5a3c9 100644
--- a/library/main/src/com/android/setupwizardlib/template/IconMixin.java
+++ b/library/main/src/com/android/setupwizardlib/template/IconMixin.java
@@ -19,6 +19,7 @@ package com.android.setupwizardlib.template;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -45,8 +46,8 @@ public class IconMixin implements Mixin {
         final TypedArray a =
                 context.obtainStyledAttributes(attrs, R.styleable.SuwIconMixin, defStyleAttr, 0);
 
-        final Drawable icon = a.getDrawable(R.styleable.SuwIconMixin_android_icon);
-        if (icon != null) {
+        final @DrawableRes int icon = a.getResourceId(R.styleable.SuwIconMixin_android_icon, 0);
+        if (icon != 0) {
             setIcon(icon);
         }
 
@@ -66,6 +67,21 @@ public class IconMixin implements Mixin {
         }
     }
 
+    /**
+     * Sets the icon on this layout. The icon can also be set in XML using {@code android:icon}.
+     *
+     * @param icon A drawable icon resource.
+     */
+    public void setIcon(@DrawableRes int icon) {
+        final ImageView iconView = getView();
+        if (iconView != null) {
+            // Note: setImageResource on the ImageView is overridden in AppCompatImageView for
+            // support lib users, which enables vector drawable compat to work on versions pre-L.
+            iconView.setImageResource(icon);
+            iconView.setVisibility(icon != 0 ? View.VISIBLE : View.GONE);
+        }
+    }
+
     /**
      * @return The icon previously set in {@link #setIcon(Drawable)} or {@code android:icon}
      */
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
index 0391392..12187a2 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
@@ -16,6 +16,8 @@
 
 package com.android.setupwizardlib.template;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.mockito.Matchers.eq;
@@ -27,6 +29,7 @@ import android.content.res.XmlResourceParser;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -78,6 +81,17 @@ public class IconMixinTest {
         assertEquals(View.VISIBLE, mIconView.getVisibility());
     }
 
+    @Test
+    public void setIcon_resourceId_shouldSetIcon() {
+        int icon = android.R.drawable.ic_menu_add;
+        IconMixin mixin = new IconMixin(mTemplateLayout, null, 0);
+        mixin.setIcon(icon);
+
+        Drawable drawable = mIconView.getDrawable();
+        assertThat(drawable).isInstanceOf(BitmapDrawable.class);
+        assertEquals(View.VISIBLE, mIconView.getVisibility());
+    }
+
     @Test
     public void setIcon_shouldSetVisibilityToGone_whenIconIsNull() {
         IconMixin mixin = new IconMixin(mTemplateLayout, null, 0);

From f034e011b28982afa69d8198bb9f56a589e19808 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 15 Feb 2018 17:43:23 -0800
Subject: [PATCH 54/75] Use google-sans-medium for GLIF buttons

Test: Manual, Existing tests pass
Bug: 73252680
Change-Id: Idb6c8821fc07eceae86f5574e3f4ec82cf3fcb8f
---
 library/gingerbread/res/values/styles.xml  | 4 ++--
 library/main/res/values/config.xml         | 1 +
 library/platform/res/values-v27/styles.xml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 7a01fe7..1dca8cd 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -166,13 +166,13 @@
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="suwButtonAllCaps">false</item>
-        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
     <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="suwButtonAllCaps">false</item>
-        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
     <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" />
 
diff --git a/library/main/res/values/config.xml b/library/main/res/values/config.xml
index 7fe5f9f..c11bf41 100644
--- a/library/main/res/values/config.xml
+++ b/library/main/res/values/config.xml
@@ -29,5 +29,6 @@
 
     <!-- Secondary font for use with headings, title, and other non-body text -->
     <string name="suwFontSecondary" translatable="false">google-sans</string>
+    <string name="suwFontSecondaryMedium" translatable="false">google-sans-medium</string>
 
 </resources>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index 7ef0fee..9284818 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -161,7 +161,7 @@
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
 
         <item name="suwButtonAllCaps">false</item>
-        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
     <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
@@ -171,7 +171,7 @@
         <item name="android:windowLightNavigationBar">true</item>
 
         <item name="suwButtonAllCaps">false</item>
-        <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
+        <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
     <!-- Button styles -->

From f0001e7af7d641c0ce3112fd913d83448725ae63 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 16 Feb 2018 12:40:25 -0800
Subject: [PATCH 55/75] Set color primary to color accent

For GLIF v3, color accent is changed, and color primary should be
changed to match as well.

Test: ./gradlew test
Bug: 73253714
Change-Id: I553f4eaccc75abaedad4cf9e31d003d6c1f64660
---
 library/gingerbread/res/values/styles.xml  | 4 ++--
 library/platform/res/values-v27/styles.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 1dca8cd..2287d27 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -104,7 +104,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="colorAccent">@color/suw_color_accent_glif_dark</item>
-        <item name="colorPrimary">@color/suw_color_accent_glif_dark</item>
+        <item name="colorPrimary">?attr/colorAccent</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwButtonAllCaps">true</item>
@@ -142,7 +142,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="colorAccent">@color/suw_color_accent_glif_light</item>
-        <item name="colorPrimary">@color/suw_color_accent_glif_light</item>
+        <item name="colorPrimary">?attr/colorAccent</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwButtonAllCaps">true</item>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index 9284818..4833d60 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -90,7 +90,7 @@
     <style name="SuwThemeGlif" parent="android:Theme.Material.NoActionBar">
         <item name="android:colorAccent">@color/suw_color_accent_glif_dark</item>
         <item name="android:colorBackground">@color/suw_glif_background_color_dark</item>
-        <item name="android:colorPrimary">@color/suw_color_accent_glif_dark</item>
+        <item name="android:colorPrimary">?android:attr/colorAccent</item>
         <item name="android:indeterminateTint">?android:attr/colorPrimary</item>
         <!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
         <item name="android:indeterminateTintMode">src_in</item>
@@ -125,7 +125,7 @@
     <style name="SuwThemeGlif.Light" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:colorAccent">@color/suw_color_accent_glif_light</item>
         <item name="android:colorBackground">@color/suw_glif_background_color_light</item>
-        <item name="android:colorPrimary">@color/suw_color_accent_glif_light</item>
+        <item name="android:colorPrimary">?android:attr/colorAccent</item>
         <item name="android:indeterminateTint">?android:attr/colorPrimary</item>
         <!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
         <item name="android:indeterminateTintMode">src_in</item>

From 5a94caca34f577b8c6d4d65acc00c8acf9666855 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 15 Feb 2018 17:49:42 -0800
Subject: [PATCH 56/75] Build against SDK 28

buttonCornerRadius was an attribute new in API 28.

Bug: 73252680
Test: ./gradlew test connectedAndroidTest
Change-Id: If8a98ef5c299f756830844ebe241d08be5126110
---
 library/gingerbread/res/values-v27/styles.xml | 8 +++++---
 library/platform/res/values-v27/styles.xml    | 8 +++++---
 tools/gradle/android.properties               | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/library/gingerbread/res/values-v27/styles.xml b/library/gingerbread/res/values-v27/styles.xml
index a81b86b..305a55e 100644
--- a/library/gingerbread/res/values-v27/styles.xml
+++ b/library/gingerbread/res/values-v27/styles.xml
@@ -15,14 +15,16 @@
     limitations under the License.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Not needed for dark theme, as default nav bar bg color is black. We need a separate style
          override here since windowLightNavigationBar is new in v27, and these two styles need to be
          applied together as a unit. -->
     <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light">
         <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
-        <item name="android:navigationBarDividerColor">@color/suw_glif_v3_nav_bar_divider_color_light</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) -->
+        <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/suw_glif_v3_nav_bar_divider_color_light</item>
+        <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) -->
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
     </style>
 </resources>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index 7ef0fee..dd77992 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -17,7 +17,7 @@
 
 <!-- These styles are only included in the platform build, to make sure that they do not
      override the corresponding styles in the compatibility build. -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- General styles -->
 
@@ -167,8 +167,10 @@
     <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item>
-        <item name="android:navigationBarDividerColor">@color/suw_glif_v3_nav_bar_divider_color_light</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) -->
+        <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/suw_glif_v3_nav_bar_divider_color_light</item>
+        <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) -->
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
 
         <item name="suwButtonAllCaps">false</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondary</item>
diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties
index 3795eee..f62de66 100644
--- a/tools/gradle/android.properties
+++ b/tools/gradle/android.properties
@@ -1,6 +1,6 @@
 // Set the default SDK and build tools version for all apps
-compileSdkVersion 27
-buildToolsVersion = '27.0.0'
+compileSdkVersion 28
+buildToolsVersion = '28.0.0'
 
 // enable Java7
 compileOptions.sourceCompatibility JavaVersion.VERSION_1_7

From 647b83757b7c257e2f0e800ee79deb4605a9abdc Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 16 Feb 2018 16:24:07 -0800
Subject: [PATCH 57/75] Suppress / fix error prone warnings

Deal with the new set of warnings introduced by new error prone
version.

Test: `make` doesn't spit out warning messages anymore
Change-Id: I1eee8e5f89f3726e9b66f0bd3fe86154ebb4b79a
---
 .../main/src/com/android/setupwizardlib/TemplateLayout.java    | 2 ++
 .../main/src/com/android/setupwizardlib/view/Illustration.java | 3 ++-
 .../src/com/android/setupwizardlib/GlifRecyclerLayout.java     | 2 ++
 .../com/android/setupwizardlib/SetupWizardRecyclerLayout.java  | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/main/src/com/android/setupwizardlib/TemplateLayout.java b/library/main/src/com/android/setupwizardlib/TemplateLayout.java
index bd430db..d270091 100644
--- a/library/main/src/com/android/setupwizardlib/TemplateLayout.java
+++ b/library/main/src/com/android/setupwizardlib/TemplateLayout.java
@@ -103,6 +103,8 @@ public class TemplateLayout extends FrameLayout {
      * by this view but not currently added to the view hierarchy. e.g. recycler view or list view
      * headers that are not currently shown.
      */
+    // Returning generic type is the common pattern used for findViewBy* methods
+    @SuppressWarnings("TypeParameterUnusedInFormals")
     public <T extends View> T findManagedViewById(int id) {
         return findViewById(id);
     }
diff --git a/library/main/src/com/android/setupwizardlib/view/Illustration.java b/library/main/src/com/android/setupwizardlib/view/Illustration.java
index b576174..c6968f8 100644
--- a/library/main/src/com/android/setupwizardlib/view/Illustration.java
+++ b/library/main/src/com/android/setupwizardlib/view/Illustration.java
@@ -137,7 +137,8 @@ public class Illustration extends FrameLayout {
         if (mAspectRatio != 0.0f) {
             int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
             int illustrationHeight = (int) (parentWidth / mAspectRatio);
-            illustrationHeight -= illustrationHeight % mBaselineGridSize;
+            illustrationHeight =
+                    (int) (illustrationHeight - (illustrationHeight % mBaselineGridSize));
             setPadding(0, illustrationHeight, 0, 0);
         }
         if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
diff --git a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
index b681dee..e8a021d 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
@@ -107,6 +107,8 @@ public class GlifRecyclerLayout extends GlifLayout {
     }
 
     @Override
+    // Returning generic type is the common pattern used for findViewBy* methods
+    @SuppressWarnings("TypeParameterUnusedInFormals")
     public <T extends View> T findManagedViewById(int id) {
         final View header = mRecyclerMixin.getHeader();
         if (header != null) {
diff --git a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
index c5b5afc..6f3aed4 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
@@ -127,6 +127,8 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout {
     }
 
     @Override
+    // Returning generic type is the common pattern used for findViewBy* methods
+    @SuppressWarnings("TypeParameterUnusedInFormals")
     public <T extends View> T findManagedViewById(int id) {
         final View header = mRecyclerMixin.getHeader();
         if (header != null) {

From b3617935a276aab4c72c11da340a1096d96225d7 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 20 Feb 2018 12:55:09 -0800
Subject: [PATCH 58/75] Set CheckableLinearLayout to focusable

So that the layout can be expanded using keyboard navigation.

Test: ./gradlew test
Bug: 72835973
Change-Id: I4fb22e0579c73cb423d52354a5887b13cc1ea77d
---
 .../items/ExpandableSwitchItemTest.java       | 69 +++++--------------
 .../view/CheckableLinearLayout.java           |  4 ++
 2 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
index 3020ed3..6192061 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
@@ -16,32 +16,27 @@
 
 package com.android.setupwizardlib.items;
 
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.not;
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.RuntimeEnvironment.application;
 
-import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
+import com.android.setupwizardlib.view.CheckableLinearLayout;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-
 @RunWith(SuwLibRobolectricTestRunner.class)
 @Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class ExpandableSwitchItemTest {
@@ -72,6 +67,12 @@ public class ExpandableSwitchItemTest {
                 "TestSummary", mSummaryView.getText());
 
         assertFalse("Expandable switch item itself should not be focusable", view.isFocusable());
+
+        View switchContent = view.findViewById(R.id.suw_items_expandable_switch_content);
+        assertThat(switchContent).isInstanceOf(CheckableLinearLayout.class);
+        assertThat(switchContent.isFocusable())
+                .named("expandable content focusable")
+                .isTrue();
     }
 
     @Test
@@ -133,57 +134,25 @@ public class ExpandableSwitchItemTest {
         mItem.onBindView(view);
 
         final View titleView = view.findViewById(R.id.suw_items_title);
-        assertThat("state_checked should not be set initially",
-                toArrayList(titleView.getDrawableState()),
-                not(hasItem(android.R.attr.state_checked)));
+        assertThat(titleView.getDrawableState()).asList().named("Drawable state")
+                .doesNotContain(android.R.attr.state_checked);
 
         mItem.setExpanded(true);
         mItem.onBindView(view);
-        assertThat("state_checked should not be set initially",
-                toArrayList(titleView.getDrawableState()),
-                hasItem(android.R.attr.state_checked));
+        assertThat(titleView.getDrawableState()).asList().named("Drawable state")
+                .contains(android.R.attr.state_checked);
 
         mItem.setExpanded(false);
         mItem.onBindView(view);
-        assertThat("state_checked should not be set initially",
-                toArrayList(titleView.getDrawableState()),
-                not(hasItem(android.R.attr.state_checked)));
-    }
-
-    private ArrayList<Integer> toArrayList(int[] array) {
-        ArrayList<Integer> arrayList = new ArrayList<>(array.length);
-        for (int i : array) {
-            arrayList.add(i);
-        }
-        return arrayList;
+        assertThat(titleView.getDrawableState()).asList().named("Drawable state")
+                .doesNotContain(android.R.attr.state_checked);
     }
 
     private ViewGroup createLayout() {
-        ViewGroup root = new FrameLayout(application);
-
-        ViewGroup content = new FrameLayout(application);
-        content.setId(R.id.suw_items_expandable_switch_content);
-        root.addView(content);
-
-        TextView titleView = new TextView(application);
-        titleView.setId(R.id.suw_items_title);
-        content.addView(titleView);
-
-        mSummaryView = new TextView(application);
-        mSummaryView.setId(R.id.suw_items_summary);
-        content.addView(mSummaryView);
-
-        FrameLayout iconContainer = new FrameLayout(application);
-        iconContainer.setId(R.id.suw_items_icon_container);
-        content.addView(iconContainer);
-
-        ImageView iconView = new ImageView(application);
-        iconView.setId(R.id.suw_items_icon);
-        iconContainer.addView(iconView);
-
-        SwitchCompat switchView = new SwitchCompat(application);
-        switchView.setId(R.id.suw_items_switch);
-        root.addView(switchView);
+        ViewGroup root =
+                (ViewGroup) LayoutInflater.from(application)
+                        .inflate(R.layout.suw_items_expandable_switch, null);
+        mSummaryView = root.findViewById(R.id.suw_items_summary);
 
         return root;
     }
diff --git a/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java b/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java
index 3c678f8..bd0aead 100644
--- a/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java
+++ b/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java
@@ -58,6 +58,10 @@ public class CheckableLinearLayout extends LinearLayout implements Checkable {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
+    {
+        setFocusable(true);
+    }
+
     @Override
     protected int[] onCreateDrawableState(int extraSpace) {
         if (mChecked) {

From d1d889deee57761e14555051bc1c7cd712f8d5e9 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 22 Feb 2018 20:24:22 -0800
Subject: [PATCH 59/75] Set corner radius for GLIF buttons

In GLIF v2, the corner radius stays at 2dp, but now referencing a
resource defined inside the library itself.
In GLIF v3, the corner radius is 4dp. Note that this only affects
device running P or above since the corner radius API is new.

Test: Manual + Existing tests pass
Bug: 73252680
Change-Id: Ia7110b097c5217b54ed363939158d1960f56f02a
---
 library/gingerbread/res/values/styles.xml  | 8 ++++++++
 library/main/res/values/attrs.xml          | 1 +
 library/main/res/values/dimens.xml         | 3 +++
 library/platform/res/values-v27/styles.xml | 9 +++++++++
 library/rules.gradle                       | 1 +
 5 files changed, 22 insertions(+)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 2287d27..241f037 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -108,6 +108,7 @@
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -146,6 +147,7 @@
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -166,12 +168,14 @@
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
     <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
     <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" />
@@ -231,6 +235,9 @@
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/suwButtonAllCaps</item>
         <item name="textAllCaps">?attr/suwButtonAllCaps</item>
+
+        <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -250,6 +257,7 @@
         <item name="textAllCaps">?attr/suwButtonAllCaps</item>
 
         <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
         <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item>
         <item name="colorControlHighlight">@color/suw_flat_button_highlight</item>
     </style>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 7a7580d..b3fcfe9 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -41,6 +41,7 @@
     <attr name="suwGlifIconStyle" format="reference" />
 
     <attr name="suwButtonAllCaps" format="boolean" />
+    <attr name="suwButtonCornerRadius" format="dimension" />
     <attr name="suwButtonFontFamily" format="string|reference" />
     <attr name="suwCardBackground" format="color|reference" />
     <attr name="suwDividerCondition">
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index f5c2563..69475b2 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -20,6 +20,7 @@
     <!-- General -->
     <dimen name="suw_layout_margin_sides">40dp</dimen>
 
+    <dimen name="suw_glif_button_corner_radius">2dp</dimen>
     <!-- Calculated by (suw_glif_margin_sides - 4dp internal padding of button) -->
     <dimen name="suw_glif_button_margin_end">20dp</dimen>
     <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) -->
@@ -30,6 +31,8 @@
     <dimen name="suw_glif_margin_sides">24dp</dimen>
     <dimen name="suw_glif_margin_top">48dp</dimen>
 
+    <dimen name="suw_glif_v3_button_corner_radius">4dp</dimen>
+
     <!-- Content styles -->
     <dimen name="suw_check_box_line_spacing_extra">4sp</dimen>
     <dimen name="suw_check_box_margin_bottom">12dp</dimen>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index ba287fc..6e36919 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 
+<!-- TODO(yukl): Bump this file to v28 once we can properly test that -->
 <!-- These styles are only included in the platform build, to make sure that they do not
      override the corresponding styles in the compatibility build. -->
 <resources xmlns:tools="http://schemas.android.com/tools">
@@ -107,6 +108,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -142,6 +144,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -161,6 +164,7 @@
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
 
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
@@ -173,6 +177,7 @@
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
 
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
@@ -189,6 +194,9 @@
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
         <item name="android:textAllCaps">?attr/suwButtonAllCaps</item>
+
+        <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="android:Widget.Material.Button.Borderless.Colored">
@@ -206,6 +214,7 @@
         <item name="android:textAllCaps">?attr/suwButtonAllCaps</item>
 
         <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
         <item name="android:colorControlHighlight">@color/suw_flat_button_highlight</item>
     </style>
 
diff --git a/library/rules.gradle b/library/rules.gradle
index f6dfafc..9baa390 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -19,6 +19,7 @@ android {
         // DEPRECATED: Platform version that will not include the compatibility libraries
         platformDeprecated {
             dimension 'compat'
+            // TODO(yukl): Bump this file to v28 once we can properly test that
             minSdkVersion 27
         }
 

From bf0415d6a8f5f4c11da6c71b49753c26629e47f7 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 2 Mar 2018 13:18:33 -0800
Subject: [PATCH 60/75] Add null check for MediaPlayer

In IllustrationVideoView, in case creation of media player failed,
check for null and throw WTF instead of crashing with null pointer.

Test: ./gradlew test
Bug: 74090736
Change-Id: Id63027067cc687516f585503b5218f4467845039
---
 .../view/IllustrationVideoView.java           | 26 +++++++---
 .../setupwizardlib/shadow/ShadowLog.java      | 51 +++++++++++++++++++
 .../view/IllustrationVideoViewTest.java       | 15 ++++++
 3 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 library/test/robotest/src/com/android/setupwizardlib/shadow/ShadowLog.java

diff --git a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
index 9c79eb5..e5c2fb1 100644
--- a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
+++ b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
@@ -23,9 +23,11 @@ import android.graphics.SurfaceTexture;
 import android.graphics.drawable.Animatable;
 import android.media.MediaPlayer;
 import android.os.Build.VERSION_CODES;
+import android.support.annotation.Nullable;
 import android.support.annotation.RawRes;
 import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Surface;
 import android.view.TextureView;
 import android.view.View;
@@ -51,8 +53,11 @@ public class IllustrationVideoView extends TextureView implements Animatable,
         MediaPlayer.OnSeekCompleteListener,
         MediaPlayer.OnInfoListener {
 
+    private static final String TAG = "IllustrationVideoView";
+
     protected float mAspectRatio = 1.0f; // initial guess until we know
 
+    @Nullable // Can be null when media player fails to initialize
     protected MediaPlayer mMediaPlayer;
 
     private @RawRes int mVideoResId = 0;
@@ -129,15 +134,20 @@ public class IllustrationVideoView extends TextureView implements Animatable,
 
         mMediaPlayer = MediaPlayer.create(getContext(), mVideoResId);
 
-        mMediaPlayer.setSurface(mSurface);
-        mMediaPlayer.setOnPreparedListener(this);
-        mMediaPlayer.setOnSeekCompleteListener(this);
-        mMediaPlayer.setOnInfoListener(this);
+        if (mMediaPlayer != null) {
+            mMediaPlayer.setSurface(mSurface);
+            mMediaPlayer.setOnPreparedListener(this);
+            mMediaPlayer.setOnSeekCompleteListener(this);
+            mMediaPlayer.setOnInfoListener(this);
 
-        float aspectRatio = (float) mMediaPlayer.getVideoHeight() / mMediaPlayer.getVideoWidth();
-        if (mAspectRatio != aspectRatio) {
-            mAspectRatio = aspectRatio;
-            requestLayout();
+            float aspectRatio =
+                    (float) mMediaPlayer.getVideoHeight() / mMediaPlayer.getVideoWidth();
+            if (mAspectRatio != aspectRatio) {
+                mAspectRatio = aspectRatio;
+                requestLayout();
+            }
+        } else {
+            Log.wtf(TAG, "Unable to initialize media player for video view");
         }
         if (getWindowVisibility() == View.VISIBLE) {
             start();
diff --git a/library/test/robotest/src/com/android/setupwizardlib/shadow/ShadowLog.java b/library/test/robotest/src/com/android/setupwizardlib/shadow/ShadowLog.java
new file mode 100644
index 0000000..f1d37c8
--- /dev/null
+++ b/library/test/robotest/src/com/android/setupwizardlib/shadow/ShadowLog.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+package com.android.setupwizardlib.shadow;
+
+import android.util.Log;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(Log.class)
+public class ShadowLog extends org.robolectric.shadows.ShadowLog {
+
+    public static boolean sWtfIsFatal = true;
+
+    public static class TerribleFailure extends RuntimeException {
+
+        public TerribleFailure(String msg, Throwable cause) {
+            super(msg, cause);
+        }
+    }
+
+    @Implementation
+    public static void wtf(String tag, String msg) {
+        org.robolectric.shadows.ShadowLog.wtf(tag, msg);
+        if (sWtfIsFatal) {
+            throw new TerribleFailure(msg, null);
+        }
+    }
+
+    @Implementation
+    public static void wtf(String tag, String msg, Throwable throwable) {
+        org.robolectric.shadows.ShadowLog.wtf(tag, msg, throwable);
+        if (sWtfIsFatal) {
+            throw new TerribleFailure(msg, throwable);
+        }
+    }
+}
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
index 6db8852..21822a4 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java
@@ -18,6 +18,7 @@ package com.android.setupwizardlib.view;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
@@ -33,6 +34,8 @@ import android.view.Surface;
 
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
+import com.android.setupwizardlib.shadow.ShadowLog;
+import com.android.setupwizardlib.shadow.ShadowLog.TerribleFailure;
 import com.android.setupwizardlib.view.IllustrationVideoViewTest.ShadowMockMediaPlayer;
 import com.android.setupwizardlib.view.IllustrationVideoViewTest.ShadowSurface;
 
@@ -55,6 +58,7 @@ import org.robolectric.util.ReflectionHelpers;
 @Config(
         sdk = Config.NEWEST_SDK,
         shadows = {
+                ShadowLog.class,
                 ShadowMockMediaPlayer.class,
                 ShadowSurface.class
         })
@@ -75,6 +79,17 @@ public class IllustrationVideoViewTest {
         ShadowMockMediaPlayer.reset();
     }
 
+    @Test
+    public void nullMediaPlayer_shouldThrowWtf() {
+        ShadowMockMediaPlayer.sMediaPlayer = null;
+        try {
+            createDefaultView();
+            fail("WTF should be thrown for null media player");
+        } catch (TerribleFailure e) {
+            // pass
+        }
+    }
+
     @Test
     public void testPausedWhenWindowFocusLost() {
         createDefaultView();

From 56ecb4d1e9cea33a978ab89b47accdc09c2b04cf Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 6 Mar 2018 11:44:42 -0800
Subject: [PATCH 61/75] Import translations. DO NOT MERGE

Change-Id: If98c408c53ad5ceae4554fff46d8066558d0279c
Auto-generated-cl: translation import
---
 library/main/res/values-as/strings.xml | 23 +++++++++++++++++++++++
 library/main/res/values-or/strings.xml | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 library/main/res/values-as/strings.xml
 create mode 100644 library/main/res/values-or/strings.xml

diff --git a/library/main/res/values-as/strings.xml b/library/main/res/values-as/strings.xml
new file mode 100644
index 0000000..be6e06b
--- /dev/null
+++ b/library/main/res/values-as/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"পৰৱৰ্তী"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"উভতি যাওক"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"অধিক"</string>
+</resources>
diff --git a/library/main/res/values-or/strings.xml b/library/main/res/values-or/strings.xml
new file mode 100644
index 0000000..c4d12ff
--- /dev/null
+++ b/library/main/res/values-or/strings.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="suw_next_button_label" msgid="7269625133873553978">"ପରବର୍ତ୍ତୀ"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"ପଛକୁ ଫେରନ୍ତୁ"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"ଅଧିକ"</string>
+</resources>

From c0b7a4fa0eedd16c5f4dfbd7da0e9b35f26d8316 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 6 Mar 2018 11:44:55 -0800
Subject: [PATCH 62/75] Import translations. DO NOT MERGE

Change-Id: If7d1a4a871997e9ad696b77397a3afc70a24a105
Auto-generated-cl: translation import
---
 navigationbar/res/values-as/strings.xml | 6 ++++++
 navigationbar/res/values-or/strings.xml | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 navigationbar/res/values-as/strings.xml
 create mode 100644 navigationbar/res/values-or/strings.xml

diff --git a/navigationbar/res/values-as/strings.xml b/navigationbar/res/values-as/strings.xml
new file mode 100644
index 0000000..398ff1f
--- /dev/null
+++ b/navigationbar/res/values-as/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"পৰৱৰ্তী"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"উভতি যাওক"</string>
+</resources>
diff --git a/navigationbar/res/values-or/strings.xml b/navigationbar/res/values-or/strings.xml
new file mode 100644
index 0000000..4c70d06
--- /dev/null
+++ b/navigationbar/res/values-or/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"ପରବର୍ତ୍ତୀ"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"ପଛକୁ ଫେରନ୍ତୁ"</string>
+</resources>

From 15d9037e89d502c7deb9cbf81c0407d433a5706b Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 8 Mar 2018 18:33:42 -0800
Subject: [PATCH 63/75] Add touch feedback to tertiary buttons

Test: Manual, updated `./gradlew test`
Bug: 29574531
Change-Id: I1db6beb3bd4d6c4ab34e7dfeab79ed8976756332
(cherry picked from commit fc01f70b288135f0c4654a4c16a023f6fd52ebd0)
---
 library/main/res/values/dimens.xml                        | 2 ++
 library/main/res/values/styles.xml                        | 4 ++--
 .../com/android/setupwizardlib/util/GlifStyleTest.java    | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 69475b2..be6b248 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -26,6 +26,8 @@
     <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) -->
     <dimen name="suw_glif_button_margin_start">8dp</dimen>
     <dimen name="suw_glif_button_padding">16dp</dimen>
+    <!-- Negative of suw_glif_button_padding -->
+    <dimen name="suw_glif_negative_button_padding">-16dp</dimen>
     <dimen name="suw_glif_footer_padding_vertical">8dp</dimen>
     <dimen name="suw_glif_footer_min_height">72dp</dimen>
     <dimen name="suw_glif_margin_sides">24dp</dimen>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index dbd5358..fa2a080 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -195,10 +195,10 @@
         <item name="android:buttonStyle">@style/SuwGlifButton.Tertiary</item>
         <item name="android:theme">@style/SuwGlifButton.Tertiary</item>
 
-        <item name="android:background">@null</item>
         <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
         <item name="android:layout_gravity">?attr/suwGlifHeaderGravity</item>
-        <item name="android:padding">0dp</item>
+        <item name="android:layout_marginLeft">@dimen/suw_glif_negative_button_padding</item>
+        <item name="android:layout_marginRight">@dimen/suw_glif_negative_button_padding</item>
         <!-- Always lowercase instead of reading attr/suwButtonAllCaps, since this is a tertiary
              button -->
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item>
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index 20661ff..46df9d6 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -16,8 +16,9 @@
 
 package com.android.setupwizardlib.util;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -59,9 +60,8 @@ public class GlifStyleTest {
                 Robolectric.buildAttributeSet()
                         .setStyleAttribute("@style/SuwGlifButton.Tertiary")
                         .build());
-        assertNull("Background of tertiary button should be null", button.getBackground());
-        assertNull("Tertiary button should have no transformation method",
-                button.getTransformationMethod());
+        assertThat(button.getBackground()).named("background").isNotNull();
+        assertThat(button.getTransformationMethod()).named("transformation method").isNull();
         if (VERSION.SDK_INT < VERSION_CODES.M) {
             // Robolectric resolved the wrong theme attribute on versions >= M
             // https://github.com/robolectric/robolectric/issues/2940

From df13f242d3a8fdb5a224706fb01d425e8106cecd Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 8 Mar 2018 21:40:05 -0800
Subject: [PATCH 64/75] Make links focusableInTouchMode for platform variant

ag/3692611, but for platform variant

Test: ./gradlew testPlatformDeprecatedDebugUnitTest
Bug: 73350031
Change-Id: Ibd27348d97b9884be38eff69b540aedaf6416a2c
(cherry picked from commit a164eae405e822157f07b050982640d5c457f9aa)
---
 .../src/com/android/setupwizardlib/view/RichTextView.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
index 5a78561..aab3238 100644
--- a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
@@ -121,6 +121,11 @@ public class RichTextView extends TextView implements OnLinkClickListener {
         // as individual TextViews consume touch events and thereby reducing the focus window
         // shown by Talkback. Disable focus if there are no links
         setFocusable(hasLinks);
+        // Do not "reveal" (i.e. scroll to) this view when this view is focused. Since this view is
+        // focusable in touch mode, we may be focused when the screen is first shown, and starting
+        // a screen halfway scrolled down is confusing to the user.
+        setRevealOnFocusHint(false);
+        setFocusableInTouchMode(hasLinks);
     }
 
     private boolean hasLinks(CharSequence text) {

From b5a2d11440eab84ef1ae1f44fb29b0690038c8e5 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 9 Mar 2018 20:55:24 -0800
Subject: [PATCH 65/75] Update fourcolor progress bar

Test: Manual. Existing tests pass
Bug: 63074068
Change-Id: I52a1704c39a9a54f9a4e79f42d174a20ee96c310
(cherry picked from commit 83817ea0336e6d9a217b4c4585b11dbaf3eb740a)
---
 library/gingerbread/res/values/styles.xml     |  1 +
 .../suw_fourcolor_progress_bar.xml            | 61 +++++++++++--------
 library/main/res/values-v21/styles.xml        |  1 +
 library/main/res/values/dimens.xml            |  1 +
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 241f037..130925d 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -277,6 +277,7 @@
     <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" />
 
     <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
+        <item name="android:padding">@dimen/suw_glif_fourcolor_progress_bar_padding</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:indeterminate">true</item>
     </style>
diff --git a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
index 2ac35ee..9d54141 100644
--- a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
+++ b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
@@ -26,37 +26,44 @@
     <aapt:attr name="android:drawable">
         <vector android:width="823dp" android:height="823dp" android:viewportHeight="823"
             android:viewportWidth="823">
-            <group android:name="blue1" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="blue1_path"
+            <group android:name="red" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="red_path"
                     android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#4688f1"
+                    android:strokeAlpha="1" android:strokeColor="#ea4335"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="27" />
             </group>
-            <group android:name="blue2" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="blue2_path"
-                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#7dacf4"
+            <group android:name="yellow" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="yellow_path"
+                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#fbbc04"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="28" />
             </group>
-            <group android:name="blue3" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="blue3_path"
-                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#c7dbfb"
+            <group android:name="green" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="green_path"
+                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#34a853"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="29" />
             </group>
-            <group android:name="blue4" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="blue4_path"
-                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#e8f0fd"
+            <group android:name="blue" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue_path"
+                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#4285f4"
+                    android:strokeLineCap="round" android:strokeLineJoin="round"
+                    android:strokeWidth="30" />
+            </group>
+            <!-- gray -->
+            <group android:translateX="411.5" android:translateY="411.5">
+                <path android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#1f9aa0a6"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="30" />
             </group>
         </vector>
     </aapt:attr>
-    <target android:name="blue1_path">
+    <target android:name="red_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -67,7 +74,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue1_path">
+    <target android:name="red_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -78,7 +85,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue1">
+    <target android:name="red">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="rotation"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
@@ -89,7 +96,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue2_path">
+    <target android:name="yellow_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -100,7 +107,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue2_path">
+    <target android:name="yellow_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -111,7 +118,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue2">
+    <target android:name="yellow">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="rotation"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
@@ -122,7 +129,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue3_path">
+    <target android:name="green_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -133,7 +140,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue3_path">
+    <target android:name="green_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -144,7 +151,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue3">
+    <target android:name="green">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:duration="1983" android:propertyName="rotation"
@@ -158,7 +165,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="blue4_path">
+    <target android:name="blue_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -169,7 +176,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue4_path">
+    <target android:name="blue_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -180,7 +187,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue4">
+    <target android:name="blue">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="rotation"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index a77c32c..450adab 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -45,6 +45,7 @@
     <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" />
 
     <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
+        <item name="android:padding">@dimen/suw_glif_fourcolor_progress_bar_padding</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:indeterminate">true</item>
         <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index be6b248..8281013 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -139,6 +139,7 @@
     <!-- The margin to compensate for the padding built-in to the widget itself -->
     <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen>
     <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen>
+    <dimen name="suw_glif_fourcolor_progress_bar_padding">26dp</dimen>
 
     <!-- Edit Text dimensions -->
     <dimen name="suw_edit_text_min_height">56dp</dimen>

From 3514ad526af3d95f61383ec374ea4c384ba9b540 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 16 Mar 2018 19:19:44 -0700
Subject: [PATCH 66/75] Add methods to set GLIF icon content description

Test: ./gradlew connectedAndroidTest
Bug: 74435529
Change-Id: I22e3abe8dce0663a7d1e7ee3050d327abeec4ad2
(cherry picked from commit c38af2fb55868523e5ddcceb6331947501f43adf)
---
 .../setupwizardlib/template/IconMixin.java     | 18 ++++++++++++++++++
 .../setupwizardlib/template/IconMixinTest.java | 14 ++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/library/main/src/com/android/setupwizardlib/template/IconMixin.java b/library/main/src/com/android/setupwizardlib/template/IconMixin.java
index 7f5a3c9..5386c92 100644
--- a/library/main/src/com/android/setupwizardlib/template/IconMixin.java
+++ b/library/main/src/com/android/setupwizardlib/template/IconMixin.java
@@ -90,6 +90,24 @@ public class IconMixin implements Mixin {
         return iconView != null ? iconView.getDrawable() : null;
     }
 
+    /**
+     * Sets the content description of the icon view
+     */
+    public void setContentDescription(CharSequence description) {
+        final ImageView iconView = getView();
+        if (iconView != null) {
+            iconView.setContentDescription(description);
+        }
+    }
+
+    /**
+     * @return The content description of the icon view
+     */
+    public CharSequence getContentDescription() {
+        final ImageView iconView = getView();
+        return iconView != null ? iconView.getContentDescription() : null;
+    }
+
     /**
      * @return The ImageView responsible for displaying the icon.
      */
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
index 12187a2..5a36f4a 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
@@ -127,4 +127,18 @@ public class IconMixinTest {
         assertEquals(expected.getBitmap(), actual.getBitmap());
         assertEquals(View.VISIBLE, mIconView.getVisibility());
     }
+
+    @Test
+    public void setContentDescription_shouldSetContentDescriptionOnIconView() {
+        IconMixin mixin = new IconMixin(mTemplateLayout, null, 0);
+        mixin.setContentDescription("hello world");
+        assertThat(mIconView.getContentDescription()).isEqualTo("hello world");
+    }
+
+    @Test
+    public void getContentDescription_shouldReturnContentDescriptionFromView() {
+        IconMixin mixin = new IconMixin(mTemplateLayout, null, 0);
+        mIconView.setContentDescription("aloha");
+        assertThat(mixin.getContentDescription()).isEqualTo("aloha");
+    }
 }

From fe2343b05e8f91c364dcb9f8d2596e3a469a142e Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 21 Mar 2018 22:25:01 +0000
Subject: [PATCH 67/75] Revert "Update fourcolor progress bar"

This reverts commit b5a2d11440eab84ef1ae1f44fb29b0690038c8e5.

Reason for revert: UX likes the old blue progress bar better

Bug: 63074068
Change-Id: Ide8c1117e4d4aae3016046641a1ff9880dec0f81
---
 library/gingerbread/res/values/styles.xml     |  1 -
 .../suw_fourcolor_progress_bar.xml            | 61 ++++++++-----------
 library/main/res/values-v21/styles.xml        |  1 -
 library/main/res/values/dimens.xml            |  1 -
 4 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 130925d..241f037 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -277,7 +277,6 @@
     <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" />
 
     <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
-        <item name="android:padding">@dimen/suw_glif_fourcolor_progress_bar_padding</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:indeterminate">true</item>
     </style>
diff --git a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
index 9d54141..2ac35ee 100644
--- a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
+++ b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
@@ -26,44 +26,37 @@
     <aapt:attr name="android:drawable">
         <vector android:width="823dp" android:height="823dp" android:viewportHeight="823"
             android:viewportWidth="823">
-            <group android:name="red" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="red_path"
+            <group android:name="blue1" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue1_path"
                     android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#ea4335"
+                    android:strokeAlpha="1" android:strokeColor="#4688f1"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="27" />
             </group>
-            <group android:name="yellow" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="yellow_path"
-                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#fbbc04"
+            <group android:name="blue2" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue2_path"
+                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#7dacf4"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="28" />
             </group>
-            <group android:name="green" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="green_path"
-                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#34a853"
+            <group android:name="blue3" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue3_path"
+                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#c7dbfb"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="29" />
             </group>
-            <group android:name="blue" android:translateX="411.5" android:translateY="411.5">
-                <path android:name="blue_path"
-                    android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#4285f4"
-                    android:strokeLineCap="round" android:strokeLineJoin="round"
-                    android:strokeWidth="30" />
-            </group>
-            <!-- gray -->
-            <group android:translateX="411.5" android:translateY="411.5">
-                <path android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
-                    android:strokeAlpha="1" android:strokeColor="#1f9aa0a6"
+            <group android:name="blue4" android:translateX="411.5" android:translateY="411.5">
+                <path android:name="blue4_path"
+                    android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c "
+                    android:strokeAlpha="1" android:strokeColor="#e8f0fd"
                     android:strokeLineCap="round" android:strokeLineJoin="round"
                     android:strokeWidth="30" />
             </group>
         </vector>
     </aapt:attr>
-    <target android:name="red_path">
+    <target android:name="blue1_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -74,7 +67,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="red_path">
+    <target android:name="blue1_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -85,7 +78,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="red">
+    <target android:name="blue1">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="rotation"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
@@ -96,7 +89,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="yellow_path">
+    <target android:name="blue2_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -107,7 +100,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="yellow_path">
+    <target android:name="blue2_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -118,7 +111,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="yellow">
+    <target android:name="blue2">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="rotation"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
@@ -129,7 +122,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="green_path">
+    <target android:name="blue3_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -140,7 +133,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="green_path">
+    <target android:name="blue3_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -151,7 +144,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="green">
+    <target android:name="blue3">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:duration="1983" android:propertyName="rotation"
@@ -165,7 +158,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="blue_path">
+    <target android:name="blue4_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -176,7 +169,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue_path">
+    <target android:name="blue4_path">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@@ -187,7 +180,7 @@
             </objectAnimator>
         </aapt:attr>
     </target>
-    <target android:name="blue">
+    <target android:name="blue4">
         <aapt:attr name="android:animation">
             <objectAnimator android:duration="1983" android:propertyName="rotation"
                 android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index 450adab..a77c32c 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -45,7 +45,6 @@
     <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" />
 
     <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge">
-        <item name="android:padding">@dimen/suw_glif_fourcolor_progress_bar_padding</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:indeterminate">true</item>
         <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 8281013..be6b248 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -139,7 +139,6 @@
     <!-- The margin to compensate for the padding built-in to the widget itself -->
     <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen>
     <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen>
-    <dimen name="suw_glif_fourcolor_progress_bar_padding">26dp</dimen>
 
     <!-- Edit Text dimensions -->
     <dimen name="suw_edit_text_min_height">56dp</dimen>

From 1cb90b86200d8a7236768bb50cbc9eeee2160e22 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 9 Feb 2018 11:02:12 -0500
Subject: [PATCH 68/75] DO NOT MERGE Migrate to AAPT2

Bug: 73128633
Test: make checkbuild
Change-Id: I4871b1d396267805930caa0362cf9af5ac103bb1
---
 library/Android.mk            | 29 ++----------------------
 library/common-gingerbread.mk | 42 -----------------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/library/Android.mk b/library/Android.mk
index 030733e..ff92194 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -26,11 +26,9 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_BUILD_APPS),)
-# Use AAPT2 only when TARGET_BUILD_APPS is empty because AAPT2 is not compatible with the current
-# setup of prebuilt support libs used in unbundled builds. b/29836407
 LOCAL_USE_AAPT2 := true
-endif
+
+LOCAL_AAPT2_ONLY := true
 
 LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
 LOCAL_MODULE := setup-wizard-lib-gingerbread-compat
@@ -41,8 +39,6 @@ LOCAL_RESOURCE_DIR := \
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recyclerview/src)
 
-ifdef LOCAL_USE_AAPT2
-
 LOCAL_JAVA_LIBRARIES := \
     android-support-annotations
 
@@ -52,25 +48,4 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \
     android-support-v7-appcompat \
     android-support-v7-recyclerview
 
-else
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages android.support.compat \
-    --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.v7.recyclerview
-
-LOCAL_RESOURCE_DIR += \
-    frameworks/support/compat/res \
-    frameworks/support/v7/appcompat/res \
-    frameworks/support/v7/recyclerview/res
-
-LOCAL_JAVA_LIBRARIES := \
-    android-support-annotations \
-    android-support-compat \
-    android-support-core-ui \
-    android-support-v7-appcompat \
-    android-support-v7-recyclerview
-
-endif
-
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/library/common-gingerbread.mk b/library/common-gingerbread.mk
index 6ced8b0..70231df 100644
--- a/library/common-gingerbread.mk
+++ b/library/common-gingerbread.mk
@@ -15,46 +15,6 @@
 # Path to directory of setup wizard lib (e.g. frameworks/opt/setupwizard/library)
 suwlib_dir := $(dir $(lastword $(MAKEFILE_LIST)))
 
-ifneq ($(LOCAL_USE_AAPT2),true)
-
-# Check that LOCAL_RESOURCE_DIR is defined
-ifeq (,$(LOCAL_RESOURCE_DIR))
-$(error LOCAL_RESOURCE_DIR must be defined)
-endif
-
-# Add --auto-add-overlay flag if not present
-ifeq (,$(findstring --auto-add-overlay, $(LOCAL_AAPT_FLAGS)))
-LOCAL_AAPT_FLAGS += --auto-add-overlay
-endif
-
-# Include setup wizard library, if not already included
-ifeq (,$(findstring setup-wizard-lib-gingerbread-compat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += \
-    $(suwlib_dir)/main/res \
-    $(suwlib_dir)/gingerbread/res \
-    $(suwlib_dir)/recyclerview/res
-LOCAL_AAPT_FLAGS += --extra-packages com.android.setupwizardlib
-LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib-gingerbread-compat
-endif
-
-## Include transitive dependencies below
-
-# Include support-v7-appcompat, if not already included
-ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
-endif
-
-# Include support-v7-recyclerview, if not already included
-ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
-endif
-
-else # LOCAL_USE_AAPT2 := true
-
 ifeq (,$(findstring setup-wizard-lib-gingerbread-compat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
   LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib-gingerbread-compat
 endif
@@ -66,5 +26,3 @@ endif
 ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
   LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview
 endif
-
-endif # LOCAL_USE_AAPT2

From 1643b5132fbbbc376279785a512d93adc7a46cd7 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 3 Apr 2018 11:24:15 -0700
Subject: [PATCH 69/75] Add padding to edit text

Test: Manual
Bug: 69930300
Change-Id: I285f998fb36ef9dbf5132e6a1e203f01071418bb
---
 library/main/res/values-v21/styles.xml | 4 +++-
 library/main/res/values/dimens.xml     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index a77c32c..d2c27f6 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -94,8 +94,10 @@
     </style>
 
     <style name="SuwEditText" parent="@android:style/Widget.Material.EditText">
-        <item name="android:minHeight">@dimen/suw_edit_text_min_height</item>
         <item name="android:background">@drawable/suw_edittext_bg</item>
+        <item name="android:minHeight">@dimen/suw_edit_text_min_height</item>
+        <item name="android:paddingLeft">@dimen/suw_edit_text_padding_horizontal</item>
+        <item name="android:paddingRight">@dimen/suw_edit_text_padding_horizontal</item>
     </style>
 
 </resources>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index be6b248..1a8b516 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -142,5 +142,6 @@
 
     <!-- Edit Text dimensions -->
     <dimen name="suw_edit_text_min_height">56dp</dimen>
+    <dimen name="suw_edit_text_padding_horizontal">12dp</dimen>
 
 </resources>

From 618a4449bb3e9be43586040ea2fb9a6371365ae7 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 5 Mar 2018 15:59:43 -0800
Subject: [PATCH 70/75] Add touch feedback to links

- Clear selection after LinkSpan is clicked so that the highlight
  effect will be cleared when the tap completes
- Set focusableInTouchMode to true and revealOnFocusHint to false
  in RichTextView for N MR1 or above to allow the highlight effect
  to be visible in touch mode.

Test: ./gradlew test connectedAndroidTest
Bug: 73350031
Change-Id: Ibb6f67102775802cdfebaa1529c09d936b4096cb
(cherry picked from commit bc1c7a159c14f8b8f532fec60681d34771cd7909)
---
 .../setupwizardlib/view/RichTextView.java     | 11 ++++++
 .../android/setupwizardlib/span/LinkSpan.java | 11 ++++++
 .../setupwizardlib/span/LinkSpanTest.java     | 32 +++++++++++++++--
 .../view}/RichTextViewTest.java               | 36 +++++++++++--------
 4 files changed, 73 insertions(+), 17 deletions(-)
 rename library/test/{instrumentation/src/com/android/setupwizardlib/test => robotest/src/com/android/setupwizardlib/view}/RichTextViewTest.java (84%)

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
index e6bc9da..6694cb2 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
@@ -130,6 +130,17 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
         // as individual TextViews consume touch events and thereby reducing the focus window
         // shown by Talkback. Disable focus if there are no links
         setFocusable(hasLinks);
+        // Do not "reveal" (i.e. scroll to) this view when this view is focused. Since this view is
+        // focusable in touch mode, we may be focused when the screen is first shown, and starting
+        // a screen halfway scrolled down is confusing to the user.
+        if (VERSION.SDK_INT >= VERSION_CODES.N_MR1) {
+            setRevealOnFocusHint(false);
+            // setRevealOnFocusHint is a new API added in SDK 25. For lower SDK versions, do not
+            // call setFocusableInTouchMode. We won't get touch effect on those earlier versions,
+            // but the link will still work, and will prevent the scroll view from starting halfway
+            // down the page.
+            setFocusableInTouchMode(hasLinks);
+        }
     }
 
     private boolean hasLinks(CharSequence text) {
diff --git a/library/main/src/com/android/setupwizardlib/span/LinkSpan.java b/library/main/src/com/android/setupwizardlib/span/LinkSpan.java
index a5f0424..26a3d16 100644
--- a/library/main/src/com/android/setupwizardlib/span/LinkSpan.java
+++ b/library/main/src/com/android/setupwizardlib/span/LinkSpan.java
@@ -21,10 +21,13 @@ import android.content.ContextWrapper;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.support.annotation.Nullable;
+import android.text.Selection;
+import android.text.Spannable;
 import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
+import android.widget.TextView;
 
 /**
  * A clickable span that will listen for click events and send it back to the context. To use this
@@ -86,11 +89,19 @@ public class LinkSpan extends ClickableSpan {
     public void onClick(View view) {
         if (dispatchClick(view)) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                // Prevent the touch event from bubbling up to the parent views.
                 view.cancelPendingInputEvents();
             }
         } else {
             Log.w(TAG, "Dropping click event. No listener attached.");
         }
+        if (view instanceof TextView) {
+            // Remove the highlight effect when the click happens by clearing the selection
+            CharSequence text = ((TextView) view).getText();
+            if (text instanceof Spannable) {
+                Selection.setSelection((Spannable) text, 0);
+            }
+        }
     }
 
     private boolean dispatchClick(View view) {
diff --git a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
index fe72e03..3aafa7d 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java
@@ -16,11 +16,16 @@
 
 package com.android.setupwizardlib.span;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertSame;
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.text.Selection;
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
@@ -32,7 +37,7 @@ import org.junit.runner.RunWith;
 public class LinkSpanTest {
 
     @Test
-    public void testOnClick() {
+    public void onClick_shouldCallListenerOnContext() {
         final TestContext context = new TestContext(application);
         final TextView textView = new TextView(context);
         final LinkSpan linkSpan = new LinkSpan("test_id");
@@ -43,7 +48,7 @@ public class LinkSpanTest {
     }
 
     @Test
-    public void testNonImplementingContext() {
+    public void onClick_contextDoesNotImplementOnClickListener_shouldBeNoOp() {
         final TextView textView = new TextView(application);
         final LinkSpan linkSpan = new LinkSpan("test_id");
 
@@ -54,7 +59,7 @@ public class LinkSpanTest {
     }
 
     @Test
-    public void testWrappedListener() {
+    public void onClick_contextWrapsOnClickListener_shouldCallWrappedListener() {
         final TestContext context = new TestContext(application);
         final Context wrapperContext = new ContextWrapper(context);
         final TextView textView = new TextView(wrapperContext);
@@ -65,6 +70,27 @@ public class LinkSpanTest {
         assertSame("Clicked LinkSpan should be passed to setup", linkSpan, context.clickedSpan);
     }
 
+    @Test
+    public void onClick_shouldClearSelection() {
+        final TestContext context = new TestContext(application);
+        final TextView textView = new TextView(context);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
+        textView.setFocusable(true);
+        textView.setFocusableInTouchMode(true);
+        final LinkSpan linkSpan = new LinkSpan("test_id");
+
+        SpannableStringBuilder text = new SpannableStringBuilder("Lorem ipsum dolor sit");
+        textView.setText(text);
+        text.setSpan(linkSpan, /* start= */ 0, /* end= */ 5, /* flags= */ 0);
+        // Simulate the touch effect set by TextView when touched.
+        Selection.setSelection(text, /* start= */ 0, /* end= */ 5);
+
+        linkSpan.onClick(textView);
+
+        assertThat(Selection.getSelectionStart(textView.getText())).isEqualTo(0);
+        assertThat(Selection.getSelectionEnd(textView.getText())).isEqualTo(0);
+    }
+
     @SuppressWarnings("deprecation")
     private static class TestContext extends ContextWrapper implements LinkSpan.OnClickListener {
 
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
similarity index 84%
rename from library/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java
rename to library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
index 5f3eb9f..2e28b48 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.setupwizardlib.test;
+package com.android.setupwizardlib.view;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,29 +24,30 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.robolectric.RuntimeEnvironment.application;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.text.Annotation;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.TextAppearanceSpan;
 
+import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
-import com.android.setupwizardlib.view.RichTextView;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 
-@RunWith(AndroidJUnit4.class)
-@SmallTest
+@RunWith(SuwLibRobolectricTestRunner.class)
+@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK })
 public class RichTextViewTest {
 
     @Test
@@ -55,7 +56,7 @@ public class RichTextViewTest {
         SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
         ssb.setSpan(link, 1, 2, 0 /* flags */);
 
-        RichTextView textView = new RichTextView(InstrumentationRegistry.getContext());
+        RichTextView textView = new RichTextView(application);
         textView.setText(ssb);
 
         final CharSequence text = textView.getText();
@@ -77,7 +78,7 @@ public class RichTextViewTest {
         SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
         ssb.setSpan(link, 1, 2, 0 /* flags */);
 
-        RichTextView textView = new RichTextView(InstrumentationRegistry.getContext());
+        RichTextView textView = new RichTextView(application);
         textView.setText(ssb);
 
         OnLinkClickListener listener = mock(OnLinkClickListener.class);
@@ -99,7 +100,7 @@ public class RichTextViewTest {
         SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
         ssb.setSpan(link, 1, 2, 0 /* flags */);
 
-        TestContext context = spy(new TestContext(InstrumentationRegistry.getTargetContext()));
+        TestContext context = spy(new TestContext(application));
         RichTextView textView = new RichTextView(context);
         textView.setText(ssb);
 
@@ -116,7 +117,7 @@ public class RichTextViewTest {
         SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
         ssb.setSpan(link, 1, 2, 0 /* flags */);
 
-        RichTextView textView = new RichTextView(InstrumentationRegistry.getContext());
+        RichTextView textView = new RichTextView(application);
         textView.setText(ssb);
 
         final CharSequence text = textView.getText();
@@ -137,7 +138,7 @@ public class RichTextViewTest {
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder("Linked");
         spannableStringBuilder.setSpan(testLink, 0, 3, 0);
 
-        RichTextView view = new RichTextView(InstrumentationRegistry.getContext());
+        RichTextView view = new RichTextView(application);
         view.setText(spannableStringBuilder);
 
         assertTrue("TextView should be focusable since it contains spans", view.isFocusable());
@@ -147,7 +148,7 @@ public class RichTextViewTest {
     @SuppressLint("SetTextI18n")  // It's OK. This is just a test.
     @Test
     public void testTextContainingNoLinksAreNotFocusable() {
-        RichTextView textView = new RichTextView(InstrumentationRegistry.getContext());
+        RichTextView textView = new RichTextView(application);
         textView.setText("Thou shall not be focusable!");
 
         assertFalse("TextView should not be focusable since it does not contain any span",
@@ -160,16 +161,23 @@ public class RichTextViewTest {
     @SuppressLint("SetTextI18n")  // It's OK. This is just a test.
     @Test
     public void testRichTextViewFocusChangesWithTextChange() {
-        RichTextView textView = new RichTextView(InstrumentationRegistry.getContext());
+        RichTextView textView = new RichTextView(application);
         textView.setText("Thou shall not be focusable!");
 
         assertFalse(textView.isFocusable());
+        assertFalse(textView.isFocusableInTouchMode());
 
         SpannableStringBuilder spannableStringBuilder =
                 new SpannableStringBuilder("I am focusable");
         spannableStringBuilder.setSpan(new Annotation("link", "focus:on_me"), 0, 1, 0);
         textView.setText(spannableStringBuilder);
         assertTrue(textView.isFocusable());
+        if (VERSION.SDK_INT >= VERSION_CODES.N_MR1) {
+            assertTrue(textView.isFocusableInTouchMode());
+            assertFalse(textView.getRevealOnFocusHint());
+        } else {
+            assertFalse(textView.isFocusableInTouchMode());
+        }
     }
 
     public static class TestContext extends ContextWrapper implements LinkSpan.OnClickListener {

From e4475dcf52c1235a7d9756b454fa81fb4b54726c Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 4 Apr 2018 19:45:31 -0700
Subject: [PATCH 71/75] Add workaround for touch event propagation

In TextView with links, onTouchEvent always return true regardless of
return value from the movement method because View#onTouchEvent is
hard coded to return true whenever the view is clickable.

In RichTextView, add a layer of abstraction to allow the movement
method to override the return value. TouchableLinkMovementMethod is
an implementation added, which will consume the event only when a
link is being touched.

Test: ./gradlew test
Bug: 77338508
Change-Id: I761579d6f153a41beb979acd88a4090eb3998cf3
---
 .../setupwizardlib/view/RichTextView.java     | 23 ++++-
 .../view/TouchableMovementMethod.java         | 83 +++++++++++++++++++
 .../setupwizardlib/view/RichTextView.java     | 24 +++++-
 .../setupwizardlib/view/RichTextViewTest.java | 45 ++++++++++
 4 files changed, 171 insertions(+), 4 deletions(-)
 create mode 100644 library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
index 6694cb2..ff2b1a7 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
@@ -25,7 +25,7 @@ import android.support.v7.widget.AppCompatTextView;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
@@ -36,6 +36,7 @@ import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;
 import com.android.setupwizardlib.util.LinkAccessibilityHelper;
+import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 /**
  * An extension of TextView that automatically replaces the annotation tags as specified in
@@ -121,7 +122,7 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
             // nullifying any return values of MovementMethod.onTouchEvent.
             // To still allow propagating touch events to the parent when this view doesn't have
             // links, we only set the movement method here if the text contains links.
-            setMovementMethod(LinkMovementMethod.getInstance());
+            setMovementMethod(TouchableLinkMovementMethod.getInstance());
         } else {
             setMovementMethod(null);
         }
@@ -152,6 +153,24 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
         return false;
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        // Since View#onTouchEvent always return true if the view is clickable (which is the case
+        // when a TextView has a movement method), override the implementation to allow the movement
+        // method, if it implements TouchableMovementMethod, to say that the touch is not handled,
+        // allowing the event to bubble up to the parent view.
+        boolean superResult = super.onTouchEvent(event);
+        MovementMethod movementMethod = getMovementMethod();
+        if (movementMethod instanceof TouchableMovementMethod) {
+            TouchableMovementMethod touchableMovementMethod =
+                    (TouchableMovementMethod) movementMethod;
+            if (touchableMovementMethod.getLastTouchEvent() == event) {
+                return touchableMovementMethod.isLastTouchEventHandled();
+            }
+        }
+        return superResult;
+    }
+
     @Override
     protected boolean dispatchHoverEvent(MotionEvent event) {
         if (mAccessibilityHelper != null && mAccessibilityHelper.dispatchHoverEvent(event)) {
diff --git a/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java b/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java
new file mode 100644
index 0000000..10e91f4
--- /dev/null
+++ b/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+package com.android.setupwizardlib.view;
+
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
+import android.view.MotionEvent;
+import android.widget.TextView;
+
+/**
+ * A movement method that tracks the last result of whether touch events are handled. This is
+ * used to patch the return value of {@link TextView#onTouchEvent} so that it consumes the touch
+ * events only when the movement method says the event is consumed.
+ */
+public interface TouchableMovementMethod {
+
+    /**
+     * @return The last touch event received in {@link MovementMethod#onTouchEvent}
+     */
+    MotionEvent getLastTouchEvent();
+
+    /**
+     * @return The return value of the last {@link MovementMethod#onTouchEvent}, or whether the
+     * last touch event should be considered handled by the text view
+     */
+    boolean isLastTouchEventHandled();
+
+    /**
+     * An extension of LinkMovementMethod that tracks whether the event is handled when it is
+     * touched.
+     */
+    class TouchableLinkMovementMethod extends LinkMovementMethod
+            implements TouchableMovementMethod {
+
+        public static TouchableLinkMovementMethod getInstance() {
+            return new TouchableLinkMovementMethod();
+        }
+
+        boolean mLastEventResult = false;
+        MotionEvent mLastEvent;
+
+        @Override
+        public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
+            mLastEvent = event;
+            boolean result = super.onTouchEvent(widget, buffer, event);
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                // Unfortunately, LinkMovementMethod extends ScrollMovementMethod, and it always
+                // consume the down event. So here we use the selection instead as a hint of whether
+                // the down event landed on a link.
+                mLastEventResult = Selection.getSelectionStart(buffer) != -1;
+            } else {
+                mLastEventResult = result;
+            }
+            return result;
+        }
+
+        @Override
+        public MotionEvent getLastTouchEvent() {
+            return mLastEvent;
+        }
+
+        @Override
+        public boolean isLastTouchEventHandled() {
+            return mLastEventResult;
+        }
+    }
+}
diff --git a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
index aab3238..4a53304 100644
--- a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
@@ -20,16 +20,18 @@ import android.content.Context;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;
+import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 /**
  * An extension of TextView that automatically replaces the annotation tags as specified in
@@ -112,7 +114,7 @@ public class RichTextView extends TextView implements OnLinkClickListener {
             // nullifying any return values of MovementMethod.onTouchEvent.
             // To still allow propagating touch events to the parent when this view doesn't have
             // links, we only set the movement method here if the text contains links.
-            setMovementMethod(LinkMovementMethod.getInstance());
+            setMovementMethod(TouchableLinkMovementMethod.getInstance());
         } else {
             setMovementMethod(null);
         }
@@ -137,6 +139,24 @@ public class RichTextView extends TextView implements OnLinkClickListener {
         return false;
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        // Since View#onTouchEvent always return true if the view is clickable (which is the case
+        // when a TextView has a movement method), override the implementation to allow the movement
+        // method, if it implements TouchableMovementMethod, to say that the touch is not handled,
+        // allowing the event to bubble up to the parent view.
+        boolean superResult = super.onTouchEvent(event);
+        MovementMethod movementMethod = getMovementMethod();
+        if (movementMethod instanceof TouchableMovementMethod) {
+            TouchableMovementMethod touchableMovementMethod =
+                    (TouchableMovementMethod) movementMethod;
+            if (touchableMovementMethod.getLastTouchEvent() == event) {
+                return touchableMovementMethod.isLastTouchEventHandled();
+            }
+        }
+        return superResult;
+    }
+
     public void setOnLinkClickListener(OnLinkClickListener listener) {
         mOnLinkClickListener = listener;
     }
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
index 2e28b48..f77de68 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
@@ -16,11 +16,14 @@
 
 package com.android.setupwizardlib.view;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -35,10 +38,12 @@ import android.text.Annotation;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.TextAppearanceSpan;
+import android.view.MotionEvent;
 
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
+import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,6 +67,8 @@ public class RichTextViewTest {
         final CharSequence text = textView.getText();
         assertTrue("Text should be spanned", text instanceof Spanned);
 
+        assertThat(textView.getMovementMethod()).isInstanceOf(TouchableLinkMovementMethod.class);
+
         Object[] spans = ((Spanned) text).getSpans(0, text.length(), Annotation.class);
         assertEquals("Annotation should be removed " + Arrays.toString(spans), 0, spans.length);
 
@@ -111,6 +118,44 @@ public class RichTextViewTest {
         verify(context).onClick(eq(spans[0]));
     }
 
+    @Test
+    public void onTouchEvent_clickOnLinks_shouldReturnTrue() {
+        Annotation link = new Annotation("link", "foobar");
+        SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
+        ssb.setSpan(link, 0, 2, 0 /* flags */);
+
+        RichTextView textView = new RichTextView(application);
+        textView.setText(ssb);
+
+        TouchableLinkMovementMethod mockMovementMethod = mock(TouchableLinkMovementMethod.class);
+        textView.setMovementMethod(mockMovementMethod);
+
+        MotionEvent motionEvent =
+                MotionEvent.obtain(123, 22, MotionEvent.ACTION_DOWN, 0, 0, 0);
+        doReturn(motionEvent).when(mockMovementMethod).getLastTouchEvent();
+        doReturn(true).when(mockMovementMethod).isLastTouchEventHandled();
+        assertThat(textView.onTouchEvent(motionEvent)).isTrue();
+    }
+
+    @Test
+    public void onTouchEvent_clickOutsideLinks_shouldReturnFalse() {
+        Annotation link = new Annotation("link", "foobar");
+        SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
+        ssb.setSpan(link, 0, 2, 0 /* flags */);
+
+        RichTextView textView = new RichTextView(application);
+        textView.setText(ssb);
+
+        TouchableLinkMovementMethod mockMovementMethod = mock(TouchableLinkMovementMethod.class);
+        textView.setMovementMethod(mockMovementMethod);
+
+        MotionEvent motionEvent =
+                MotionEvent.obtain(123, 22, MotionEvent.ACTION_DOWN, 0, 0, 0);
+        doReturn(motionEvent).when(mockMovementMethod).getLastTouchEvent();
+        doReturn(false).when(mockMovementMethod).isLastTouchEventHandled();
+        assertThat(textView.onTouchEvent(motionEvent)).isFalse();
+    }
+
     @Test
     public void testTextStyle() {
         Annotation link = new Annotation("textAppearance", "foobar");

From a6d66b41b08b2d612da1a3e27c651053ceb7a871 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 6 Apr 2018 21:25:55 +0000
Subject: [PATCH 72/75] Revert "Add workaround for touch event propagation"

This reverts commit e4475dcf52c1235a7d9756b454fa81fb4b54726c.

Reason for revert: Breaks ub-setupwizard-master build (lint error)

Bug: 77338508
Test: ./gradlew lint
Change-Id: I251ff930b7d8391db3ea55597fa42f491cdff963
---
 .../setupwizardlib/view/RichTextView.java     | 23 +----
 .../view/TouchableMovementMethod.java         | 83 -------------------
 .../setupwizardlib/view/RichTextView.java     | 24 +-----
 .../setupwizardlib/view/RichTextViewTest.java | 45 ----------
 4 files changed, 4 insertions(+), 171 deletions(-)
 delete mode 100644 library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
index ff2b1a7..6694cb2 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
@@ -25,7 +25,7 @@ import android.support.v7.widget.AppCompatTextView;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.method.MovementMethod;
+import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
@@ -36,7 +36,6 @@ import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;
 import com.android.setupwizardlib.util.LinkAccessibilityHelper;
-import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 /**
  * An extension of TextView that automatically replaces the annotation tags as specified in
@@ -122,7 +121,7 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
             // nullifying any return values of MovementMethod.onTouchEvent.
             // To still allow propagating touch events to the parent when this view doesn't have
             // links, we only set the movement method here if the text contains links.
-            setMovementMethod(TouchableLinkMovementMethod.getInstance());
+            setMovementMethod(LinkMovementMethod.getInstance());
         } else {
             setMovementMethod(null);
         }
@@ -153,24 +152,6 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
         return false;
     }
 
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        // Since View#onTouchEvent always return true if the view is clickable (which is the case
-        // when a TextView has a movement method), override the implementation to allow the movement
-        // method, if it implements TouchableMovementMethod, to say that the touch is not handled,
-        // allowing the event to bubble up to the parent view.
-        boolean superResult = super.onTouchEvent(event);
-        MovementMethod movementMethod = getMovementMethod();
-        if (movementMethod instanceof TouchableMovementMethod) {
-            TouchableMovementMethod touchableMovementMethod =
-                    (TouchableMovementMethod) movementMethod;
-            if (touchableMovementMethod.getLastTouchEvent() == event) {
-                return touchableMovementMethod.isLastTouchEventHandled();
-            }
-        }
-        return superResult;
-    }
-
     @Override
     protected boolean dispatchHoverEvent(MotionEvent event) {
         if (mAccessibilityHelper != null && mAccessibilityHelper.dispatchHoverEvent(event)) {
diff --git a/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java b/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java
deleted file mode 100644
index 10e91f4..0000000
--- a/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-
-package com.android.setupwizardlib.view;
-
-import android.text.Selection;
-import android.text.Spannable;
-import android.text.method.LinkMovementMethod;
-import android.text.method.MovementMethod;
-import android.view.MotionEvent;
-import android.widget.TextView;
-
-/**
- * A movement method that tracks the last result of whether touch events are handled. This is
- * used to patch the return value of {@link TextView#onTouchEvent} so that it consumes the touch
- * events only when the movement method says the event is consumed.
- */
-public interface TouchableMovementMethod {
-
-    /**
-     * @return The last touch event received in {@link MovementMethod#onTouchEvent}
-     */
-    MotionEvent getLastTouchEvent();
-
-    /**
-     * @return The return value of the last {@link MovementMethod#onTouchEvent}, or whether the
-     * last touch event should be considered handled by the text view
-     */
-    boolean isLastTouchEventHandled();
-
-    /**
-     * An extension of LinkMovementMethod that tracks whether the event is handled when it is
-     * touched.
-     */
-    class TouchableLinkMovementMethod extends LinkMovementMethod
-            implements TouchableMovementMethod {
-
-        public static TouchableLinkMovementMethod getInstance() {
-            return new TouchableLinkMovementMethod();
-        }
-
-        boolean mLastEventResult = false;
-        MotionEvent mLastEvent;
-
-        @Override
-        public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
-            mLastEvent = event;
-            boolean result = super.onTouchEvent(widget, buffer, event);
-            if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                // Unfortunately, LinkMovementMethod extends ScrollMovementMethod, and it always
-                // consume the down event. So here we use the selection instead as a hint of whether
-                // the down event landed on a link.
-                mLastEventResult = Selection.getSelectionStart(buffer) != -1;
-            } else {
-                mLastEventResult = result;
-            }
-            return result;
-        }
-
-        @Override
-        public MotionEvent getLastTouchEvent() {
-            return mLastEvent;
-        }
-
-        @Override
-        public boolean isLastTouchEventHandled() {
-            return mLastEventResult;
-        }
-    }
-}
diff --git a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
index 4a53304..aab3238 100644
--- a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
@@ -20,18 +20,16 @@ import android.content.Context;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.method.MovementMethod;
+import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;
-import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 /**
  * An extension of TextView that automatically replaces the annotation tags as specified in
@@ -114,7 +112,7 @@ public class RichTextView extends TextView implements OnLinkClickListener {
             // nullifying any return values of MovementMethod.onTouchEvent.
             // To still allow propagating touch events to the parent when this view doesn't have
             // links, we only set the movement method here if the text contains links.
-            setMovementMethod(TouchableLinkMovementMethod.getInstance());
+            setMovementMethod(LinkMovementMethod.getInstance());
         } else {
             setMovementMethod(null);
         }
@@ -139,24 +137,6 @@ public class RichTextView extends TextView implements OnLinkClickListener {
         return false;
     }
 
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        // Since View#onTouchEvent always return true if the view is clickable (which is the case
-        // when a TextView has a movement method), override the implementation to allow the movement
-        // method, if it implements TouchableMovementMethod, to say that the touch is not handled,
-        // allowing the event to bubble up to the parent view.
-        boolean superResult = super.onTouchEvent(event);
-        MovementMethod movementMethod = getMovementMethod();
-        if (movementMethod instanceof TouchableMovementMethod) {
-            TouchableMovementMethod touchableMovementMethod =
-                    (TouchableMovementMethod) movementMethod;
-            if (touchableMovementMethod.getLastTouchEvent() == event) {
-                return touchableMovementMethod.isLastTouchEventHandled();
-            }
-        }
-        return superResult;
-    }
-
     public void setOnLinkClickListener(OnLinkClickListener listener) {
         mOnLinkClickListener = listener;
     }
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
index f77de68..2e28b48 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
@@ -16,14 +16,11 @@
 
 package com.android.setupwizardlib.view;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -38,12 +35,10 @@ import android.text.Annotation;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.TextAppearanceSpan;
-import android.view.MotionEvent;
 
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
-import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,8 +62,6 @@ public class RichTextViewTest {
         final CharSequence text = textView.getText();
         assertTrue("Text should be spanned", text instanceof Spanned);
 
-        assertThat(textView.getMovementMethod()).isInstanceOf(TouchableLinkMovementMethod.class);
-
         Object[] spans = ((Spanned) text).getSpans(0, text.length(), Annotation.class);
         assertEquals("Annotation should be removed " + Arrays.toString(spans), 0, spans.length);
 
@@ -118,44 +111,6 @@ public class RichTextViewTest {
         verify(context).onClick(eq(spans[0]));
     }
 
-    @Test
-    public void onTouchEvent_clickOnLinks_shouldReturnTrue() {
-        Annotation link = new Annotation("link", "foobar");
-        SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
-        ssb.setSpan(link, 0, 2, 0 /* flags */);
-
-        RichTextView textView = new RichTextView(application);
-        textView.setText(ssb);
-
-        TouchableLinkMovementMethod mockMovementMethod = mock(TouchableLinkMovementMethod.class);
-        textView.setMovementMethod(mockMovementMethod);
-
-        MotionEvent motionEvent =
-                MotionEvent.obtain(123, 22, MotionEvent.ACTION_DOWN, 0, 0, 0);
-        doReturn(motionEvent).when(mockMovementMethod).getLastTouchEvent();
-        doReturn(true).when(mockMovementMethod).isLastTouchEventHandled();
-        assertThat(textView.onTouchEvent(motionEvent)).isTrue();
-    }
-
-    @Test
-    public void onTouchEvent_clickOutsideLinks_shouldReturnFalse() {
-        Annotation link = new Annotation("link", "foobar");
-        SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
-        ssb.setSpan(link, 0, 2, 0 /* flags */);
-
-        RichTextView textView = new RichTextView(application);
-        textView.setText(ssb);
-
-        TouchableLinkMovementMethod mockMovementMethod = mock(TouchableLinkMovementMethod.class);
-        textView.setMovementMethod(mockMovementMethod);
-
-        MotionEvent motionEvent =
-                MotionEvent.obtain(123, 22, MotionEvent.ACTION_DOWN, 0, 0, 0);
-        doReturn(motionEvent).when(mockMovementMethod).getLastTouchEvent();
-        doReturn(false).when(mockMovementMethod).isLastTouchEventHandled();
-        assertThat(textView.onTouchEvent(motionEvent)).isFalse();
-    }
-
     @Test
     public void testTextStyle() {
         Annotation link = new Annotation("textAppearance", "foobar");

From e58194099d9133ce7b2e19fe7c717679b62fddb2 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 6 Apr 2018 14:27:41 -0700
Subject: [PATCH 73/75] Revert "Revert "Add workaround for touch event
 propagation""

This reverts commit b268a8c365a4c9dcb7b1382a7ce3ec5607b22de0.

Rolling forward with suppress for the lint errors

Test: ./gradlew lint
Bug: 77338508
Change-Id: I9582bfbb4c73ae60a15e8285facf20da458b9690
---
 .../setupwizardlib/view/RichTextView.java     | 24 +++++-
 .../view/TouchableMovementMethod.java         | 83 +++++++++++++++++++
 .../setupwizardlib/view/RichTextView.java     | 25 +++++-
 .../setupwizardlib/view/RichTextViewTest.java | 45 ++++++++++
 4 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java

diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
index 6694cb2..1b1f82e 100644
--- a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
@@ -25,7 +25,7 @@ import android.support.v7.widget.AppCompatTextView;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
@@ -36,6 +36,7 @@ import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;
 import com.android.setupwizardlib.util.LinkAccessibilityHelper;
+import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 /**
  * An extension of TextView that automatically replaces the annotation tags as specified in
@@ -121,7 +122,7 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
             // nullifying any return values of MovementMethod.onTouchEvent.
             // To still allow propagating touch events to the parent when this view doesn't have
             // links, we only set the movement method here if the text contains links.
-            setMovementMethod(LinkMovementMethod.getInstance());
+            setMovementMethod(TouchableLinkMovementMethod.getInstance());
         } else {
             setMovementMethod(null);
         }
@@ -152,6 +153,25 @@ public class RichTextView extends AppCompatTextView implements OnLinkClickListen
         return false;
     }
 
+    @Override
+    @SuppressWarnings("ClickableViewAccessibility")  // super.onTouchEvent is called
+    public boolean onTouchEvent(MotionEvent event) {
+        // Since View#onTouchEvent always return true if the view is clickable (which is the case
+        // when a TextView has a movement method), override the implementation to allow the movement
+        // method, if it implements TouchableMovementMethod, to say that the touch is not handled,
+        // allowing the event to bubble up to the parent view.
+        boolean superResult = super.onTouchEvent(event);
+        MovementMethod movementMethod = getMovementMethod();
+        if (movementMethod instanceof TouchableMovementMethod) {
+            TouchableMovementMethod touchableMovementMethod =
+                    (TouchableMovementMethod) movementMethod;
+            if (touchableMovementMethod.getLastTouchEvent() == event) {
+                return touchableMovementMethod.isLastTouchEventHandled();
+            }
+        }
+        return superResult;
+    }
+
     @Override
     protected boolean dispatchHoverEvent(MotionEvent event) {
         if (mAccessibilityHelper != null && mAccessibilityHelper.dispatchHoverEvent(event)) {
diff --git a/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java b/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java
new file mode 100644
index 0000000..10e91f4
--- /dev/null
+++ b/library/main/src/com/android/setupwizardlib/view/TouchableMovementMethod.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+package com.android.setupwizardlib.view;
+
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
+import android.view.MotionEvent;
+import android.widget.TextView;
+
+/**
+ * A movement method that tracks the last result of whether touch events are handled. This is
+ * used to patch the return value of {@link TextView#onTouchEvent} so that it consumes the touch
+ * events only when the movement method says the event is consumed.
+ */
+public interface TouchableMovementMethod {
+
+    /**
+     * @return The last touch event received in {@link MovementMethod#onTouchEvent}
+     */
+    MotionEvent getLastTouchEvent();
+
+    /**
+     * @return The return value of the last {@link MovementMethod#onTouchEvent}, or whether the
+     * last touch event should be considered handled by the text view
+     */
+    boolean isLastTouchEventHandled();
+
+    /**
+     * An extension of LinkMovementMethod that tracks whether the event is handled when it is
+     * touched.
+     */
+    class TouchableLinkMovementMethod extends LinkMovementMethod
+            implements TouchableMovementMethod {
+
+        public static TouchableLinkMovementMethod getInstance() {
+            return new TouchableLinkMovementMethod();
+        }
+
+        boolean mLastEventResult = false;
+        MotionEvent mLastEvent;
+
+        @Override
+        public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
+            mLastEvent = event;
+            boolean result = super.onTouchEvent(widget, buffer, event);
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                // Unfortunately, LinkMovementMethod extends ScrollMovementMethod, and it always
+                // consume the down event. So here we use the selection instead as a hint of whether
+                // the down event landed on a link.
+                mLastEventResult = Selection.getSelectionStart(buffer) != -1;
+            } else {
+                mLastEventResult = result;
+            }
+            return result;
+        }
+
+        @Override
+        public MotionEvent getLastTouchEvent() {
+            return mLastEvent;
+        }
+
+        @Override
+        public boolean isLastTouchEventHandled() {
+            return mLastEventResult;
+        }
+    }
+}
diff --git a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
index aab3238..fa68a68 100644
--- a/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/platform/src/com/android/setupwizardlib/view/RichTextView.java
@@ -20,16 +20,18 @@ import android.content.Context;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;
+import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 /**
  * An extension of TextView that automatically replaces the annotation tags as specified in
@@ -112,7 +114,7 @@ public class RichTextView extends TextView implements OnLinkClickListener {
             // nullifying any return values of MovementMethod.onTouchEvent.
             // To still allow propagating touch events to the parent when this view doesn't have
             // links, we only set the movement method here if the text contains links.
-            setMovementMethod(LinkMovementMethod.getInstance());
+            setMovementMethod(TouchableLinkMovementMethod.getInstance());
         } else {
             setMovementMethod(null);
         }
@@ -137,6 +139,25 @@ public class RichTextView extends TextView implements OnLinkClickListener {
         return false;
     }
 
+    @Override
+    @SuppressWarnings("ClickableViewAccessibility")  // super.onTouchEvent is called
+    public boolean onTouchEvent(MotionEvent event) {
+        // Since View#onTouchEvent always return true if the view is clickable (which is the case
+        // when a TextView has a movement method), override the implementation to allow the movement
+        // method, if it implements TouchableMovementMethod, to say that the touch is not handled,
+        // allowing the event to bubble up to the parent view.
+        boolean superResult = super.onTouchEvent(event);
+        MovementMethod movementMethod = getMovementMethod();
+        if (movementMethod instanceof TouchableMovementMethod) {
+            TouchableMovementMethod touchableMovementMethod =
+                    (TouchableMovementMethod) movementMethod;
+            if (touchableMovementMethod.getLastTouchEvent() == event) {
+                return touchableMovementMethod.isLastTouchEventHandled();
+            }
+        }
+        return superResult;
+    }
+
     public void setOnLinkClickListener(OnLinkClickListener listener) {
         mOnLinkClickListener = listener;
     }
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
index 2e28b48..f77de68 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/RichTextViewTest.java
@@ -16,11 +16,14 @@
 
 package com.android.setupwizardlib.view;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -35,10 +38,12 @@ import android.text.Annotation;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.TextAppearanceSpan;
+import android.view.MotionEvent;
 
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
+import com.android.setupwizardlib.view.TouchableMovementMethod.TouchableLinkMovementMethod;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,6 +67,8 @@ public class RichTextViewTest {
         final CharSequence text = textView.getText();
         assertTrue("Text should be spanned", text instanceof Spanned);
 
+        assertThat(textView.getMovementMethod()).isInstanceOf(TouchableLinkMovementMethod.class);
+
         Object[] spans = ((Spanned) text).getSpans(0, text.length(), Annotation.class);
         assertEquals("Annotation should be removed " + Arrays.toString(spans), 0, spans.length);
 
@@ -111,6 +118,44 @@ public class RichTextViewTest {
         verify(context).onClick(eq(spans[0]));
     }
 
+    @Test
+    public void onTouchEvent_clickOnLinks_shouldReturnTrue() {
+        Annotation link = new Annotation("link", "foobar");
+        SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
+        ssb.setSpan(link, 0, 2, 0 /* flags */);
+
+        RichTextView textView = new RichTextView(application);
+        textView.setText(ssb);
+
+        TouchableLinkMovementMethod mockMovementMethod = mock(TouchableLinkMovementMethod.class);
+        textView.setMovementMethod(mockMovementMethod);
+
+        MotionEvent motionEvent =
+                MotionEvent.obtain(123, 22, MotionEvent.ACTION_DOWN, 0, 0, 0);
+        doReturn(motionEvent).when(mockMovementMethod).getLastTouchEvent();
+        doReturn(true).when(mockMovementMethod).isLastTouchEventHandled();
+        assertThat(textView.onTouchEvent(motionEvent)).isTrue();
+    }
+
+    @Test
+    public void onTouchEvent_clickOutsideLinks_shouldReturnFalse() {
+        Annotation link = new Annotation("link", "foobar");
+        SpannableStringBuilder ssb = new SpannableStringBuilder("Hello world");
+        ssb.setSpan(link, 0, 2, 0 /* flags */);
+
+        RichTextView textView = new RichTextView(application);
+        textView.setText(ssb);
+
+        TouchableLinkMovementMethod mockMovementMethod = mock(TouchableLinkMovementMethod.class);
+        textView.setMovementMethod(mockMovementMethod);
+
+        MotionEvent motionEvent =
+                MotionEvent.obtain(123, 22, MotionEvent.ACTION_DOWN, 0, 0, 0);
+        doReturn(motionEvent).when(mockMovementMethod).getLastTouchEvent();
+        doReturn(false).when(mockMovementMethod).isLastTouchEventHandled();
+        assertThat(textView.onTouchEvent(motionEvent)).isFalse();
+    }
+
     @Test
     public void testTextStyle() {
         Annotation link = new Annotation("textAppearance", "foobar");

From a65273f3bdf0527b101e51b6c5fba0ff51585831 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 10 May 2018 13:51:26 -0700
Subject: [PATCH 74/75] Fix SwitchItem clip

Test: ./gradlew test
Bug: 79175394
Change-Id: I3b0824e770b4c0470fc949d0d58f63dec54d7e12
(cherry picked from commit 2c20d03bbd0cb0ad835853f93a00cd509e982836)
---
 library/gingerbread/res/layout/suw_items_switch.xml |  1 +
 .../setupwizardlib/items/SwitchItemTest.java        | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/library/gingerbread/res/layout/suw_items_switch.xml b/library/gingerbread/res/layout/suw_items_switch.xml
index 3f101d7..319d7f7 100644
--- a/library/gingerbread/res/layout/suw_items_switch.xml
+++ b/library/gingerbread/res/layout/suw_items_switch.xml
@@ -20,6 +20,7 @@
     style="@style/SuwItemContainer.Verbose"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipToPadding="false"
     android:orientation="horizontal">
 
     <FrameLayout
diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
index fa5bbba..dd26af9 100644
--- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
@@ -16,12 +16,15 @@
 
 package com.android.setupwizardlib.items;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.annotation.TargetApi;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
@@ -34,6 +37,7 @@ import android.widget.TextView;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
@@ -44,6 +48,15 @@ public class SwitchItemTest {
 
     private SwitchCompat mSwitch;
 
+    @Test
+    public void testLayout() {
+        Assume.assumeTrue(VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP);
+        SwitchItem item = new SwitchItem();
+        LayoutInflater inflater = LayoutInflater.from(application);
+        ViewGroup layout = (ViewGroup) inflater.inflate(item.getDefaultLayoutResource(), null);
+        assertThat(layout.getClipToPadding()).isFalse();
+    }
+
     @Test
     public void testChecked() {
         SwitchItem item = new SwitchItem();

From 4a5ff8044c5069aa7e6cd1774cee8d7f5f9595da Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 15 Jun 2018 11:51:23 -0700
Subject: [PATCH 75/75] Fix ManifestMerger issues

Set LOCAL_MIN_SDK_VERSION in setup-wizard-lib so that the build system
doesn't raise the minSdkVersion value specified in the manifest, which
causes ManifestMerger to error when trying to merge it into a package
that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: Ia72327d787c45f6e2f35df97094b92cf6e88e214
---
 library/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Android.mk b/library/Android.mk
index ff92194..6cbfae8 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -15,6 +15,7 @@ LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/platform/res
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src)
+LOCAL_MIN_SDK_VERSION := 23
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
@@ -48,4 +49,6 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \
     android-support-v7-appcompat \
     android-support-v7-recyclerview
 
+LOCAL_MIN_SDK_VERSION := 14
+
 include $(BUILD_STATIC_JAVA_LIBRARY)