Merge "Decouple recents from status bar." (3f43c4e6) · Commits · e / os / android_frameworks_base

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

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui;

		import android.view.Display;
		import android.view.View;

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

		void preloadRecentTasksList();

		void cancelPreloadingRecentTasksList();

		void closeRecents();
		}

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -21,9 +21,11 @@ import android.content.res.Configuration;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Map;

		public abstract class SystemUI {
		public Context mContext;
		public Map<Class<?>, Object> mComponents;

		public abstract void start();

		@@ -32,4 +34,15 @@ public abstract class SystemUI {

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		}

		@SuppressWarnings("unchecked")
		public <T> T getComponent(Class<T> interfaceType) {
		return (T) (mComponents != null ? mComponents.get(interfaceType) : null);
		}

		public <T, C extends T> void putComponent(Class<T> interfaceType, C component) {
		if (mComponents != null) {
		mComponents.put(interfaceType, component);
		}
		}
		}

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.util.Log;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.HashMap;

		public class SystemUIService extends Service {
		private static final String TAG = "SystemUIService";
		@@ -32,6 +33,7 @@ public class SystemUIService extends Service {
		* The classes of the stuff to start.
		*/
		private final Class<?>[] SERVICES = new Class[] {
		com.android.systemui.recent.Recents.class,
		com.android.systemui.statusbar.SystemBars.class,
		com.android.systemui.power.PowerUI.class,
		com.android.systemui.media.RingtonePlayer.class,
		@@ -45,6 +47,7 @@ public class SystemUIService extends Service {

		@Override
		public void onCreate() {
		HashMap<Class<?>, Object> components = new HashMap<Class<?>, Object>();
		final int N = SERVICES.length;
		for (int i=0; i<N; i++) {
		Class<?> cl = SERVICES[i];
		@@ -57,6 +60,7 @@ public class SystemUIService extends Service {
		throw new RuntimeException(ex);
		}
		mServices[i].mContext = this;
		mServices[i].mComponents = components;
		Log.d(TAG, "running: " + mServices[i]);
		mServices[i].start();
		}

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

0 → 100644

+212 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.recent;

		import android.app.ActivityOptions;
		import android.content.ActivityNotFoundException;
		import android.content.Intent;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.Paint;
		import android.os.UserHandle;
		import android.util.DisplayMetrics;
		import android.util.Log;
		import android.view.Display;
		import android.view.View;

		import com.android.systemui.R;
		import com.android.systemui.RecentsComponent;
		import com.android.systemui.SystemUI;

		public class Recents extends SystemUI implements RecentsComponent {
		private static final String TAG = "Recents";
		private static final boolean DEBUG = false;

		@Override
		public void start() {
		putComponent(RecentsComponent.class, this);
		}

		@Override
		public void toggleRecents(Display display, int layoutDirection, View statusBarView) {
		if (DEBUG) Log.d(TAG, "toggle recents panel");
		try {
		TaskDescription firstTask = RecentTasksLoader.getInstance(mContext).getFirstTask();

		Intent intent = new Intent(RecentsActivity.TOGGLE_RECENTS_INTENT);
		intent.setClassName("com.android.systemui",
		"com.android.systemui.recent.RecentsActivity");
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
		\| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

		if (firstTask == null) {
		if (RecentsActivity.forceOpaqueBackground(mContext)) {
		ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext,
		R.anim.recents_launch_from_launcher_enter,
		R.anim.recents_launch_from_launcher_exit);
		mContext.startActivityAsUser(intent, opts.toBundle(), new UserHandle(
		UserHandle.USER_CURRENT));
		} else {
		// The correct window animation will be applied via the activity's style
		mContext.startActivityAsUser(intent, new UserHandle(
		UserHandle.USER_CURRENT));
		}

		} else {
		Bitmap first = firstTask.getThumbnail();
		final Resources res = mContext.getResources();

		float thumbWidth = res
		.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_width);
		float thumbHeight = res
		.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height);
		if (first == null) {
		throw new RuntimeException("Recents thumbnail is null");
		}
		if (first.getWidth() != thumbWidth \|\| first.getHeight() != thumbHeight) {
		first = Bitmap.createScaledBitmap(first, (int) thumbWidth, (int) thumbHeight,
		true);
		if (first == null) {
		throw new RuntimeException("Recents thumbnail is null");
		}
		}


		DisplayMetrics dm = new DisplayMetrics();
		display.getMetrics(dm);
		// calculate it here, but consider moving it elsewhere
		// first, determine which orientation you're in.
		final Configuration config = res.getConfiguration();
		int x, y;

		if (config.orientation == Configuration.ORIENTATION_PORTRAIT) {
		float appLabelLeftMargin = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_app_label_left_margin);
		float appLabelWidth = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_app_label_width);
		float thumbLeftMargin = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_thumbnail_left_margin);
		float thumbBgPadding = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_thumbnail_bg_padding);

		float width = appLabelLeftMargin +
		+appLabelWidth
		+ thumbLeftMargin
		+ thumbWidth
		+ 2 * thumbBgPadding;

		x = (int) ((dm.widthPixels - width) / 2f + appLabelLeftMargin + appLabelWidth
		+ thumbBgPadding + thumbLeftMargin);
		y = (int) (dm.heightPixels
		- res.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height)
		- thumbBgPadding);
		if (layoutDirection == View.LAYOUT_DIRECTION_RTL) {
		x = dm.widthPixels - x - res.getDimensionPixelSize(
		R.dimen.status_bar_recents_thumbnail_width);
		}

		} else { // if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
		float thumbTopMargin = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_thumbnail_top_margin);
		float thumbBgPadding = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_thumbnail_bg_padding);
		float textPadding = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_text_description_padding);
		float labelTextSize = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_app_label_text_size);
		Paint p = new Paint();
		p.setTextSize(labelTextSize);
		float labelTextHeight = p.getFontMetricsInt().bottom
		- p.getFontMetricsInt().top;
		float descriptionTextSize = res.getDimensionPixelSize(
		R.dimen.status_bar_recents_app_description_text_size);
		p.setTextSize(descriptionTextSize);
		float descriptionTextHeight = p.getFontMetricsInt().bottom
		- p.getFontMetricsInt().top;

		float statusBarHeight = res.getDimensionPixelSize(
		com.android.internal.R.dimen.status_bar_height);
		float recentsItemTopPadding = statusBarHeight;

		float height = thumbTopMargin
		+ thumbHeight
		+ 2 * thumbBgPadding + textPadding + labelTextHeight
		+ recentsItemTopPadding + textPadding + descriptionTextHeight;
		float recentsItemRightPadding = res
		.getDimensionPixelSize(R.dimen.status_bar_recents_item_padding);
		float recentsScrollViewRightPadding = res
		.getDimensionPixelSize(R.dimen.status_bar_recents_right_glow_margin);
		x = (int) (dm.widthPixels - res
		.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_width)
		- thumbBgPadding - recentsItemRightPadding
		- recentsScrollViewRightPadding);
		y = (int) ((dm.heightPixels - statusBarHeight - height) / 2f + thumbTopMargin
		+ recentsItemTopPadding + thumbBgPadding + statusBarHeight);
		}

		ActivityOptions opts = ActivityOptions.makeThumbnailScaleDownAnimation(
		statusBarView,
		first, x, y,
		new ActivityOptions.OnAnimationStartedListener() {
		public void onAnimationStarted() {
		Intent intent =
		new Intent(RecentsActivity.WINDOW_ANIMATION_START_INTENT);
		intent.setPackage("com.android.systemui");
		mContext.sendBroadcastAsUser(intent,
		new UserHandle(UserHandle.USER_CURRENT));
		}
		});
		intent.putExtra(RecentsActivity.WAITING_FOR_WINDOW_ANIMATION_PARAM, true);
		mContext.startActivityAsUser(intent, opts.toBundle(), new UserHandle(
		UserHandle.USER_CURRENT));
		}
		} catch (ActivityNotFoundException e) {
		Log.e(TAG, "Failed to launch RecentAppsIntent", e);
		}
		}

		@Override
		public void preloadRecentTasksList() {
		if (DEBUG) Log.d(TAG, "preloading recents");
		Intent intent = new Intent(RecentsActivity.PRELOAD_INTENT);
		intent.setClassName("com.android.systemui",
		"com.android.systemui.recent.RecentsPreloadReceiver");
		mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

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

		@Override
		public void cancelPreloadingRecentTasksList() {
		if (DEBUG) Log.d(TAG, "cancel preloading recents");
		Intent intent = new Intent(RecentsActivity.CANCEL_PRELOAD_INTENT);
		intent.setClassName("com.android.systemui",
		"com.android.systemui.recent.RecentsPreloadReceiver");
		mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

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

		@Override
		public void closeRecents() {
		if (DEBUG) Log.d(TAG, "closing recents panel");
		Intent intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT);
		intent.setPackage("com.android.systemui");
		mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+23 −162

File changed.

Preview size limit exceeded, changes collapsed.