Merge "Moving some recents logic into the shared lib." (5cd47c90) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-unde

		LOCAL_STATIC_ANDROID_LIBRARIES := \
		SystemUIPluginLib \
		SystemUISharedLib \
		android-support-v4 \
		android-support-v7-recyclerview \
		android-support-v7-preference \

packages/SystemUI/res/values/strings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -451,8 +451,6 @@
		<string name="accessibility_recents_item_open_app_info">Open <xliff:g id="app" example="Calendar">%s</xliff:g> application info.</string>
		<!-- Content description to tell the user an application has been launched from recents -->
		<string name="accessibility_recents_item_launched">Starting <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
		<!-- Content description of individual recents task. -->
		<string name="accessibility_recents_task_header"><xliff:g id="app" example="Chrome">%1$s</xliff:g> <xliff:g id="activity_label" example="www.google.com">%2$s</xliff:g></string>
		<!-- Content description to tell the user a notification has been removed from the notification shade -->
		<string name="accessibility_notification_dismissed">Notification dismissed.</string>

		@@ -810,10 +808,6 @@
		<!-- Recents: Accessibility split to the right -->
		<string name="recents_accessibility_split_screen_right">Split screen to the right</string>

		<!-- Fully qualified activity class names to be blacklisted in Recents, add package names into overlay as needed -->
		<string-array name="recents_blacklist_array">
		</string-array>

		<!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
		<string name="expanded_header_battery_charged">Charged</string>

packages/SystemUI/shared/Android.mk

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2017 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.

		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_USE_AAPT2 := true

		LOCAL_MODULE_TAGS := optional

		LOCAL_MODULE := SystemUISharedLib

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
		LOCAL_JAR_EXCLUDE_FILES := none

		include $(BUILD_STATIC_JAVA_LIBRARY)

		include $(CLEAR_VARS)

		LOCAL_PACKAGE_NAME := SharedDummyLib
		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_JAVA_LIBRARIES := SystemUISharedLib

		LOCAL_PROGUARD_ENABLED := disabled

		include $(BUILD_PACKAGE)

		include $(call all-makefiles-under,$(LOCAL_PATH))
		No newline at end of file

packages/SystemUI/shared/AndroidManifest.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.systemui.shared">

		<uses-sdk
		android:minSdkVersion="26" />

		</manifest>

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/BackgroundTaskLoader.java

0 → 100644

+186 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.shared.recents.model;

		import android.content.Context;
		import android.content.pm.ActivityInfo;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.util.Log;

		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.PackageManagerWrapper;

		/**
		* Background task resource loader
		*/
		class BackgroundTaskLoader implements Runnable {
		static String TAG = "BackgroundTaskLoader";
		static boolean DEBUG = false;

		private Context mContext;
		private final HandlerThread mLoadThread;
		private final Handler mLoadThreadHandler;
		private final Handler mMainThreadHandler;

		private final TaskResourceLoadQueue mLoadQueue;
		private final TaskKeyLruCache<Drawable> mIconCache;
		private final BitmapDrawable mDefaultIcon;

		private boolean mStarted;
		private boolean mCancelled;
		private boolean mWaitingOnLoadQueue;

		private final OnIdleChangedListener mOnIdleChangedListener;

		/** Constructor, creates a new loading thread that loads task resources in the background */
		public BackgroundTaskLoader(TaskResourceLoadQueue loadQueue,
		TaskKeyLruCache<Drawable> iconCache, BitmapDrawable defaultIcon,
		OnIdleChangedListener onIdleChangedListener) {
		mLoadQueue = loadQueue;
		mIconCache = iconCache;
		mDefaultIcon = defaultIcon;
		mMainThreadHandler = new Handler();
		mOnIdleChangedListener = onIdleChangedListener;
		mLoadThread = new HandlerThread("Recents-TaskResourceLoader",
		android.os.Process.THREAD_PRIORITY_BACKGROUND);
		mLoadThread.start();
		mLoadThreadHandler = new Handler(mLoadThread.getLooper());
		}

		/** Restarts the loader thread */
		void start(Context context) {
		mContext = context;
		mCancelled = false;
		if (!mStarted) {
		// Start loading on the load thread
		mStarted = true;
		mLoadThreadHandler.post(this);
		} else {
		// Notify the load thread to start loading again
		synchronized (mLoadThread) {
		mLoadThread.notifyAll();
		}
		}
		}

		/** Requests the loader thread to stop after the current iteration */
		void stop() {
		// Mark as cancelled for the thread to pick up
		mCancelled = true;
		// If we are waiting for the load queue for more tasks, then we can just reset the
		// Context now, since nothing is using it
		if (mWaitingOnLoadQueue) {
		mContext = null;
		}
		}

		@Override
		public void run() {
		while (true) {
		if (mCancelled) {
		// We have to unset the context here, since the background thread may be using it
		// when we call stop()
		mContext = null;
		// If we are cancelled, then wait until we are started again
		synchronized(mLoadThread) {
		try {
		mLoadThread.wait();
		} catch (InterruptedException ie) {
		ie.printStackTrace();
		}
		}
		} else {
		// If we've stopped the loader, then fall through to the above logic to wait on
		// the load thread
		processLoadQueueItem();

		// If there are no other items in the list, then just wait until something is added
		if (!mCancelled && mLoadQueue.isEmpty()) {
		synchronized(mLoadQueue) {
		try {
		mWaitingOnLoadQueue = true;
		mMainThreadHandler.post(
		() -> mOnIdleChangedListener.onIdleChanged(true));
		mLoadQueue.wait();
		mMainThreadHandler.post(
		() -> mOnIdleChangedListener.onIdleChanged(false));
		mWaitingOnLoadQueue = false;
		} catch (InterruptedException ie) {
		ie.printStackTrace();
		}
		}
		}
		}
		}
		}

		/**
		* This needs to be in a separate method to work around an surprising interpreter behavior:
		* The register will keep the local reference to cachedThumbnailData even if it falls out of
		* scope. Putting it into a method fixes this issue.
		*/
		private void processLoadQueueItem() {
		// Load the next item from the queue
		final Task t = mLoadQueue.nextTask();
		if (t != null) {
		Drawable cachedIcon = mIconCache.get(t.key);

		// Load the icon if it is stale or we haven't cached one yet
		if (cachedIcon == null) {
		cachedIcon = ActivityManagerWrapper.getInstance().getBadgedTaskDescriptionIcon(
		mContext, t.taskDescription, t.key.userId, mContext.getResources());

		if (cachedIcon == null) {
		ActivityInfo info = PackageManagerWrapper.getInstance().getActivityInfo(
		t.key.getComponent(), t.key.userId);
		if (info != null) {
		if (DEBUG) Log.d(TAG, "Loading icon: " + t.key);
		cachedIcon = ActivityManagerWrapper.getInstance().getBadgedActivityIcon(
		info, t.key.userId);
		}
		}

		if (cachedIcon == null) {
		cachedIcon = mDefaultIcon;
		}

		// At this point, even if we can't load the icon, we will set the
		// default icon.
		mIconCache.put(t.key, cachedIcon);
		}

		if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key);
		final ThumbnailData thumbnailData =
		ActivityManagerWrapper.getInstance().getTaskThumbnail(t.key.id,
		true /* reducedResolution */);

		if (!mCancelled) {
		// Notify that the task data has changed
		final Drawable finalIcon = cachedIcon;
		mMainThreadHandler.post(
		() -> t.notifyTaskDataLoaded(thumbnailData, finalIcon));
		}
		}
		}

		interface OnIdleChangedListener {
		void onIdleChanged(boolean idle);
		}
		}