Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3

10 files changed, 144 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index bcfc5d7..7d08da7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,10 @@ include $(CLEAR_VARS)
 appcompat_res_dirs := appcompat/res res
 LOCAL_MODULE := libphotoviewer_appcompat
 
+LOCAL_JAVA_LIBRARIES := \
+    android-support-annotations
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-annotations \
     android-support-compat \
     android-support-core-ui \
     android-support-core-utils \
@@ -47,8 +49,10 @@ include $(CLEAR_VARS)
 activity_res_dirs := activity/res res
 LOCAL_MODULE := libphotoviewer
 
+LOCAL_JAVA_LIBRARIES := \
+    android-support-annotations
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-annotations \
     android-support-compat \
     android-support-core-ui \
     android-support-core-utils \
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..27c5bf0
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 Google Inc.
+     Licensed to 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="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g>ৰ <xliff:g id="CURRENT_POS">%d</xliff:g>"</string>
+    <string name="retry" msgid="3319517143224679074">"পুনৰ চেষ্টা কৰক"</string>
+    <string name="failed" msgid="1458877219699376279">"প্ৰতিচ্ছবি ল\'ড কৰিব পৰা নগ\'ল"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..4217b65
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 Google Inc.
+     Licensed to 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="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> of <xliff:g id="COUNT">%d</xliff:g>"</string>
+    <string name="retry" msgid="3319517143224679074">"Retry"</string>
+    <string name="failed" msgid="1458877219699376279">"Couldn\'t load image"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..1c5bb40
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 Google Inc.
+     Licensed to 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="photo_view_count" msgid="3466690572899800275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="CURRENT_POS">%d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="retry" msgid="3319517143224679074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎Retry‎‏‎‎‏‎"</string>
+    <string name="failed" msgid="1458877219699376279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎Couldn\'t load image‎‏‎‎‏‎"</string>
+    <string name="titles" msgid="8072357561981153438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="TITLE_0">%s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SUBTITLE">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..6d3c503
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 Google Inc.
+     Licensed to 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="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g> ରୁ <xliff:g id="CURRENT_POS">%d</xliff:g>"</string>
+    <string name="retry" msgid="3319517143224679074">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
+    <string name="failed" msgid="1458877219699376279">"ଇମେଜ୍ ଲୋଡ୍ କରାଯାଇପାରିଲା ନାହିଁ"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
+</resources>
diff --git a/sample/Android.mk b/sample/Android.mk
index a636898..2ec43e8 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -21,8 +21,10 @@ include $(CLEAR_VARS)
 src_dirs := src
 LOCAL_PACKAGE_NAME := PhotoViewerSample
 
+LOCAL_JAVA_LIBRARIES := \
+    android-support-annotations
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-annotations \
     android-support-compat \
     android-support-core-ui \
     android-support-core-utils \
@@ -45,8 +47,10 @@ include $(CLEAR_VARS)
 src_dirs := src
 LOCAL_PACKAGE_NAME := AppcompatPhotoViewerSample
 
+LOCAL_JAVA_LIBRARIES := \
+    android-support-annotations
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-annotations \
     android-support-compat \
     android-support-core-ui \
     android-support-core-utils \
diff --git a/sample/res/values-as/strings.xml b/sample/res/values-as/strings.xml
new file mode 100644
index 0000000..841a6f8
--- /dev/null
+++ b/sample/res/values-as/strings.xml
@@ -0,0 +1,8 @@
+<?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="app_name" msgid="559800164925277094">"PhotoViewerSample"</string>
+    <string name="menu_settings" msgid="1259682084875185697">"ছেটিংসমূহ"</string>
+    <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string>
+    <string name="launch" msgid="2345080120370773520">"ফট\' ভিউয়াৰ আৰম্ভ কৰক"</string>
+</resources>
diff --git a/sample/res/values-en-rCA/strings.xml b/sample/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..66a0898
--- /dev/null
+++ b/sample/res/values-en-rCA/strings.xml
@@ -0,0 +1,8 @@
+<?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="app_name" msgid="559800164925277094">"PhotoViewerSample"</string>
+    <string name="menu_settings" msgid="1259682084875185697">"Settings"</string>
+    <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string>
+    <string name="launch" msgid="2345080120370773520">"Launch Photo Viewer"</string>
+</resources>
diff --git a/sample/res/values-en-rXC/strings.xml b/sample/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..1f861a6
--- /dev/null
+++ b/sample/res/values-en-rXC/strings.xml
@@ -0,0 +1,8 @@
+<?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="app_name" msgid="559800164925277094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎PhotoViewerSample‎‏‎‎‏‎"</string>
+    <string name="menu_settings" msgid="1259682084875185697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎Settings‎‏‎‎‏‎"</string>
+    <string name="title_activity_main" msgid="7695239211427024237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎MainActivity‎‏‎‎‏‎"</string>
+    <string name="launch" msgid="2345080120370773520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎Launch Photo Viewer‎‏‎‎‏‎"</string>
+</resources>
diff --git a/sample/res/values-or/strings.xml b/sample/res/values-or/strings.xml
new file mode 100644
index 0000000..d83a439
--- /dev/null
+++ b/sample/res/values-or/strings.xml
@@ -0,0 +1,8 @@
+<?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="app_name" msgid="559800164925277094">"PhotoViewerSample"</string>
+    <string name="menu_settings" msgid="1259682084875185697">"ସେଟିଙ୍ଗ"</string>
+    <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string>
+    <string name="launch" msgid="2345080120370773520">"ଫଟୋ ଭ୍ୟୁଅର୍‍ ଲଞ୍ଚ କରନ୍ତୁ"</string>
+</resources>