1.0.x changes merged into trunk

5 files changed, 79 insertions, 79 deletions

diff --git a/res/anim/push_left_in.xml b/res/anim/push_left_in.xml
index b7d2d0da0..45fb4875a 100644
--- a/res/anim/push_left_in.xml
+++ b/res/anim/push_left_in.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

-</set>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
diff --git a/res/anim/push_left_out.xml b/res/anim/push_left_out.xml
index 6bdc0ce47..845679f16 100644
--- a/res/anim/push_left_out.xml
+++ b/res/anim/push_left_out.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
 </set>
\ No newline at end of file
diff --git a/res/anim/push_right_in.xml b/res/anim/push_right_in.xml
index 89daae972..09a244406 100644
--- a/res/anim/push_right_in.xml
+++ b/res/anim/push_right_in.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

-</set>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
diff --git a/res/anim/push_right_out.xml b/res/anim/push_right_out.xml
index b4b796b52..e8893a69a 100644
--- a/res/anim/push_right_out.xml
+++ b/res/anim/push_right_out.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
 </set>
\ No newline at end of file
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index dd123b370..f57578846 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -12,7 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-     
+
      Author: 359 <359@siol.com>
 -->