Skip to content

Commit

Permalink
Update Player
Browse files Browse the repository at this point in the history
  • Loading branch information
Crossle Song committed Dec 17, 2012
1 parent 3f3df10 commit 7b798c1
Show file tree
Hide file tree
Showing 9 changed files with 1,907 additions and 1,039 deletions.
21 changes: 19 additions & 2 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,32 @@
android:targetSdkVersion="17" />

<application
android:debuggable="true"
android:icon="@drawable/ic_launcher"
android:label="@string/vitamio_name"
android:debuggable="true">
android:label="@string/vitamio_name" >
<activity
android:name="io.vov.vitamio.activity.InitActivity"
android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
android:launchMode="singleTop"
android:theme="@android:style/Theme.NoTitleBar"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name="io.vov.vitamio.activity.VideoActivity"
android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
android:launchMode="singleTop"
android:process=":vplayer"
android:windowSoftInputMode="stateAlwaysHidden" >
</activity>
<activity
android:name="io.vov.vitamio.activity.InitActivity"
android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
android:launchMode="singleTop"
android:theme="@android:style/Theme.NoTitleBar"
android:windowSoftInputMode="stateAlwaysHidden" />

<service
android:name="io.vov.vitamio.activity.PlayerService"
android:process=":vplayer" />
</application>

</manifest>
30 changes: 0 additions & 30 deletions res/layout/activity_video.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,6 @@
android:textColor="@android:color/white"
android:textSize="20.0sp" />
</RelativeLayout>

<RelativeLayout
android:id="@+id/subtitle_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="10.0dip" >

<io.vov.vitamio.widget.OutlineTextView
android:id="@+id/subtitle_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center_vertical|center_horizontal"
android:shadowColor="@color/gray"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="2"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold" />

<ImageView
android:id="@+id/subtitle_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center_vertical|center_horizontal"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>

</io.vov.vitamio.widget.CenterLayout>
3 changes: 2 additions & 1 deletion res/layout/mediacontroller.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="0.0dip"
android:orientation="horizontal" >
android:orientation="horizontal"
android:visibility="invisible" >

<LinearLayout
android:id="@+id/info_panel"
Expand Down
2 changes: 1 addition & 1 deletion res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<string name="vitamio_videoview_error_button">OK</string>
<string name="mediacontroller_play_pause">Play/Pause</string>

<string name="video_layout_loading">Loadin&#8230;</string>
<string name="video_layout_loading">Loading&#8230;</string>
<string name="video_original">100%</string>
<string name="video_fit_screen">FIT SCREEN</string>
<string name="video_stretch">STRETCH</string>
Expand Down
Loading

0 comments on commit 7b798c1

Please sign in to comment.