merge in oc-release history after reset to oc-dev
diff --git a/library/Android.mk b/library/Android.mk
index 8333792..094d795 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -44,22 +44,28 @@
ifdef LOCAL_USE_AAPT2
LOCAL_SHARED_ANDROID_LIBRARIES := \
- android-support-v4 \
+ android-support-annotations \
+ android-support-compat \
+ android-support-core-ui \
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-v4 \
+ android-support-annotations \
+ android-support-compat \
+ android-support-core-ui \
android-support-v7-appcompat \
android-support-v7-recyclerview
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>
diff --git a/library/main/res/values-pt/strings.xml b/library/main/res/values-pt/strings.xml
index 41032f8..79d86e2 100644
--- a/library/main/res/values-pt/strings.xml
+++ b/library/main/res/values-pt/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>
diff --git a/navigationbar/res/values-pt-rBR/strings.xml b/navigationbar/res/values-pt-rBR/strings.xml
index c8104d7..181fafe 100644
--- a/navigationbar/res/values-pt-rBR/strings.xml
+++ b/navigationbar/res/values-pt-rBR/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">"Próximo"</string>
+ <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"Próxima"</string>
<string name="setup_wizard_back_button_label" msgid="2863826823307023546">"Voltar"</string>
</resources>
diff --git a/navigationbar/res/values-pt/strings.xml b/navigationbar/res/values-pt/strings.xml
index c8104d7..181fafe 100644
--- a/navigationbar/res/values-pt/strings.xml
+++ b/navigationbar/res/values-pt/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">"Próximo"</string>
+ <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"Próxima"</string>
<string name="setup_wizard_back_button_label" msgid="2863826823307023546">"Voltar"</string>
</resources>
