diff -rupN ./a/frameworks/base/packages/SystemUI/res/layout/navigation_bar.xml ./b/frameworks/base/packages/SystemUI/res/layout/navigation_bar.xml
--- ./a/frameworks/base/packages/SystemUI/res/layout/navigation_bar.xml 2012-11-15 06:56:46.284574000 +0900
+++ ./b/frameworks/base/packages/SystemUI/res/layout/navigation_bar.xml 2012-11-26 02:22:33.688340970 +0900
@@ -23,7 +23,7 @@
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:background="#FF000000"
+ android:background="#88000000"
>
<FrameLayout android:id="@+id/rot0"
diff -rupN ./a/frameworks/base/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml ./b/frameworks/base/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
--- ./a/frameworks/base/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml 2012-11-15 06:56:51.254573000 +0900
+++ ./b/frameworks/base/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml 2012-11-26 02:22:45.329174028 +0900
@@ -22,7 +22,7 @@
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:background="#FF000000"
+ android:background="#88000000"
>
<FrameLayout android:id="@+id/rot0"
diff -rupN ./a/frameworks/base/packages/SystemUI/res/values/colors.xml ./b/frameworks/base/packages/SystemUI/res/values/colors.xml
--- ./a/frameworks/base/packages/SystemUI/res/values/colors.xml 2012-11-15 06:56:15.354577000 +0900
+++ ./b/frameworks/base/packages/SystemUI/res/values/colors.xml 2012-11-26 02:23:37.219186755 +0900
@@ -19,7 +19,7 @@
<resources>
<drawable name="notification_number_text_color">#ffffffff</drawable>
<drawable name="ticker_background_color">#ff1d1d1d</drawable>
- <drawable name="status_bar_background">#ff000000</drawable>
+ <drawable name="status_bar_background">#88000000</drawable>
<color name="notification_panel_solid_background">#ff000000</color>
<drawable name="status_bar_recents_app_thumbnail_background">#88000000</drawable>
<color name="status_bar_recents_app_label_color">#ffffffff</color>
@@ -31,8 +31,8 @@
<drawable name="notification_header_bg">#FF000000</drawable>
<!-- ==================== system bar only ==================== -->
- <drawable name="system_bar_background">#ff000000</drawable>
+ <drawable name="system_bar_background">#88000000</drawable>
<!-- the darkening filter applied to notifications -->
- <drawable name="notification_icon_area_smoke">#aa000000</drawable>
+ <drawable name="notification_icon_area_smoke">#88000000</drawable>
<color name="notification_panel_scrim_color">#B0000000</color>
</resources>
diff -rupN ./a/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java ./b/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
--- ./a/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java 2012-11-15 06:56:30.065396000 +0900
+++ ./b/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java 2012-11-26 02:17:11.528336640 +0900
@@ -2547,8 +2547,6 @@ public class PhoneWindowManager implemen
systemRect.top = mSystemTop;
systemRect.right = mSystemRight;
systemRect.bottom = mSystemBottom;
- if (mStatusBar != null) return mStatusBar.getSurfaceLayer();
- if (mNavigationBar != null) return mNavigationBar.getSurfaceLayer();
return 0;
}
diff -rupN ./a/packages/apps/Launcher2/res/layout-port/launcher.xml ./b/packages/apps/Launcher2/res/layout-port/launcher.xml
--- ./a/packages/apps/Launcher2/res/layout-port/launcher.xml 2012-11-15 06:56:33.644567000 +0900
+++ ./b/packages/apps/Launcher2/res/layout-port/launcher.xml 2012-11-26 02:13:44.479173944 +0900
@@ -19,7 +19,7 @@
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
android:id="@+id/drag_layer"
- android:background="@drawable/workspace_bg"
+ android:background="#00000000"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff -rupN ./a/packages/apps/Launcher2/res/values/dimens.xml ./b/packages/apps/Launcher2/res/values/dimens.xml
--- ./a/packages/apps/Launcher2/res/values/dimens.xml 2012-11-15 06:56:36.904569000 +0900
+++ ./b/packages/apps/Launcher2/res/values/dimens.xml 2012-11-26 02:14:58.399175719 +0900
@@ -43,8 +43,8 @@
<dimen name="workspace_divider_padding_right">3dp</dimen>
<dimen name="workspace_divider_padding_top">0dp</dimen>
<dimen name="workspace_divider_padding_bottom">0dp</dimen>
- <dimen name="hotseat_cell_width">64dp</dimen>
- <dimen name="hotseat_cell_height">64dp</dimen>
+ <dimen name="hotseat_cell_width">72dp</dimen>
+ <dimen name="hotseat_cell_height">88dp</dimen>
<dimen name="hotseat_width_gap">-1dp</dimen>
<dimen name="hotseat_height_gap">-1dp</dimen>
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
diff -rupN ./a/packages/apps/Launcher2/src/com/android/launcher2/CellLayout.java ./b/packages/apps/Launcher2/src/com/android/launcher2/CellLayout.java
--- ./a/packages/apps/Launcher2/src/com/android/launcher2/CellLayout.java 2012-11-26 02:13:14.109170000 +0900
+++ ./b/packages/apps/Launcher2/src/com/android/launcher2/CellLayout.java 2012-11-26 00:46:51.878340000 +0900
@@ -609,11 +609,7 @@ public class CellLayout extends ViewGrou
BubbleTextView bubbleChild = (BubbleTextView) child;
Resources res = getResources();
- if (mIsHotseat) {
- bubbleChild.setTextColor(res.getColor(android.R.color.transparent));
- } else {
- bubbleChild.setTextColor(res.getColor(R.color.workspace_icon_text_color));
- }
+ bubbleChild.setTextColor(res.getColor(R.color.workspace_icon_text_color));
}
child.setScaleX(getChildrenScale());
diff -rupN ./a/packages/apps/Launcher2/src/com/android/launcher2/Workspace.java ./b/packages/apps/Launcher2/src/com/android/launcher2/Workspace.java
--- ./a/packages/apps/Launcher2/src/com/android/launcher2/Workspace.java 2012-11-26 02:13:06.868336000 +0900
+++ ./b/packages/apps/Launcher2/src/com/android/launcher2/Workspace.java 2012-11-26 00:50:40.238351000 +0900
@@ -43,6 +43,7 @@ import android.os.Build;
import android.os.IBinder;
import android.os.Parcelable;
import android.util.AttributeSet;
+import android.util.DisplayMetrics;
import android.util.Log;
import android.util.SparseArray;
import android.view.Display;
@@ -522,7 +523,7 @@ public class Workspace extends SmoothPag
// Hide folder title in the hotseat
if (child instanceof FolderIcon) {
- ((FolderIcon) child).setTextVisible(false);
+ ((FolderIcon) child).setTextVisible(true);
}
if (screen < 0) {
@@ -837,12 +838,10 @@ public class Workspace extends SmoothPag
}
protected void setWallpaperDimension() {
- Point minDims = new Point();
- Point maxDims = new Point();
- mLauncher.getWindowManager().getDefaultDisplay().getCurrentSizeRange(minDims, maxDims);
-
- final int maxDim = Math.max(maxDims.x, maxDims.y);
- final int minDim = Math.min(minDims.x, minDims.y);
+ DisplayMetrics displayMetrics = new DisplayMetrics();
+ mLauncher.getWindowManager().getDefaultDisplay().getRealMetrics(displayMetrics);
+ final int maxDim = Math.max(displayMetrics.widthPixels, displayMetrics.heightPixels);
+ final int minDim = Math.min(displayMetrics.widthPixels, displayMetrics.heightPixels);
// We need to ensure that there is enough extra space in the wallpaper for the intended
// parallax effects
@@ -971,9 +970,9 @@ public class Workspace extends SmoothPag
class WallpaperOffsetInterpolator {
float mFinalHorizontalWallpaperOffset = 0.0f;
- float mFinalVerticalWallpaperOffset = 0.5f;
+ float mFinalVerticalWallpaperOffset = 0.0f;
float mHorizontalWallpaperOffset = 0.0f;
- float mVerticalWallpaperOffset = 0.5f;
+ float mVerticalWallpaperOffset = 0.0f;
long mLastWallpaperOffsetUpdateTime;
boolean mIsMovingFast;
boolean mOverrideHorizontalCatchupConstant;
