Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
c059cbed
Commit
c059cbed
authored
Jun 28, 2012
by
Sébastien Toque
Browse files
simplify video list layout, loading message doesn't belong there
parent
9d37bed9
Changes
2
Hide whitespace changes
Inline
Side-by-side
vlc-android/res/layout/video_list.xml
View file @
c059cbed
<?xml version="1.0" encoding="utf-8"?>
<
Linear
Layout
<
Frame
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
...
...
@@ -11,36 +11,11 @@
android:divider=
"@color/item_common"
android:dividerHeight=
"1dp"
android:fastScrollEnabled=
"true"
/>
<FrameLayout
<TextView
android:id=
"@id/android:empty"
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
>
<LinearLayout
android:id=
"@+id/video_list_empty_loadfile"
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
android:gravity=
"center"
>
<ProgressBar
android:layout_width=
"20dip"
android:layout_height=
"20dip"
android:layout_margin=
"11dip"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/loading"
android:textSize=
"20dip"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/video_list_empty_nofile"
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
android:gravity=
"center"
android:visibility=
"invisible"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/nomedia"
android:textSize=
"20dip"
/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
android:layout_height=
"fill_parent"
android:gravity=
"center"
android:text=
"@string/nomedia"
android:textSize=
"20dip"
/>
</FrameLayout>
vlc-android/src/org/videolan/vlc/gui/video/VideoListFragment.java
View file @
c059cbed
...
...
@@ -51,7 +51,6 @@ import android.view.MenuItem;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.AdapterView.AdapterContextMenuInfo
;
import
android.widget.LinearLayout
;
import
android.widget.ListView
;
import
com.actionbarsherlock.app.SherlockListFragment
;
...
...
@@ -59,8 +58,6 @@ import com.actionbarsherlock.app.SherlockListFragment;
public
class
VideoListFragment
extends
SherlockListFragment
implements
ISortable
{
public
final
static
String
TAG
=
"VLC/VideoListFragment"
;
private
LinearLayout
mNoFileLayout
;
private
LinearLayout
mLoadFileLayout
;
private
VideoListAdapter
mVideoAdapter
;
protected
Media
mItemToUpdate
;
...
...
@@ -89,8 +86,6 @@ public class VideoListFragment extends SherlockListFragment implements ISortable
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
View
v
=
inflater
.
inflate
(
R
.
layout
.
video_list
,
container
,
false
);
mNoFileLayout
=
(
LinearLayout
)
v
.
findViewById
(
R
.
id
.
video_list_empty_nofile
);
mLoadFileLayout
=
(
LinearLayout
)
v
.
findViewById
(
R
.
id
.
video_list_empty_loadfile
);
return
v
;
}
...
...
@@ -240,9 +235,6 @@ public class VideoListFragment extends SherlockListFragment implements ISortable
}
}
mVideoAdapter
.
sort
();
}
else
{
mLoadFileLayout
.
setVisibility
(
View
.
INVISIBLE
);
mNoFileLayout
.
setVisibility
(
View
.
VISIBLE
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment