merging with master

This commit is contained in:
chschtsch 2015-12-14 13:01:34 +03:00
parent 320ac82dea
commit 4f57d3a201
17 changed files with 438 additions and 606 deletions

View file

@ -7,4 +7,5 @@
<color name="durationText">#efff</color>
<color name="dark_overlay">#6000</color>
<color name="dark_image_background">#222</color>
<color name="background_gray">#EEEEEE</color>
</resources>

View file

@ -6,6 +6,7 @@
<item name="colorPrimary">@color/primaryColorYoutube</item>
<item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
<item name="colorAccent">@color/accentColorYoutube</item>
<item name="android:windowBackground">@color/background_gray</item>
</style>
<style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >