diff --git a/res/drawable-sw600dp-hdpi/ic_allapps.png b/res/drawable-sw600dp-hdpi/ic_allapps.png
index 4353a45187..09a516e1ef 100644
Binary files a/res/drawable-sw600dp-hdpi/ic_allapps.png and b/res/drawable-sw600dp-hdpi/ic_allapps.png differ
diff --git a/res/drawable-sw600dp-hdpi/ic_allapps_pressed.png b/res/drawable-sw600dp-hdpi/ic_allapps_pressed.png
index bb18919eee..71bead3b7a 100644
Binary files a/res/drawable-sw600dp-hdpi/ic_allapps_pressed.png and b/res/drawable-sw600dp-hdpi/ic_allapps_pressed.png differ
diff --git a/res/drawable-sw600dp-mdpi/ic_allapps.png b/res/drawable-sw600dp-mdpi/ic_allapps.png
index f85c895452..78177c6327 100644
Binary files a/res/drawable-sw600dp-mdpi/ic_allapps.png and b/res/drawable-sw600dp-mdpi/ic_allapps.png differ
diff --git a/res/drawable-sw600dp-mdpi/ic_allapps_pressed.png b/res/drawable-sw600dp-mdpi/ic_allapps_pressed.png
index 8fb71444de..bb484d5c6f 100644
Binary files a/res/drawable-sw600dp-mdpi/ic_allapps_pressed.png and b/res/drawable-sw600dp-mdpi/ic_allapps_pressed.png differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_allapps.png b/res/drawable-sw600dp-xhdpi/ic_allapps.png
index 5da19c8947..ed1bc8d064 100644
Binary files a/res/drawable-sw600dp-xhdpi/ic_allapps.png and b/res/drawable-sw600dp-xhdpi/ic_allapps.png differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_allapps_pressed.png b/res/drawable-sw600dp-xhdpi/ic_allapps_pressed.png
index 59ac2bccd7..b0ff0841bd 100644
Binary files a/res/drawable-sw600dp-xhdpi/ic_allapps_pressed.png and b/res/drawable-sw600dp-xhdpi/ic_allapps_pressed.png differ
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index 3352fbbc59..88b7bbf4e3 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -13,9 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
@@ -24,6 +23,7 @@
android:id="@+id/search_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
android:src="@drawable/ic_home_search_normal_holo"
android:adjustViewBounds="true"
android:onClick="onClickSearchButton"
@@ -31,24 +31,17 @@
android:clickable="true"
android:contentDescription="@string/accessibility_search_button" />
-
-
-
+
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 3e1841748d..9c54cf3dbe 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -17,22 +17,18 @@
0dp
0dp
- 90
-
-
- 75dp
- 75dp
11sp
-
-
- 70dp
- 86dp
- 86dp
+
+ 14dp
+ 14dp
36dp
8dp
20dp
14dp
+
+
+ 82dp
diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml
index c8137251e8..1a254092b4 100644
--- a/res/values-sw600dp-port/dimens.xml
+++ b/res/values-sw600dp-port/dimens.xml
@@ -15,9 +15,6 @@
-->
-
- -1
-
96dp
96dp
@@ -26,8 +23,6 @@
25dp
10dp
-
- 75dp
- 75dp
-
+
+ 54dp
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 1b866707ad..2d02040e33 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -15,26 +15,27 @@
-->
- 72dp
- 75
+ 54dp
3dp
4dp
+ 70dp
+ 70dp
-1dp
-1dp
82dip
- 0dp
- 0dp
+ 10dp
+ 20dp
33dp
33dp
- 82dp
+ 92dp
- 72dp
- 96dp
- 96dp
+ 60dp
+ 84dp
+ 93dp
96dp
@@ -47,10 +48,10 @@
36dp
- 96dp
- 96dp
- 86dp
- 96dp
+ 82dp
+ 82dp
+ 82dp
+ 82dp
32dp
0dp
0dp
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 04937cd908..848c40958b 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -35,10 +35,6 @@
0dp
10dp
-
- -1
- -1
-
4dip
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d3b9c1e9b2..d5bcb667d9 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -64,8 +64,6 @@
52dp
0dp
48dp
- -1
- -1
74dp
82dp
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index ba20a76baf..69457eaece 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -136,8 +136,6 @@ public class CellLayout extends ViewGroup {
private ShortcutAndWidgetContainer mShortcutsAndWidgets;
private boolean mIsHotseat = false;
- private float mChildScale = 1f;
- private float mHotseatChildScale = 1f;
public static final int MODE_DRAG_OVER = 0;
public static final int MODE_ON_DROP = 1;
@@ -214,15 +212,6 @@ public class CellLayout extends ViewGroup {
mNormalBackground.setFilterBitmap(true);
mActiveGlowBackground.setFilterBitmap(true);
- int iconScale = res.getInteger(R.integer.app_icon_scale_percent);
- if (iconScale >= 0) {
- mChildScale = iconScale / 100f;
- }
- int hotseatIconScale = res.getInteger(R.integer.app_icon_hotseat_scale_percent);
- if (hotseatIconScale >= 0) {
- mHotseatChildScale = hotseatIconScale / 100f;
- }
-
// Initialize the data structures used for the drag visualization.
mEaseOutInterpolator = new DecelerateInterpolator(2.5f); // Quint ease out
@@ -571,52 +560,19 @@ public class CellLayout extends ViewGroup {
mIsHotseat = isHotseat;
}
- public float getChildrenScale() {
- return mIsHotseat ? mHotseatChildScale : mChildScale;
- }
-
-
- private void scaleChild(BubbleTextView bubbleChild, float scale) {
- // If we haven't measured the child yet, do it now
- // (this happens if we're being dropped from all-apps
- if (bubbleChild.getLayoutParams() instanceof LayoutParams &&
- (bubbleChild.getMeasuredWidth() | bubbleChild.getMeasuredHeight()) == 0) {
- getShortcutsAndWidgets().measureChild(bubbleChild);
- }
-
- bubbleChild.setScaleX(scale);
- bubbleChild.setScaleY(scale);
- }
-
- private void resetChild(BubbleTextView bubbleChild) {
- bubbleChild.setScaleX(1f);
- bubbleChild.setScaleY(1f);
-
- bubbleChild.setTextColor(getResources().getColor(R.color.workspace_icon_text_color));
- }
-
public boolean addViewToCellLayout(View child, int index, int childId, LayoutParams params,
boolean markCells) {
final LayoutParams lp = params;
- // Hotseat icons - scale down and remove text
- // Don't scale the all apps button
- // scale percent set to -1 means do not scale
- // Only scale BubbleTextViews
+ // Hotseat icons - remove text
if (child instanceof BubbleTextView) {
BubbleTextView bubbleChild = (BubbleTextView) child;
- // Start the child with 100% scale and visible text
- resetChild(bubbleChild);
-
- if (mIsHotseat && mHotseatChildScale >= 0) {
- // Scale/make transparent for a hotseat
- scaleChild(bubbleChild, mHotseatChildScale);
-
- bubbleChild.setTextColor(getResources().getColor(android.R.color.transparent));
- } else if (mChildScale >= 0) {
- // Else possibly still scale it if we need to for smaller icons
- scaleChild(bubbleChild, mChildScale);
+ Resources res = getResources();
+ if (mIsHotseat) {
+ bubbleChild.setTextColor(res.getColor(android.R.color.transparent));
+ } else {
+ bubbleChild.setTextColor(res.getColor(R.color.workspace_icon_text_color));
}
}
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 379e599764..b31666571d 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -462,20 +462,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
float scale = getDescendantCoordRelativeToSelf((View) child.getParent(), coord);
int toX = coord[0];
int toY = coord[1];
- if (child instanceof TextView) {
- float childrenScale = parent.getChildrenScale();
- TextView tv = (TextView) child;
-
- // The child may be scaled (always about the center of the view) so to account for it,
- // we have to offset the position by the scaled size. Once we do that, we can center
- // the drag view about the scaled child view.
- toY += Math.round(((1f - childrenScale) * child.getMeasuredHeight()) / 2 +
- scale * childrenScale * tv.getPaddingTop());
- toY -= dragView.getMeasuredHeight() * (1 - scale * childrenScale) / 2;
- toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2;
-
- scale *= childrenScale;
- } else if (child instanceof FolderIcon) {
+ if (child instanceof FolderIcon) {
// Account for holographic blur padding on the drag view
toY -= Workspace.DRAG_BITMAP_PADDING / 2;
// Center in the x coordinate about the target's drawable