Merge upstream

2017-03-09 04:28:02 +03:00 · 2017-03-09 04:28:02 +03:00 · ccf9e41ec1
parent 0a329db4a3 8fd6a7b75c
commit ccf9e41ec1
164 changed files with 91 additions and 1 deletions
--- a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
@ -20,7 +20,7 @@ import java.util.Locale;
 public class LaunchActivity extends AppCompatActivity {
    ImageView connect, cancel, imageViewLogo;
    TextView status;
-    //AnimationDrawable logo;
+    AnimationDrawable logo;
    Boolean isPressed = false;
    SharedPreferences sharedPreferences;
    MediaPlayer m;
--- a/app/src/main/res/drawable-hdpi/logo1.png
+++ b/app/src/main/res/drawable-hdpi/logo1.png
--- a/app/src/main/res/drawable-hdpi/logo10.png
+++ b/app/src/main/res/drawable-hdpi/logo10.png
--- a/app/src/main/res/drawable-hdpi/logo11.png
+++ b/app/src/main/res/drawable-hdpi/logo11.png
--- a/app/src/main/res/drawable-hdpi/logo12.png
+++ b/app/src/main/res/drawable-hdpi/logo12.png
--- a/app/src/main/res/drawable-hdpi/logo13.png
+++ b/app/src/main/res/drawable-hdpi/logo13.png
--- a/app/src/main/res/drawable-hdpi/logo14.png
+++ b/app/src/main/res/drawable-hdpi/logo14.png
--- a/app/src/main/res/drawable-hdpi/logo15.png
+++ b/app/src/main/res/drawable-hdpi/logo15.png
--- a/app/src/main/res/drawable-hdpi/logo16.png
+++ b/app/src/main/res/drawable-hdpi/logo16.png
--- a/app/src/main/res/drawable-hdpi/logo17.png
+++ b/app/src/main/res/drawable-hdpi/logo17.png
--- a/app/src/main/res/drawable-hdpi/logo18.png
+++ b/app/src/main/res/drawable-hdpi/logo18.png
--- a/app/src/main/res/drawable-hdpi/logo19.png
+++ b/app/src/main/res/drawable-hdpi/logo19.png
--- a/app/src/main/res/drawable-hdpi/logo2.png
+++ b/app/src/main/res/drawable-hdpi/logo2.png
--- a/app/src/main/res/drawable-hdpi/logo20.png
+++ b/app/src/main/res/drawable-hdpi/logo20.png
--- a/app/src/main/res/drawable-hdpi/logo21.png
+++ b/app/src/main/res/drawable-hdpi/logo21.png
--- a/app/src/main/res/drawable-hdpi/logo22.png
+++ b/app/src/main/res/drawable-hdpi/logo22.png
--- a/app/src/main/res/drawable-hdpi/logo23.png
+++ b/app/src/main/res/drawable-hdpi/logo23.png
--- a/app/src/main/res/drawable-hdpi/logo24.png
+++ b/app/src/main/res/drawable-hdpi/logo24.png
--- a/app/src/main/res/drawable-hdpi/logo25.png
+++ b/app/src/main/res/drawable-hdpi/logo25.png
--- a/app/src/main/res/drawable-hdpi/logo26.png
+++ b/app/src/main/res/drawable-hdpi/logo26.png
--- a/app/src/main/res/drawable-hdpi/logo27.png
+++ b/app/src/main/res/drawable-hdpi/logo27.png
--- a/app/src/main/res/drawable-hdpi/logo28.png
+++ b/app/src/main/res/drawable-hdpi/logo28.png
--- a/app/src/main/res/drawable-hdpi/logo29.png
+++ b/app/src/main/res/drawable-hdpi/logo29.png
--- a/app/src/main/res/drawable-hdpi/logo3.png
+++ b/app/src/main/res/drawable-hdpi/logo3.png
--- a/app/src/main/res/drawable-hdpi/logo30.png
+++ b/app/src/main/res/drawable-hdpi/logo30.png
--- a/app/src/main/res/drawable-hdpi/logo31.png
+++ b/app/src/main/res/drawable-hdpi/logo31.png
--- a/app/src/main/res/drawable-hdpi/logo32.png
+++ b/app/src/main/res/drawable-hdpi/logo32.png
--- a/app/src/main/res/drawable-hdpi/logo33.png
+++ b/app/src/main/res/drawable-hdpi/logo33.png
--- a/app/src/main/res/drawable-hdpi/logo34.png
+++ b/app/src/main/res/drawable-hdpi/logo34.png
--- a/app/src/main/res/drawable-hdpi/logo35.png
+++ b/app/src/main/res/drawable-hdpi/logo35.png
--- a/app/src/main/res/drawable-hdpi/logo36.png
+++ b/app/src/main/res/drawable-hdpi/logo36.png
--- a/app/src/main/res/drawable-hdpi/logo37.png
+++ b/app/src/main/res/drawable-hdpi/logo37.png
--- a/app/src/main/res/drawable-hdpi/logo38.png
+++ b/app/src/main/res/drawable-hdpi/logo38.png
--- a/app/src/main/res/drawable-hdpi/logo39.png
+++ b/app/src/main/res/drawable-hdpi/logo39.png
--- a/app/src/main/res/drawable-hdpi/logo4.png
+++ b/app/src/main/res/drawable-hdpi/logo4.png
--- a/app/src/main/res/drawable-hdpi/logo5.png
+++ b/app/src/main/res/drawable-hdpi/logo5.png
--- a/app/src/main/res/drawable-hdpi/logo6.png
+++ b/app/src/main/res/drawable-hdpi/logo6.png
--- a/app/src/main/res/drawable-hdpi/logo7.png
+++ b/app/src/main/res/drawable-hdpi/logo7.png
--- a/app/src/main/res/drawable-hdpi/logo8.png
+++ b/app/src/main/res/drawable-hdpi/logo8.png
--- a/app/src/main/res/drawable-hdpi/logo9.png
+++ b/app/src/main/res/drawable-hdpi/logo9.png
--- a/app/src/main/res/drawable-hdpi/subtitle_frame.png
+++ b/app/src/main/res/drawable-hdpi/subtitle_frame.png
--- a/app/src/main/res/drawable-mdpi/logo1.png
+++ b/app/src/main/res/drawable-mdpi/logo1.png
--- a/app/src/main/res/drawable-mdpi/logo10.png
+++ b/app/src/main/res/drawable-mdpi/logo10.png
--- a/app/src/main/res/drawable-mdpi/logo11.png
+++ b/app/src/main/res/drawable-mdpi/logo11.png
--- a/app/src/main/res/drawable-mdpi/logo12.png
+++ b/app/src/main/res/drawable-mdpi/logo12.png
--- a/app/src/main/res/drawable-mdpi/logo13.png
+++ b/app/src/main/res/drawable-mdpi/logo13.png
--- a/app/src/main/res/drawable-mdpi/logo14.png
+++ b/app/src/main/res/drawable-mdpi/logo14.png
--- a/app/src/main/res/drawable-mdpi/logo15.png
+++ b/app/src/main/res/drawable-mdpi/logo15.png
--- a/app/src/main/res/drawable-mdpi/logo16.png
+++ b/app/src/main/res/drawable-mdpi/logo16.png
--- a/app/src/main/res/drawable-mdpi/logo17.png
+++ b/app/src/main/res/drawable-mdpi/logo17.png
--- a/app/src/main/res/drawable-mdpi/logo18.png
+++ b/app/src/main/res/drawable-mdpi/logo18.png
--- a/app/src/main/res/drawable-mdpi/logo19.png
+++ b/app/src/main/res/drawable-mdpi/logo19.png
--- a/app/src/main/res/drawable-mdpi/logo2.png
+++ b/app/src/main/res/drawable-mdpi/logo2.png
--- a/app/src/main/res/drawable-mdpi/logo20.png
+++ b/app/src/main/res/drawable-mdpi/logo20.png
--- a/app/src/main/res/drawable-mdpi/logo21.png
+++ b/app/src/main/res/drawable-mdpi/logo21.png
--- a/app/src/main/res/drawable-mdpi/logo22.png
+++ b/app/src/main/res/drawable-mdpi/logo22.png
--- a/app/src/main/res/drawable-mdpi/logo23.png
+++ b/app/src/main/res/drawable-mdpi/logo23.png
--- a/app/src/main/res/drawable-mdpi/logo24.png
+++ b/app/src/main/res/drawable-mdpi/logo24.png
--- a/app/src/main/res/drawable-mdpi/logo25.png
+++ b/app/src/main/res/drawable-mdpi/logo25.png
--- a/app/src/main/res/drawable-mdpi/logo26.png
+++ b/app/src/main/res/drawable-mdpi/logo26.png
--- a/app/src/main/res/drawable-mdpi/logo27.png
+++ b/app/src/main/res/drawable-mdpi/logo27.png
--- a/app/src/main/res/drawable-mdpi/logo28.png
+++ b/app/src/main/res/drawable-mdpi/logo28.png
--- a/app/src/main/res/drawable-mdpi/logo29.png
+++ b/app/src/main/res/drawable-mdpi/logo29.png
--- a/app/src/main/res/drawable-mdpi/logo3.png
+++ b/app/src/main/res/drawable-mdpi/logo3.png
--- a/app/src/main/res/drawable-mdpi/logo30.png
+++ b/app/src/main/res/drawable-mdpi/logo30.png
--- a/app/src/main/res/drawable-mdpi/logo31.png
+++ b/app/src/main/res/drawable-mdpi/logo31.png
--- a/app/src/main/res/drawable-mdpi/logo32.png
+++ b/app/src/main/res/drawable-mdpi/logo32.png
--- a/app/src/main/res/drawable-mdpi/logo33.png
+++ b/app/src/main/res/drawable-mdpi/logo33.png
--- a/app/src/main/res/drawable-mdpi/logo34.png
+++ b/app/src/main/res/drawable-mdpi/logo34.png
--- a/app/src/main/res/drawable-mdpi/logo35.png
+++ b/app/src/main/res/drawable-mdpi/logo35.png
--- a/app/src/main/res/drawable-mdpi/logo36.png
+++ b/app/src/main/res/drawable-mdpi/logo36.png
--- a/app/src/main/res/drawable-mdpi/logo37.png
+++ b/app/src/main/res/drawable-mdpi/logo37.png
--- a/app/src/main/res/drawable-mdpi/logo38.png
+++ b/app/src/main/res/drawable-mdpi/logo38.png
--- a/app/src/main/res/drawable-mdpi/logo39.png
+++ b/app/src/main/res/drawable-mdpi/logo39.png
--- a/app/src/main/res/drawable-mdpi/logo4.png
+++ b/app/src/main/res/drawable-mdpi/logo4.png
--- a/app/src/main/res/drawable-mdpi/logo5.png
+++ b/app/src/main/res/drawable-mdpi/logo5.png
--- a/app/src/main/res/drawable-mdpi/logo6.png
+++ b/app/src/main/res/drawable-mdpi/logo6.png
--- a/app/src/main/res/drawable-mdpi/logo7.png
+++ b/app/src/main/res/drawable-mdpi/logo7.png
--- a/app/src/main/res/drawable-mdpi/logo8.png
+++ b/app/src/main/res/drawable-mdpi/logo8.png
--- a/app/src/main/res/drawable-mdpi/logo9.png
+++ b/app/src/main/res/drawable-mdpi/logo9.png
--- a/app/src/main/res/drawable-mdpi/subtitle_frame.png
+++ b/app/src/main/res/drawable-mdpi/subtitle_frame.png
--- a/app/src/main/res/drawable-xhdpi/logo1.png
+++ b/app/src/main/res/drawable-xhdpi/logo1.png
--- a/app/src/main/res/drawable-xhdpi/logo10.png
+++ b/app/src/main/res/drawable-xhdpi/logo10.png
--- a/app/src/main/res/drawable-xhdpi/logo11.png
+++ b/app/src/main/res/drawable-xhdpi/logo11.png
--- a/app/src/main/res/drawable-xhdpi/logo12.png
+++ b/app/src/main/res/drawable-xhdpi/logo12.png
--- a/app/src/main/res/drawable-xhdpi/logo13.png
+++ b/app/src/main/res/drawable-xhdpi/logo13.png
--- a/app/src/main/res/drawable-xhdpi/logo14.png
+++ b/app/src/main/res/drawable-xhdpi/logo14.png
--- a/app/src/main/res/drawable-xhdpi/logo15.png
+++ b/app/src/main/res/drawable-xhdpi/logo15.png
--- a/app/src/main/res/drawable-xhdpi/logo16.png
+++ b/app/src/main/res/drawable-xhdpi/logo16.png
--- a/app/src/main/res/drawable-xhdpi/logo17.png
+++ b/app/src/main/res/drawable-xhdpi/logo17.png
--- a/app/src/main/res/drawable-xhdpi/logo18.png
+++ b/app/src/main/res/drawable-xhdpi/logo18.png
--- a/app/src/main/res/drawable-xhdpi/logo19.png
+++ b/app/src/main/res/drawable-xhdpi/logo19.png
--- a/app/src/main/res/drawable-xhdpi/logo2.png
+++ b/app/src/main/res/drawable-xhdpi/logo2.png
--- a/app/src/main/res/drawable-xhdpi/logo20.png
+++ b/app/src/main/res/drawable-xhdpi/logo20.png
--- a/app/src/main/res/drawable-xhdpi/logo21.png
+++ b/app/src/main/res/drawable-xhdpi/logo21.png
--- a/app/src/main/res/drawable-xhdpi/logo22.png
+++ b/app/src/main/res/drawable-xhdpi/logo22.png
--- a/app/src/main/res/drawable-xhdpi/logo23.png
+++ b/app/src/main/res/drawable-xhdpi/logo23.png
--- a/app/src/main/res/drawable-xhdpi/logo24.png
+++ b/app/src/main/res/drawable-xhdpi/logo24.png
--- a/app/src/main/res/drawable-xhdpi/logo25.png
+++ b/app/src/main/res/drawable-xhdpi/logo25.png
--- a/app/src/main/res/drawable-xhdpi/logo26.png
+++ b/app/src/main/res/drawable-xhdpi/logo26.png
--- a/Show More
+++ b/Show More