Merge "Implementing app-centric Shelf." (131e8faa) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1108,7 +1108,7 @@ public class ActivityManager {
		* of {@link #RECENT_WITH_EXCLUDED} and {@link #RECENT_IGNORE_UNAVAILABLE}.
		*
		* @return Returns a list of RecentTaskInfo records describing each of
		* the recent tasks.
		* the recent tasks. Most recently activated tasks go first.
		*
		* @hide
		*/

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="1dp"
		android:height="24dp"
		android:viewportWidth="1"
		android:viewportHeight="24">
		<path
		android:pathData="M0,0 L1,0 L1,24 L0,24 z"
		android:fillColor="#AAFFFFFF"/>
		</vector>

+0 −30

Original line number	Diff line number	Diff line
		@@ -82,21 +82,6 @@
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		/>

		<ImageView android:id="@+id/app_divider"
		android:focusable="false"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginLeft="10dp"
		android:layout_marginRight="10dp"
		android:src="@drawable/nav_app_divider"
		/>

		<com.android.systemui.statusbar.phone.NavigationBarRecents
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		/>
		</LinearLayout>

		<FrameLayout
		@@ -248,21 +233,6 @@
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		/>

		<ImageView android:id="@+id/app_divider"
		android:focusable="false"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginLeft="10dp"
		android:layout_marginRight="10dp"
		android:src="@drawable/nav_app_divider"
		/>

		<com.android.systemui.statusbar.phone.NavigationBarRecents
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		/>
		</LinearLayout>

		<FrameLayout

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.statusbar.phone;

		import android.app.ActivityManager.RecentTaskInfo;

		import java.util.ArrayList;

		/**
		* Data associated with an app button.
		*/
		class AppButtonData {
		public final AppInfo appInfo;
		public boolean pinned;
		// Recent tasks for this app, sorted by lastActiveTime, descending.
		public ArrayList<RecentTaskInfo> tasks;

		public AppButtonData(AppInfo appInfo, boolean pinned) {
		this.appInfo = appInfo;
		this.pinned = pinned;
		}

		/**
		* Returns true if the button contains no useful information and should be removed.
		*/
		public boolean isEmpty() {
		return !pinned && (tasks == null \|\| tasks.isEmpty());
		}

		public void addTask(RecentTaskInfo task) {
		if (tasks == null) {
		tasks = new ArrayList<RecentTaskInfo>();
		}
		tasks.add(task);
		}

		public void clearTasks() {
		if (tasks != null) {
		tasks.clear();
		}
		}
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -39,4 +39,16 @@ class AppInfo {
		public UserHandle getUser() {
		return mUser;
		}

		@Override
		public boolean equals(Object obj) {
		if (obj == null) {
		return false;
		}
		if (getClass() != obj.getClass()) {
		return false;
		}
		final AppInfo other = (AppInfo) obj;
		return mComponentName.equals(other.mComponentName) && mUser.equals(other.mUser);
		}
		}