Merge "Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)" (958e559b) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/statusbar/IStatusBar.aidl

+4 −1

Original line number	Diff line number	Diff line
		@@ -36,9 +36,12 @@ oneway interface IStatusBar
		void setImeWindowStatus(in IBinder token, int vis, int backDisposition,
		boolean showImeSwitcher);
		void setHardKeyboardStatus(boolean available, boolean enabled);
		void setWindowState(int window, int state);

		void showRecentApps(boolean triggeredFromAltTab);
		void hideRecentApps();
		void toggleRecentApps();
		void preloadRecentApps();
		void cancelPreloadRecentApps();
		void setWindowState(int window, int state);
		}

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+4 −1

Original line number	Diff line number	Diff line
		@@ -52,8 +52,11 @@ interface IStatusBarService
		in String[] newlyVisibleKeys, in String[] noLongerVisibleKeys);
		void setSystemUiVisibility(int vis, int mask);
		void setHardKeyboardEnabled(boolean enabled);
		void setWindowState(int window, int state);

		void showRecentApps(boolean triggeredFromAltTab);
		void hideRecentApps();
		void toggleRecentApps();
		void preloadRecentApps();
		void cancelPreloadRecentApps();
		void setWindowState(int window, int state);
		}

packages/SystemUI/res/layout/recents_task_view.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@
		<com.android.systemui.recents.views.TaskView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		android:layout_height="match_parent"
		android:focusable="true">
		<com.android.systemui.recents.views.TaskThumbnailView
		android:id="@+id/task_view_thumbnail"
		android:layout_width="match_parent"
		@@ -69,7 +70,7 @@
		android:layout_height="@dimen/recents_task_view_application_icon_size"
		android:layout_gravity="center_vertical\|end"
		android:padding="23dp"
		android:src="@drawable/recents_dismiss_dark" />
		android:src="@drawable/recents_dismiss_light" />
		</com.android.systemui.recents.views.TaskBarView>
		</com.android.systemui.recents.views.TaskView>

packages/SystemUI/src/com/android/systemui/RecentsComponent.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -20,11 +20,9 @@ import android.view.Display;
		import android.view.View;

		public interface RecentsComponent {
		void showRecents(boolean triggeredFromAltTab, View statusBarView);
		void hideRecents();
		void toggleRecents(Display display, int layoutDirection, View statusBarView);

		void preloadRecentTasksList();

		void cancelPreloadingRecentTasksList();

		void closeRecents();
		void preloadRecents();
		void cancelPreloadingRecents();
		}

packages/SystemUI/src/com/android/systemui/recent/Recents.java

+23 −17

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.graphics.Paint;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.util.DisplayMetrics;
		import android.util.Log;
		@@ -65,11 +64,31 @@ public class Recents extends SystemUI implements RecentsComponent {
		mBootCompleted = true;
		}

		@Override
		public void showRecents(boolean triggeredFromAltTab, View statusBarView) {
		if (mUseAlternateRecents) {
		mAlternateRecents.onShowRecents(triggeredFromAltTab, statusBarView);
		}
		}

		@Override
		public void hideRecents() {
		if (mUseAlternateRecents) {
		mAlternateRecents.onHideRecents();
		} else {
		Intent intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT);
		intent.setPackage("com.android.systemui");
		sendBroadcastSafely(intent);

		RecentTasksLoader.getInstance(mContext).cancelPreloadingFirstTask();
		}
		}

		@Override
		public void toggleRecents(Display display, int layoutDirection, View statusBarView) {
		if (mUseAlternateRecents) {
		// Launch the alternate recents if required
		mAlternateRecents.onToggleRecents(display, layoutDirection, statusBarView);
		mAlternateRecents.onToggleRecents(statusBarView);
		return;
		}

		@@ -222,7 +241,7 @@ public class Recents extends SystemUI implements RecentsComponent {
		}

		@Override
		public void preloadRecentTasksList() {
		public void preloadRecents() {
		if (mUseAlternateRecents) {
		mAlternateRecents.onPreloadRecents();
		} else {
		@@ -236,7 +255,7 @@ public class Recents extends SystemUI implements RecentsComponent {
		}

		@Override
		public void cancelPreloadingRecentTasksList() {
		public void cancelPreloadingRecents() {
		if (mUseAlternateRecents) {
		mAlternateRecents.onCancelPreloadingRecents();
		} else {
		@@ -249,19 +268,6 @@ public class Recents extends SystemUI implements RecentsComponent {
		}
		}

		@Override
		public void closeRecents() {
		if (mUseAlternateRecents) {
		mAlternateRecents.onCloseRecents();
		} else {
		Intent intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT);
		intent.setPackage("com.android.systemui");
		sendBroadcastSafely(intent);

		RecentTasksLoader.getInstance(mContext).cancelPreloadingFirstTask();
		}
		}

		/**
		* Send broadcast only if BOOT_COMPLETED
		*/