Merge "Expose action that allows landing on the work tab" (6974d39a) · Commits · e / os / android_packages_apps_Trebuchet

AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		android:enabled="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<action android:name="android.intent.action.SHOW_WORK_APPS" />
		<category android:name="android.intent.category.HOME" />
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.MONKEY"/>

src/com/android/launcher3/Launcher.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,7 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
		import com.android.launcher3.allapps.ActivityAllAppsContainerView;
		import com.android.launcher3.allapps.AllAppsStore;
		import com.android.launcher3.allapps.AllAppsTransitionController;
		import com.android.launcher3.allapps.BaseAllAppsContainerView;
		import com.android.launcher3.allapps.DiscoveryBounce;
		import com.android.launcher3.anim.AnimatorListeners;
		import com.android.launcher3.anim.PropertyListBuilder;
		@@ -1579,6 +1580,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
		boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this);
		hideKeyboard();

		if (isActionMain) {
		if (!internalStateHandled) {
		// In all these cases, only animate if we're already on home
		@@ -1607,6 +1609,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		handleGestureContract(intent);
		} else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) {
		showAllAppsFromIntent(alreadyOnHome);
		} else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) {
		showAllAppsWorkTabFromIntent(alreadyOnHome);
		}

		TraceHelper.INSTANCE.endSection(traceToken);
		@@ -1617,6 +1621,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		getStateManager().goToState(ALL_APPS, alreadyOnHome);
		}

		private void showAllAppsWorkTabFromIntent(boolean alreadyOnHome) {
		showAllAppsFromIntent(alreadyOnHome);
		mAppsView.switchToTab(BaseAllAppsContainerView.AdapterHolder.WORK);
		}

		/**
		* Handles gesture nav contract
		*/

src/com/android/launcher3/allapps/BaseAllAppsContainerView.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -331,6 +331,16 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte
		return mViewPager.getNextPage() == 0;
		}

		/**
		* Switches the current page to the provided {@code tab} if tabs are supported, otherwise does
		* nothing.
		*/
		public void switchToTab(int tab) {
		if (mUsingTabs) {
		mViewPager.setCurrentPage(tab);
		}
		}

		public LayoutInflater getLayoutInflater() {
		return LayoutInflater.from(getContext());
		}