diff options
| -rw-r--r-- | res/drawable-hdpi/ic_pageindicator_add.png | bin | 607 -> 729 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_pageindicator_add.png | bin | 504 -> 537 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_pageindicator_add.png | bin | 710 -> 873 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_pageindicator_add.png | bin | 1370 -> 1578 bytes | |||
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 12 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 23 |
7 files changed, 19 insertions, 24 deletions
diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png Binary files differindex c77a4f9e4..c37d622e5 100644 --- a/res/drawable-hdpi/ic_pageindicator_add.png +++ b/res/drawable-hdpi/ic_pageindicator_add.png diff --git a/res/drawable-mdpi/ic_pageindicator_add.png b/res/drawable-mdpi/ic_pageindicator_add.png Binary files differindex 22420bd08..8e05e64f0 100644 --- a/res/drawable-mdpi/ic_pageindicator_add.png +++ b/res/drawable-mdpi/ic_pageindicator_add.png diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png Binary files differindex 9647b8f85..28e164b23 100644 --- a/res/drawable-xhdpi/ic_pageindicator_add.png +++ b/res/drawable-xhdpi/ic_pageindicator_add.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png Binary files differindex 591b18900..fd8a662e1 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_add.png +++ b/res/drawable-xxhdpi/ic_pageindicator_add.png diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 81f9af2e1..72a6ce2e1 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -296,12 +296,8 @@ public class CellLayout extends ViewGroup { addView(mShortcutsAndWidgets); } - public void enableHardwareLayers() { - mShortcutsAndWidgets.setLayerType(LAYER_TYPE_HARDWARE, sPaint); - } - - public void disableHardwareLayers() { - mShortcutsAndWidgets.setLayerType(LAYER_TYPE_NONE, sPaint); + public void enableHardwareLayer(boolean hasLayer) { + mShortcutsAndWidgets.setLayerType(hasLayer ? LAYER_TYPE_HARDWARE : LAYER_TYPE_NONE, sPaint); } public void buildHardwareLayer() { diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 33eb595ef..8a6fbc1b8 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -498,17 +498,17 @@ public class DynamicGrid { boolean hasAA = !AppsCustomizePagedView.DISABLE_ALL_APPS; // Our phone profiles include the bar sizes in each orientation deviceProfiles.add(new DeviceProfile("Super Short Stubby", - 255, 300, 2, 3, 48, 12, (hasAA ? 5 : 4), 48)); + 255, 300, 2, 3, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Shorter Stubby", - 255, 400, 3, 3, 48, 12, (hasAA ? 5 : 4), 48)); + 255, 400, 3, 3, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Short Stubby", - 275, 420, 3, 4, 48, 12, (hasAA ? 5 : 4), 48)); + 275, 420, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Stubby", - 255, 450, 3, 4, 48, 12, (hasAA ? 5 : 4), 48)); + 255, 450, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Nexus S", - 296, 491.33f, 4, 4, 48, 12, (hasAA ? 5 : 4), 48)); + 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, 60, 12, (hasAA ? 5 : 4), 56)); + 359, 518, 4, 4, 60, 13, (hasAA ? 5 : 4), 56)); // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7", diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 02d4fff7b..2b7a737a2 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1046,7 +1046,7 @@ public class Workspace extends SmoothPagedView mLauncher.updateVoiceButtonProxyVisible(false); } } - }; + } protected void setWallpaperDimension() { String spKey = WallpaperCropActivity.getSharedPreferencesKey(); @@ -1572,7 +1572,7 @@ public class Workspace extends SmoothPagedView } else { for (int i = 0; i < getPageCount(); i++) { final CellLayout cl = (CellLayout) getChildAt(i); - cl.disableHardwareLayers(); + cl.enableHardwareLayer(false); } } } @@ -1592,17 +1592,16 @@ public class Workspace extends SmoothPagedView leftScreen--; } } + + final CellLayout customScreen = mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID); for (int i = 0; i < screenCount; i++) { final CellLayout layout = (CellLayout) getPageAt(i); - if (!(leftScreen <= i && i <= rightScreen && shouldDrawChild(layout))) { - layout.disableHardwareLayers(); - } - } - for (int i = 0; i < screenCount; i++) { - final CellLayout layout = (CellLayout) getPageAt(i); - if (leftScreen <= i && i <= rightScreen && shouldDrawChild(layout)) { - layout.enableHardwareLayers(); - } + + // enable layers between left and right screen inclusive, except for the + // customScreen, which may animate its content during transitions. + boolean enableLayer = layout != customScreen && + leftScreen <= i && i <= rightScreen && shouldDrawChild(layout); + layout.enableHardwareLayer(enableLayer); } } } @@ -4283,7 +4282,7 @@ public class Workspace extends SmoothPagedView if (screenId == EXTRA_EMPTY_SCREEN_ID) { int count = mScreenOrder.size() - (hasCustomContent() ? 1 : 0); if (count > 1) { - return new PageIndicator.PageMarkerResources(R.drawable.ic_pageindicator_add, + return new PageIndicator.PageMarkerResources(R.drawable.ic_pageindicator_current, R.drawable.ic_pageindicator_add); } } |
