Merge branch 'release/3.1.1'

duckduckgo · Aug 16, 2017 · cbd17e5 · cbd17e5
2 parents 2df4512 + e78a399
commit cbd17e5
Show file tree

Hide file tree

Showing 105 changed files with 68 additions and 2,062 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -59,11 +59,7 @@
 	        android:excludeFromRecents="true"
 	        android:finishOnTaskLaunch="true" />
 
-        <activity android:name=".activity.OnboardingActivity"
-            android:screenOrientation="sensorPortrait"
-            android:theme="@style/DDGTheme.ClearStatusBar"/>
-
-		<provider android:name=".providers.DuckDuckGoProvider"
+        <provider android:name=".providers.DuckDuckGoProvider"
 				android:authorities="com.duckduckgo.mobile.android.providers.DuckDuckGoProvider" />
 
 		<receiver android:name=".broadcast.DownloadReceiver">

diff --git a/README.md b/README.md
@@ -3,26 +3,16 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/duckduckgo/android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Travis-CI](https://api.travis-ci.org/duckduckgo/android-search-and-stories.svg?branch=master)](https://travis-ci.org/duckduckgo/android-search-and-stories)
 
-We are excited to engage the community in the development of our new [apps](https://duckduckgo.com/app)! If you are trying to contribute in other ways, that happens over at [DuckDuckHack](http://duckduckhack.com) or on [GitHub](http://github.com/duckduckgo).
+We are excited to engage the community in the development of our [apps](https://duckduckgo.com/app)! While development on this project is currently on hold, we are working on a new project at https://github.com/duckduckgo/android which we will open up to contributions soon. Stay tuned!
+
+If you are trying to contribute in other ways, that happens over at [DuckDuckHack](http://duckduckhack.com) or on [GitHub](http://github.com/duckduckgo).
 
 The Android app is available via Google Play here: https://play.google.com/store/apps/details?id=com.duckduckgo.mobile.android&hl=en_GB
 
 ## Discuss
 
 Contact us at [email protected] if you want to get more involved, have questions or want to chat.
 
-## Getting started
-
-We're currently evaluating a variety of CI systems and suggested development environments. Android provides a rich set of environments, most of which are currently supported. You can familiarize yourself with the code by working on the following low-hanging fruit:
-- bug fixes
-- layout fixes
-- security fixes
-- improving the test suite
-
-Please check out the [issue tracker](https://github.com/duckduckgo/android-search-and-stories/issues) and [contributing](https://github.com/duckduckgo/android-search-and-stories/blob/master/CONTRIBUTING.md) guidelines.
 
 ## License
 DuckDuckGo Search & Stories is distributed under the Apache 2.0 [license](https://github.com/duckduckgo/android/blob/master/LICENSE).
-
-## Notes
-DuckDuckGo Search & Stories represents a ton of hard work from people all around the world. We've spent a long time thinking about exactly what makes a great mobile experience. While we'd love to accept each and every pull request, that probably wouldn't lead to a coherent experience. If you would like to get more involved, mail us at [email protected].
diff --git a/build.gradle b/build.gradle
@@ -19,8 +19,8 @@ android {
     applicationId "com.duckduckgo.mobile.android"
     minSdkVersion 16
     targetSdkVersion 23
-    versionCode 100
-    versionName "3.1.0"
+    versionCode 101
+    versionName "3.1.1"
   }
 
   repositories {

diff --git a/res/drawable-hdpi/add.png b/res/drawable-hdpi/add.png
diff --git a/res/drawable-hdpi/bang_button.png b/res/drawable-hdpi/bang_button.png
diff --git a/res/drawable-hdpi/bang_button_pressed.png b/res/drawable-hdpi/bang_button_pressed.png
diff --git a/res/drawable-hdpi/chrome.png b/res/drawable-hdpi/chrome.png
diff --git a/res/drawable-hdpi/firefox.png b/res/drawable-hdpi/firefox.png
diff --git a/res/drawable-hdpi/illustration_1.png b/res/drawable-hdpi/illustration_1.png
diff --git a/res/drawable-hdpi/illustration_2.png b/res/drawable-hdpi/illustration_2.png
diff --git a/res/drawable-hdpi/illustration_3.png b/res/drawable-hdpi/illustration_3.png
diff --git a/res/drawable-hdpi/illustration_3_instruction.png b/res/drawable-hdpi/illustration_3_instruction.png
diff --git a/res/drawable-hdpi/illustration_4.png b/res/drawable-hdpi/illustration_4.png
diff --git a/res/drawable-hdpi/menu_grey.png b/res/drawable-hdpi/menu_grey.png
diff --git a/res/drawable-hdpi/menu_red.png b/res/drawable-hdpi/menu_red.png
diff --git a/res/drawable-ldpi/add.png b/res/drawable-ldpi/add.png
diff --git a/res/drawable-ldpi/bang_button.png b/res/drawable-ldpi/bang_button.png
diff --git a/res/drawable-ldpi/bang_button_pressed.png b/res/drawable-ldpi/bang_button_pressed.png
diff --git a/res/drawable-ldpi/menu_grey.png b/res/drawable-ldpi/menu_grey.png
diff --git a/res/drawable-ldpi/menu_red.png b/res/drawable-ldpi/menu_red.png
diff --git a/res/drawable-mdpi/add.png b/res/drawable-mdpi/add.png
diff --git a/res/drawable-mdpi/bang_button.png b/res/drawable-mdpi/bang_button.png
diff --git a/res/drawable-mdpi/bang_button_pressed.png b/res/drawable-mdpi/bang_button_pressed.png
diff --git a/res/drawable-mdpi/chrome.png b/res/drawable-mdpi/chrome.png
diff --git a/res/drawable-mdpi/firefox.png b/res/drawable-mdpi/firefox.png
diff --git a/res/drawable-mdpi/illustration_1.png b/res/drawable-mdpi/illustration_1.png
diff --git a/res/drawable-mdpi/illustration_2.png b/res/drawable-mdpi/illustration_2.png
diff --git a/res/drawable-mdpi/illustration_3.png b/res/drawable-mdpi/illustration_3.png
diff --git a/res/drawable-mdpi/illustration_3_instruction.png b/res/drawable-mdpi/illustration_3_instruction.png
diff --git a/res/drawable-mdpi/illustration_4.png b/res/drawable-mdpi/illustration_4.png
diff --git a/res/drawable-mdpi/menu_grey.png b/res/drawable-mdpi/menu_grey.png
diff --git a/res/drawable-mdpi/menu_red.png b/res/drawable-mdpi/menu_red.png
diff --git a/res/drawable-xhdpi/add.png b/res/drawable-xhdpi/add.png
diff --git a/res/drawable-xhdpi/chrome.png b/res/drawable-xhdpi/chrome.png
diff --git a/res/drawable-xhdpi/firefox.png b/res/drawable-xhdpi/firefox.png
diff --git a/res/drawable-xhdpi/illustration_1.png b/res/drawable-xhdpi/illustration_1.png
diff --git a/res/drawable-xhdpi/illustration_2.png b/res/drawable-xhdpi/illustration_2.png
diff --git a/res/drawable-xhdpi/illustration_3.png b/res/drawable-xhdpi/illustration_3.png
diff --git a/res/drawable-xhdpi/illustration_3_instruction.png b/res/drawable-xhdpi/illustration_3_instruction.png
diff --git a/res/drawable-xhdpi/illustration_4.png b/res/drawable-xhdpi/illustration_4.png
diff --git a/res/drawable-xhdpi/menu_grey.png b/res/drawable-xhdpi/menu_grey.png
diff --git a/res/drawable-xhdpi/menu_red.png b/res/drawable-xhdpi/menu_red.png
diff --git a/res/drawable-xxhdpi/add.png b/res/drawable-xxhdpi/add.png
diff --git a/res/drawable-xxhdpi/chrome.png b/res/drawable-xxhdpi/chrome.png
diff --git a/res/drawable-xxhdpi/firefox.png b/res/drawable-xxhdpi/firefox.png
diff --git a/res/drawable-xxhdpi/illustration_1.png b/res/drawable-xxhdpi/illustration_1.png
diff --git a/res/drawable-xxhdpi/illustration_2.png b/res/drawable-xxhdpi/illustration_2.png
diff --git a/res/drawable-xxhdpi/illustration_3.png b/res/drawable-xxhdpi/illustration_3.png
diff --git a/res/drawable-xxhdpi/illustration_3_instruction.png b/res/drawable-xxhdpi/illustration_3_instruction.png
diff --git a/res/drawable-xxhdpi/illustration_4.png b/res/drawable-xxhdpi/illustration_4.png
diff --git a/res/drawable-xxhdpi/menu_grey.png b/res/drawable-xxhdpi/menu_grey.png
diff --git a/res/drawable-xxhdpi/menu_red.png b/res/drawable-xxhdpi/menu_red.png
diff --git a/res/drawable-xxxhdpi/add.png b/res/drawable-xxxhdpi/add.png
diff --git a/res/drawable-xxxhdpi/chrome.png b/res/drawable-xxxhdpi/chrome.png
diff --git a/res/drawable-xxxhdpi/firefox.png b/res/drawable-xxxhdpi/firefox.png
diff --git a/res/drawable-xxxhdpi/illustration_1.png b/res/drawable-xxxhdpi/illustration_1.png
diff --git a/res/drawable-xxxhdpi/illustration_2.png b/res/drawable-xxxhdpi/illustration_2.png
diff --git a/res/drawable-xxxhdpi/illustration_3.png b/res/drawable-xxxhdpi/illustration_3.png
diff --git a/res/drawable-xxxhdpi/illustration_3_instruction.png b/res/drawable-xxxhdpi/illustration_3_instruction.png
diff --git a/res/drawable-xxxhdpi/illustration_4.png b/res/drawable-xxxhdpi/illustration_4.png
diff --git a/res/drawable-xxxhdpi/menu_grey.png b/res/drawable-xxxhdpi/menu_grey.png
diff --git a/res/drawable-xxxhdpi/menu_red.png b/res/drawable-xxxhdpi/menu_red.png
diff --git a/res/drawable/instruction.png b/res/drawable/instruction.png
diff --git a/res/drawable/instruction2.png b/res/drawable/instruction2.png
diff --git a/res/drawable/instruction3.png b/res/drawable/instruction3.png
diff --git a/res/drawable/instruction_background.xml b/res/drawable/instruction_background.xml
diff --git a/res/drawable/instruction_background_2.xml b/res/drawable/instruction_background_2.xml
diff --git a/res/drawable/instruction_bullet_point_background.xml b/res/drawable/instruction_bullet_point_background.xml
diff --git a/res/drawable/instructions1_3.png b/res/drawable/instructions1_3.png
diff --git a/res/drawable/instructions2_3.png b/res/drawable/instructions2_3.png
diff --git a/res/drawable/instructions3_3.png b/res/drawable/instructions3_3.png
diff --git a/res/drawable/onboarding_banner_button_background.xml b/res/drawable/onboarding_banner_button_background.xml
diff --git a/res/drawable/onboarding_button_background.xml b/res/drawable/onboarding_button_background.xml
diff --git a/res/drawable/onboarding_pageindicator.xml b/res/drawable/onboarding_pageindicator.xml
diff --git a/res/drawable/onboarding_pageindicator_background.xml b/res/drawable/onboarding_pageindicator_background.xml
diff --git a/res/layout-land/activity_onboarding.xml b/res/layout-land/activity_onboarding.xml
diff --git a/res/layout/activity_onboarding.xml b/res/layout/activity_onboarding.xml