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