diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 15:04:51 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 15:05:09 -0800 |
commit | a52ecb0390c85afb385371bb844bb496c59ddf87 (patch) | |
tree | a3a0a6fff80e059a0a10181fb74164aa3e642758 /src/com/android/launcher3/Workspace.java | |
parent | 90a40570bc54506979d3610ee331deacfa7300ec (diff) | |
download | android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.tar.gz android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.tar.bz2 android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.zip |
Removing all compatibility code below Lollipop
Bug: 32745285
Change-Id: I62971908e3e4402941fab627bbdfd47be64473a3
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 8a423e3a5..ed148fe06 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1782,11 +1782,6 @@ public class Workspace extends PagedView } protected void onResume() { - // Update wallpaper dimensions if they were changed since last onResume - // (we also always set the wallpaper dimensions in the constructor) - if (LauncherAppState.getInstance().hasWallpaperChangedSinceLastCheck()) { - setWallpaperDimension(); - } mWallpaperOffset.onResume(); } @@ -2091,20 +2086,13 @@ public class Workspace extends PagedView public void updateAccessibilityFlags() { // TODO: Update the accessibility flags appropriately when dragging. if (!mLauncher.getAccessibilityDelegate().isInAccessibleDrag()) { - if (Utilities.ATLEAST_LOLLIPOP) { - int total = getPageCount(); - for (int i = numCustomPages(); i < total; i++) { - updateAccessibilityFlags((CellLayout) getPageAt(i), i); - } - setImportantForAccessibility((mState == State.NORMAL || mState == State.OVERVIEW) - ? IMPORTANT_FOR_ACCESSIBILITY_AUTO - : IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); - } else { - int accessible = mState == State.NORMAL ? - IMPORTANT_FOR_ACCESSIBILITY_AUTO : - IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS; - setImportantForAccessibility(accessible); + int total = getPageCount(); + for (int i = numCustomPages(); i < total; i++) { + updateAccessibilityFlags((CellLayout) getPageAt(i), i); } + setImportantForAccessibility((mState == State.NORMAL || mState == State.OVERVIEW) + ? IMPORTANT_FOR_ACCESSIBILITY_AUTO + : IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); } } |