ref: e276ae3c2f8e1fc6a0f7cabdab925f5422772f7c
parent: d4635410828f93f418c902e2ed26152a737ff621
author: Martin Storsjö <[email protected]>
date: Fri May 30 06:14:07 EDT 2014
Convert android resource xml files to unix newlines Some of these files actually had mixed line endings previously.
--- a/codec/build/android/dec/res/layout/main.xml
+++ b/codec/build/android/dec/res/layout/main.xml
@@ -1,21 +1,21 @@
-<?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:orientation="vertical" >
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Button
- android:id="@+id/cfg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Load bitstreams" />
- <Button
- android:id="@+id/buttonSW"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Test" />
+<?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:orientation="vertical" >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <Button
+ android:id="@+id/cfg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Load bitstreams" />
+ <Button
+ android:id="@+id/buttonSW"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Test" />
</LinearLayout>
-</LinearLayout>
+</LinearLayout>
--- a/codec/build/android/dec/res/values/strings.xml
+++ b/codec/build/android/dec/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">WelsDecoderTest</string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">WelsDecoderTest</string>
+</resources>
--- a/codec/build/android/enc/res/layout/main.xml
+++ b/codec/build/android/enc/res/layout/main.xml
@@ -1,21 +1,21 @@
-<?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:orientation="vertical" >
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Button
- android:id="@+id/cfg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Load bitstreams" />
- <Button
- android:id="@+id/buttonSW"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Test" />
+<?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:orientation="vertical" >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <Button
+ android:id="@+id/cfg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Load bitstreams" />
+ <Button
+ android:id="@+id/buttonSW"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Test" />
</LinearLayout>
-</LinearLayout>
+</LinearLayout>
--- a/codec/build/android/enc/res/values/strings.xml
+++ b/codec/build/android/enc/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">WelsEncoderTest</string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">WelsEncoderTest</string>
+</resources>
--- a/test/build/android/res/layout/activity_main.xml
+++ b/test/build/android/res/layout/activity_main.xml
@@ -1,19 +1,19 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- tools:context="com.cisco.codec.unittest.MainActivity" >
-
- <TextView
- android:id="@+id/status_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:text="@string/hello_world" />
-
-</RelativeLayout>
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context="com.cisco.codec.unittest.MainActivity" >
+
+ <TextView
+ android:id="@+id/status_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:text="@string/hello_world" />
+
+</RelativeLayout>
+
--- a/test/build/android/res/menu/main.xml
+++ b/test/build/android/res/menu/main.xml
@@ -1,10 +1,10 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-
- <item
- android:id="@+id/action_settings"
- android:orderInCategory="100"
- android:title="@string/action_settings"
- android:showAsAction="never"/>
-
-</menu>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="100"
+ android:title="@string/action_settings"
+ android:showAsAction="never"/>
+
+</menu>
--- a/test/build/android/res/values-v11/styles.xml
+++ b/test/build/android/res/values-v11/styles.xml
@@ -1,11 +1,11 @@
-<resources>
-
- <!--
+<resources>
+
+ <!--
Base application theme for API 11+. This theme completely replaces
- AppBaseTheme from res/values/styles.xml on API 11+ devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Light">
- <!-- API 11 theme customizations can go here. -->
- </style>
-
-</resources>
+ AppBaseTheme from res/values/styles.xml on API 11+ devices.
+ -->
+ <style name="AppBaseTheme" parent="android:Theme.Light">
+ <!-- API 11 theme customizations can go here. -->
+ </style>
+
+</resources>
--- a/test/build/android/res/values-w820dp/dimens.xml
+++ b/test/build/android/res/values-w820dp/dimens.xml
@@ -1,10 +1,10 @@
-<resources>
-
- <!--
+<resources>
+
+ <!--
Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
- would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
- -->
- <dimen name="activity_horizontal_margin">64dp</dimen>
-
-</resources>
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+ -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+
+</resources>