Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f2b38be2b0
9 changed files with 34 additions and 18 deletions
|
|
@ -5,8 +5,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/black"
|
||||
android:gravity="center"
|
||||
android:keepScreenOn="true">
|
||||
android:gravity="center">
|
||||
|
||||
<com.google.android.exoplayer2.ui.AspectRatioFrameLayout
|
||||
android:id="@+id/aspectRatioLayout"
|
||||
|
|
|
|||
|
|
@ -8,20 +8,20 @@
|
|||
android:title="@string/download"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_share"
|
||||
android:icon="?attr/share"
|
||||
android:title="@string/share"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_play_with_kodi"
|
||||
android:icon="?attr/cast"
|
||||
android:title="@string/play_with_kodi_title"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_share"
|
||||
android:icon="?attr/share"
|
||||
android:title="@string/share"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_openInBrowser"
|
||||
android:title="@string/open_in_browser"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<string name="popup_remember_size_pos_key" translatable="false">popup_remember_size_pos_key</string>
|
||||
|
||||
<string name="default_popup_resolution_key" translatable="false">default_popup_resolution_key</string>
|
||||
<string name="default_popup_resolution_value" translatable="false">480p</string>
|
||||
<string name="default_popup_resolution_value" translatable="false">360p</string>
|
||||
|
||||
<string name="show_higher_resolutions_key" translatable="false">show_higher_resolutions_key</string>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue