merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d0ca53e..3c3897e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,7 +66,8 @@
android:label="@string/application_name"
android:icon="@drawable/ic_launcher_home"
android:hardwareAccelerated="true"
- android:largeHeap="@bool/config_largeHeap">
+ android:largeHeap="@bool/config_largeHeap"
+ android:supportsRtl="true">
<activity
android:name="com.android.launcher2.Launcher"
android:launchMode="singleTask"
@@ -85,7 +86,7 @@
<activity
android:name="com.android.launcher2.WallpaperChooser"
- style="@style/Theme.WallpaperPicker"
+ android:theme="@style/Theme.WallpaperPicker"
android:label="@string/pick_wallpaper"
android:icon="@drawable/ic_launcher_wallpaper"
android:finishOnCloseSystemDialogs="true"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index efd29a6..41ba9e2 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -22,7 +22,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="gone">
+ android:visibility="gone"
+ android:layoutDirection="ltr">
<!-- The layout_width of the tab bar gets overriden to align the content
with the text in the tabs in AppsCustomizeTabHost. -->
<FrameLayout
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fed4194..0960269 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,8 +18,7 @@
-->
<resources>
- <style name="Theme.WallpaperPicker">
- <item name="android:screenOrientation">nosensor</item>
+ <style name="Theme.WallpaperPicker" parent="@android:style/Theme.Holo.NoActionBar">
</style>
<style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 7d17249..77cb467 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -98,6 +98,7 @@
private float mOverScrollMaxBackgroundAlpha = 0.0f;
private float mWallpaperScrollRatio = 1.0f;
+ private int mOriginalPageSpacing;
private final WallpaperManager mWallpaperManager;
private IBinder mWindowToken;
@@ -273,6 +274,7 @@
public Workspace(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
mContentIsRefreshable = false;
+ mOriginalPageSpacing = mPageSpacing;
mDragEnforcer = new DropTarget.DragEnforcer(context);
// With workspace, data is available straight from the get-go
@@ -1594,7 +1596,7 @@
setLayoutScale(finalScaleFactor);
}
} else {
- setPageSpacing(PagedView.AUTOMATIC_PAGE_SPACING);
+ setPageSpacing(mOriginalPageSpacing);
setLayoutScale(1.0f);
}