Commit 0055418a authored by Sébastien Toque's avatar Sébastien Toque

reindent with spaces only

parent 2f5bb8fc
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="1"
android:versionCode="1"
android:versionName="0.0-alpha"
package="org.videolan.vlc.android"
android:installLocation="auto">
<uses-sdk
android:minSdkVersion="8" />
<application
android:icon="@drawable/icon"
android:label="@string/app_name">
<activity
android:label="@string/app_name"
android:icon="@drawable/icon"
android:name=".MainActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="SearchActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable"/>
</activity>
<activity
android:name="AboutActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="PreferencesActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="VideoActivityGroup"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="VideoListActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name=".MediaInfoActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="VideoPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" />
</intent-filter>
</activity>
<activity
android:name=".AudioBrowserActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name=".AudioActivityGroup"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name=".AudioPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<service
android:name=".AudioService"/>
<activity
android:name="BrowserActivity"
android:label="@string/mediafiles"
android:theme="@android:style/Theme">
</activity>
<receiver
android:name="PhoneStateReceiver">
<intent-filter>
<action android:name="android.intent.action.PHONE_STATE" />
</intent-filter>
</receiver>
</application>
<uses-sdk android:minSdkVersion="8" />
<application
android:icon="@drawable/icon"
android:label="@string/app_name">
<activity
android:label="@string/app_name"
android:icon="@drawable/icon"
android:name=".MainActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="SearchActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable"/>
</activity>
<activity
android:name="AboutActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="PreferencesActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="VideoActivityGroup"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="VideoListActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name=".MediaInfoActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="VideoPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" />
</intent-filter>
</activity>
<activity
android:name=".AudioBrowserActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name=".AudioActivityGroup"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name=".AudioPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<service
android:name=".AudioService"/>
<activity
android:name="BrowserActivity"
android:label="@string/mediafiles"
android:theme="@android:style/Theme">
</activity>
<receiver
android:name="PhoneStateReceiver">
<intent-filter>
<action android:name="android.intent.action.PHONE_STATE" />
</intent-filter>
</receiver>
</application>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.INTERNET" />
......
......@@ -107,7 +107,7 @@ int aout_open(void **opaque, char *format, unsigned *rate, unsigned *nb_channels
// Get the play methodId
p_sys->play = (*p_env)->GetMethodID (p_env, cls, "playAudio", "([BI)V");
assert (p_sys->play != NULL);
return 0;
return 0;
}
/**
......
......@@ -104,7 +104,7 @@ static void vlc_event_callback(const libvlc_event_t *ev, void *data)
int isAttached = 0;
if (eventManagerInstance == NULL)
return;
return;
status = (*myVm)->GetEnv(myVm, (void**) &env, JNI_VERSION_1_2);
if (status < 0) {
......
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="#000000" />
<item android:state_pressed="true" android:color="#000000" />
<item android:color="#FFFFFF" />
</selector>
\ No newline at end of file
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="#000000" />
<item android:state_pressed="true" android:color="#000000" />
<item android:color="#FFFFFF" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/header_button_focused" />
<item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/header_button_pressed" />
<item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/header_button_pressed" />
<item android:drawable="@drawable/header_button_normal" />
<item android:drawable="@drawable/header_button_normal" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="#80CCCCCC" />
<solid android:color="#80CCCCCC" />
</shape>
</item>
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<solid android:color="#80CCCCCC" />
</shape>
</clip>
</item>
</item>
<item android:id="@android:id/progress">
<clip>
<clip>
<shape>
<solid android:color="#F48B00" />
<solid android:color="#F48B00" />
</shape>
</clip>
</item>
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#77000000"/>
<corners android:radius="3dip"/>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#77000000" />
<corners android:radius="3dip" />
</shape>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_text"/>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_text" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<HorizontalScrollView
android:id="@+id/header"
android:scrollbars="none"
android:fadingEdge="none"
android:layout_width="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<HorizontalScrollView
android:id="@+id/header"
android:scrollbars="none"
android:fadingEdge="none"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_with_shadow" >
android:background="@drawable/bg_with_shadow">
<LinearLayout
android:id="@+id/header_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView
android:text="@string/songs"
android:textSize="16dip"
android:textColor="#ffffff"
android:id="@+id/songs"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
<TextView
android:text="@string/artists"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/artists"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal"/>
<TextView
android:text="@string/albums"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/albums"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal"/>
<TextView
android:text="@string/genres"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/genres"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
<TextView
android:text="@string/playlists"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/playlists"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal"/>
</LinearLayout>
android:id="@+id/header_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:text="@string/songs"
android:textSize="16dip"
android:textColor="#ffffff"
android:id="@+id/songs"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
<TextView
android:text="@string/artists"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/artists"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
<TextView
android:text="@string/albums"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/albums"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
<TextView
android:text="@string/genres"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/genres"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
<TextView
android:text="@string/playlists"
android:textSize="16dip"
android:textColor="#888888"
android:id="@+id/playlists"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:gravity="center_horizontal" />
</LinearLayout>
</HorizontalScrollView>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="#f0f0f0"/>
<org.videolan.vlc.android.widget.FlingViewGroup
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ListView
android:id="@+id/songs_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fastScrollEnabled="true" />
<LinearLayout
android:id="@+id/artists_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/albums_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/genres_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/playklists_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</org.videolan.vlc.android.widget.FlingViewGroup>
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="#f0f0f0" />
<org.videolan.vlc.android.widget.FlingViewGroup
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/songs_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fastScrollEnabled="true" />
<LinearLayout
android:id="@+id/artists_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/albums_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/genres_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/playklists_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</org.videolan.vlc.android.widget.FlingViewGroup>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_with_shadow">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dip"
android:orientation="horizontal"
android:background="@drawable/header" >
<ImageView
android:src="@drawable/header_logo"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:scaleType="centerInside"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<ImageView
android:layout_height="match_parent"
android:layout_width="0dip"
android:layout_weight="1"
android:background="#ffffff"
android:layout_marginLeft="15dip"
android:layout_marginTop="15dip"
android:id="@+id/cover"/>
<LinearLayout
android:layout_width="90dip"
android:layout_height="match_parent"
android:gravity="bottom"
android:paddingLeft="15dip"
android:orientation="vertical">
<ImageButton
android:src="@drawable/ic_shuffle"
android:background="#00000000"
android:scaleType="fitXY"
android:padding="10dip"
android:layout_height="60dip"
android:layout_width="60dip"
android:layout_marginBottom="10dip"
android:id="@+id/shuffle"
android:onClick="onShuffleClick"/>
<ImageButton
android:src="@drawable/ic_repeat"
android:background="#00000000"
android:scaleType="fitXY"
android:padding="10dip"
android:layout_height="60dip"
android:layout_width="60dip"
android:id="@+id/repeat"
android:onClick="onRepeatClick"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginLeft="15dip"
android:layout_marginTop="10dip"
android:layout_marginRight="15dip">
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="18dip"
android:text="@string/time_0"
android:textColor="#ffffff"
android:id="@+id/time"/>
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="18dip"
android:text="@string/time_0"
android:gravity="right"
android:textColor="#ffffff"
android:id="@+id/length"/>
</LinearLayout>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="4dip"
android:maxHeight="4dip"
android:progressDrawable="@drawable/po_seekbar"
android:thumb="@drawable/ic_seekbar_thumb"
android:paddingTop="5dip"
android:paddingBottom="10dip"
android:paddingLeft="15dip"
android:paddingRight="15dip"
android:id="@+id/timeline"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/title"
android:textColor="#ffffff"
android:textSize="20dip"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginBottom="4dip"
android:id="@+id/title"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/artist"
android:textColor="#888888"
android:textSize="18dip"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginBottom="4dip"
android:id="@+id/artist"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/album"
android:textColor="#888888"
android:textSize="18dip"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:singleLine="true"
android:ellipsize="marquee"
android:id="@+id/album"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:layout_margin="10dip">
<ImageButton
android:background="@drawable/ic_backward"
android:layout_height="70dip"
android:layout_width="70dip"
android:id="@+id/previous"
android:onClick="onPreviousClick"/>
<ImageButton
android:background="@drawable/ic_pause"
android:layout_width="70dip"
android:layout_height="70dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:id="@+id/play_pause"
android:onClick="onPlayPauseClick"/>
<ImageButton
android:background="@drawable/ic_forward"
android:layout_height="70dip"
android:layout_width="70dip"
android:id="@+id/next"
android:onClick="onNextClick"/>
</LinearLayout>
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_with_shadow">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dip"
android:orientation