Fixing issue with overview panel buttons. (e9f27273) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+80 −47

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.ResolveInfo;
		import android.content.res.Configuration;
		import android.database.sqlite.SQLiteDatabase;
		import android.graphics.Bitmap;
		@@ -1268,7 +1267,7 @@ public class Launcher extends Activity
		if (mState == State.WORKSPACE && !mWorkspace.isInOverviewMode() &&
		!mWorkspace.isSwitchingState()) {
		mOverviewPanel.requestFocus();
		showOverviewMode(true);
		showOverviewMode(true, true /* requestButtonFocus */);
		}
		}
		return true;
		@@ -1370,7 +1369,46 @@ public class Launcher extends Activity
		mHotseat.setOnLongClickListener(this);
		}

		// Setup the overview panel
		setupOverviewPanel();

		// Setup the workspace
		mWorkspace.setHapticFeedbackEnabled(false);
		mWorkspace.setOnLongClickListener(this);
		mWorkspace.setup(dragController);
		dragController.addDragListener(mWorkspace);

		// Get the search/delete bar
		mSearchDropTargetBar = (SearchDropTargetBar)
		mDragLayer.findViewById(R.id.search_drop_target_bar);

		// Setup Apps and Widgets
		mAppsView = (AllAppsContainerView) findViewById(R.id.apps_view);
		mWidgetsView = (WidgetsContainerView) findViewById(R.id.widgets_view);
		if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {
		mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());
		} else {
		mAppsView.setSearchBarController(mAppsView.newDefaultAppSearchController());
		}

		// Setup the drag controller (drop targets have to be added in reverse order in priority)
		dragController.setDragScoller(mWorkspace);
		dragController.setScrollView(mDragLayer);
		dragController.setMoveTarget(mWorkspace);
		dragController.addDropTarget(mWorkspace);
		if (mSearchDropTargetBar != null) {
		mSearchDropTargetBar.setup(this, dragController);
		mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar());
		}

		if (TestingUtils.MEMORY_DUMP_ENABLED) {
		TestingUtils.addWeightWatcher(this);
		}
		}

		private void setupOverviewPanel() {
		mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel);

		// Long-clicking buttons in the overview panel does the same thing as clicking them.
		OnLongClickListener performClickOnLongClick = new OnLongClickListener() {
		@Override
		@@ -1378,32 +1416,37 @@ public class Launcher extends Activity
		return v.performClick();
		}
		};
		mWidgetsButton = findViewById(R.id.widget_button);
		mWidgetsButton.setOnClickListener(new OnClickListener() {

		// Bind wallpaper button actions
		View wallpaperButton = findViewById(R.id.wallpaper_button);
		wallpaperButton.setOnClickListener(new OnClickListener() {
		@Override
		public void onClick(View view) {
		if (!mWorkspace.isSwitchingState()) {
		onClickAddWidgetButton(view);
		onClickWallpaperPicker(view);
		}
		}
		});
		mWidgetsButton.setOnLongClickListener(performClickOnLongClick);
		mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());
		wallpaperButton.setOnLongClickListener(performClickOnLongClick);
		wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());

		View wallpaperButton = findViewById(R.id.wallpaper_button);
		wallpaperButton.setOnClickListener(new OnClickListener() {
		// Bind widget button actions
		mWidgetsButton = findViewById(R.id.widget_button);
		mWidgetsButton.setOnClickListener(new OnClickListener() {
		@Override
		public void onClick(View view) {
		if (!mWorkspace.isSwitchingState()) {
		onClickWallpaperPicker(view);
		onClickAddWidgetButton(view);
		}
		}
		});
		wallpaperButton.setOnLongClickListener(performClickOnLongClick);
		wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
		mWidgetsButton.setOnLongClickListener(performClickOnLongClick);
		mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());

		// Bind settings actions
		View settingsButton = findViewById(R.id.settings_button);
		if (hasSettings()) {
		boolean hasSettings = hasSettings();
		if (hasSettings) {
		settingsButton.setOnClickListener(new OnClickListener() {
		@Override
		public void onClick(View view) {
		@@ -1419,39 +1462,6 @@ public class Launcher extends Activity
		}

		mOverviewPanel.setAlpha(0f);

		// Setup the workspace
		mWorkspace.setHapticFeedbackEnabled(false);
		mWorkspace.setOnLongClickListener(this);
		mWorkspace.setup(dragController);
		dragController.addDragListener(mWorkspace);

		// Get the search/delete bar
		mSearchDropTargetBar = (SearchDropTargetBar)
		mDragLayer.findViewById(R.id.search_drop_target_bar);

		// Setup Apps and Widgets
		mAppsView = (AllAppsContainerView) findViewById(R.id.apps_view);
		mWidgetsView = (WidgetsContainerView) findViewById(R.id.widgets_view);
		if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {
		mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());
		} else {
		mAppsView.setSearchBarController(mAppsView.newDefaultAppSearchController());
		}

		// Setup the drag controller (drop targets have to be added in reverse order in priority)
		dragController.setDragScoller(mWorkspace);
		dragController.setScrollView(mDragLayer);
		dragController.setMoveTarget(mWorkspace);
		dragController.addDropTarget(mWorkspace);
		if (mSearchDropTargetBar != null) {
		mSearchDropTargetBar.setup(this, dragController);
		mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar());
		}

		if (TestingUtils.MEMORY_DUMP_ENABLED) {
		TestingUtils.addWeightWatcher(this);
		}
		}

		/**
		@@ -3352,12 +3362,35 @@ public class Launcher extends Activity
		return changed;
		}

		/**
		* Shows the overview button.
		*/
		void showOverviewMode(boolean animated) {
		showOverviewMode(animated, false);
		}

		/**
		* Shows the overview button, and if {@param requestButtonFocus} is set, will force the focus
		* onto one of the overview panel buttons.
		*/
		void showOverviewMode(boolean animated, boolean requestButtonFocus) {
		Runnable postAnimRunnable = null;
		if (requestButtonFocus) {
		postAnimRunnable = new Runnable() {
		@Override
		public void run() {
		// Hitting the menu button when in touch mode does not trigger touch mode to
		// be disabled, so if requested, force focus on one of the overview panel
		// buttons.
		mOverviewPanel.requestFocusFromTouch();
		}
		};
		}
		mWorkspace.setVisibility(View.VISIBLE);
		mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
		Workspace.State.OVERVIEW,
		WorkspaceStateTransitionAnimation.SCROLL_TO_CURRENT_PAGE, animated,
		null /* onCompleteRunnable */);
		postAnimRunnable);
		mState = State.WORKSPACE;
		}