diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-06-22 21:34:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-22 21:34:06 +0000 |
commit | 653bfcc7433b10ea2d5dc8cde612d6143af766b8 (patch) | |
tree | ac50fe5bfbdf8d4946d653bc7f46988902715db8 /src/com/android/launcher3/Launcher.java | |
parent | 0c1e7280e270ea0c86a6617499ab411e6199529d (diff) | |
parent | d0a6ae7f645e6ba564aebb50316c53fa2e119459 (diff) | |
download | android_packages_apps_Trebuchet-653bfcc7433b10ea2d5dc8cde612d6143af766b8.tar.gz android_packages_apps_Trebuchet-653bfcc7433b10ea2d5dc8cde612d6143af766b8.tar.bz2 android_packages_apps_Trebuchet-653bfcc7433b10ea2d5dc8cde612d6143af766b8.zip |
Merge "Accessibility fixes and updates" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c0c04a187..1a92cb2ad 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -235,7 +235,6 @@ public class Launcher extends Activity @Thunk Workspace mWorkspace; private View mLauncherView; - private PageIndicator mPageIndicator; @Thunk DragLayer mDragLayer; private DragController mDragController; @@ -513,9 +512,7 @@ public class Launcher extends Activity if (mExtractedColors != null && Utilities.isNycOrAbove()) { mExtractedColors.load(this); mHotseat.updateColor(mExtractedColors, !mPaused); - if (mPageIndicator != null) { - mPageIndicator.updateColor(mExtractedColors); - } + mWorkspace.getPageIndicator().updateColor(mExtractedColors); } } @@ -1329,9 +1326,8 @@ public class Launcher extends Activity mLauncherView = findViewById(R.id.launcher); mDragLayer = (DragLayer) findViewById(R.id.drag_layer); mFocusHandler = mDragLayer.getFocusIndicatorHelper(); - mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace); - mPageIndicator = (PageIndicator) mDragLayer.findViewById(R.id.page_indicator); + mWorkspace.initParentViews(mDragLayer); mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION @@ -2683,7 +2679,7 @@ public class Launcher extends Activity * Event handler for the (Add) Widgets button that appears after a long press * on the home screen. */ - protected void onClickAddWidgetButton(View view) { + public void onClickAddWidgetButton(View view) { if (LOGD) Log.d(TAG, "onClickAddWidgetButton"); if (mIsSafeModeEnabled) { Toast.makeText(this, R.string.safemode_widget_error, Toast.LENGTH_SHORT).show(); @@ -2696,7 +2692,7 @@ public class Launcher extends Activity * Event handler for the wallpaper picker button that appears after a long press * on the home screen. */ - protected void onClickWallpaperPicker(View v) { + public void onClickWallpaperPicker(View v) { if (!Utilities.isWallapaperAllowed(this)) { Toast.makeText(this, R.string.msg_disabled_by_admin, Toast.LENGTH_SHORT).show(); return; @@ -2719,7 +2715,7 @@ public class Launcher extends Activity * Event handler for a click on the settings button that appears after a long press * on the home screen. */ - private void onClickSettingsButton(View v) { + public void onClickSettingsButton(View v) { if (LOGD) Log.d(TAG, "onClickSettingsButton"); startActivity(new Intent(Utilities.ACTION_APPLICATION_PREFERENCES) .setPackage(getPackageName())); @@ -3262,7 +3258,7 @@ public class Launcher extends Activity /** * Shows the overview button. */ - void showOverviewMode(boolean animated) { + public void showOverviewMode(boolean animated) { showOverviewMode(animated, false); } |