Merge remote-tracking branch 'upstream/cm-10.1' into ics

Conflicts:
	src/com/cyanogenmod/filemanager/util/FileHelper.java

res/layout-sw600dp/theme_view.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<com.cyanogenmod.filemanager.ui.preferences.ThemeView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="1dp"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/theme_name"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance" />
+
+    <TextView
+      android:id="@+id/theme_author"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/theme_name"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance_nohighlight" />
+
+    <TextView
+      android:id="@+id/theme_desc"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="false"
+      android:maxLines="2"
+      android:textAppearance="@style/secondary_text_appearance" />
+
+    <ImageView
+      android:id="@+id/theme_preview"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_above="@id/theme_desc"
+      android:layout_below="@id/theme_author"
+      android:padding="@dimen/extra_large_margin"
+      android:layout_gravity="center"
+      android:scaleType="centerInside"
+      android:contentDescription="@null" />
+
+</com.cyanogenmod.filemanager.ui.preferences.ThemeView>

res/layout-sw720dp/theme_view.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<com.cyanogenmod.filemanager.ui.preferences.ThemeView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="1dp"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/theme_name"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance" />
+
+    <TextView
+      android:id="@+id/theme_author"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/theme_name"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance_nohighlight" />
+
+    <TextView
+      android:id="@+id/theme_desc"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="false"
+      android:maxLines="2"
+      android:textAppearance="@style/secondary_text_appearance" />
+
+    <ImageView
+      android:id="@+id/theme_preview"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_above="@id/theme_desc"
+      android:layout_below="@id/theme_author"
+      android:padding="@dimen/extra_large_margin"
+      android:layout_gravity="center"
+      android:scaleType="centerInside"
+      android:contentDescription="@null" />
+
+</com.cyanogenmod.filemanager.ui.preferences.ThemeView>

res/layout/bookmarks_item.xml

@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
   android:layout_height="@dimen/default_row_height"
-  android:background="@drawable/holo_selector" >
+  android:background="@drawable/holo_list_selector_deselected" >
 
   <ImageView
     android:id="@+id/bookmarks_item_icon"

res/layout/editor.xml

@@ -46,6 +46,7 @@
       android:gravity="top|left"
       android:cursorVisible="true"
       android:background="@null"
+      android:imeOptions="actionDone|flagNoFullscreen"
       android:inputType="textMultiLine|textImeMultiLine"
       android:text="@null"
       android:textAppearance="@style/secondary_text_appearance" />

res/layout/filesystem_info_dialog.xml

@@ -128,6 +128,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -152,6 +153,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -176,6 +178,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -200,6 +203,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:maxLines="5"
@@ -225,6 +229,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />