PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moving predicted apps callbacks to use ComponentKey." into ub-launcher3-burnaby

Browse Source
This commit is contained in:
Winson Chung
2015-06-18 21:10:41 +00:00
committed by Android (Google) Code Review
parent 230eade4a3 6b1c73f50a
commit d3800208aa
6 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+2 -3
View File
@@ -93,17 +93,16 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.android.launcher3.DropTarget.DragObject;
import com.android.launcher3.PagedView.PageSwitchListener;
import com.android.launcher3.allapps.AllAppsContainerView;
import com.android.launcher3.allapps.AllAppsSearchBarController;
import com.android.launcher3.compat.AppWidgetManagerCompat;
import com.android.launcher3.compat.LauncherActivityInfoCompat;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.model.WidgetsModel;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.LongArrayMap;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.widget.PendingAddWidgetInfo;
@@ -3448,7 +3447,7 @@ public class Launcher extends Activity
*/
private void tryAndUpdatePredictedApps() {
if (mLauncherCallbacks != null) {
List<ComponentName> apps = mLauncherCallbacks.getPredictedApps();
List<ComponentKey> apps = mLauncherCallbacks.getPredictedApps();
if (!apps.isEmpty()) {
mAppsView.setPredictedApps(apps);
}
src/com/android/launcher3/LauncherCallbacks.java
+2 -1
View File
@@ -8,6 +8,7 @@ import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import com.android.launcher3.allapps.AllAppsSearchBarController;
import com.android.launcher3.util.ComponentKey;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -92,7 +93,7 @@ public interface LauncherCallbacks {
public boolean overrideWallpaperDimensions();
public boolean isLauncherPreinstalled();
public AllAppsSearchBarController getAllAppsSearchBarController();
public List<ComponentName> getPredictedApps();
public List<ComponentKey> getPredictedApps();
/**
* Returning true will immediately result in a call to {@link #setLauncherOverlayView(ViewGroup,
src/com/android/launcher3/LauncherExtension.java
+2 -1
View File
@@ -12,6 +12,7 @@ import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import com.android.launcher3.allapps.AllAppsSearchBarController;
import com.android.launcher3.util.ComponentKey;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -253,7 +254,7 @@ public class LauncherExtension extends Launcher {
}
@Override
public List<ComponentName> getPredictedApps() {
public List<ComponentKey> getPredictedApps() {
return new ArrayList<>();
}
src/com/android/launcher3/allapps/AllAppsContainerView.java
+1 -1
View File
@@ -207,7 +207,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
/**
* Sets the current set of predicted apps.
*/
public void setPredictedApps(List<ComponentName> apps) {
public void setPredictedApps(List<ComponentKey> apps) {
mApps.setPredictedApps(apps);
}
src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+19 -13
View File
@@ -15,14 +15,14 @@
*/
package com.android.launcher3.allapps;
import android.content.ComponentName;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import com.android.launcher3.AppInfo;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.compat.AlphabeticIndexCompat;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.model.AppNameComparator;
import com.android.launcher3.util.ComponentKey;
@@ -159,7 +159,7 @@ public class AlphabeticalAppsList {
// The set of sections that we allow fast-scrolling to (includes non-merged sections)
private List<FastScrollSectionInfo> mFastScrollerSections = new ArrayList<>();
// The set of predicted app component names
private List<ComponentName> mPredictedAppComponents = new ArrayList<>();
private List<ComponentKey> mPredictedAppComponents = new ArrayList<>();
// The set of predicted apps resolved from the component names and the current set of apps
private List<AppInfo> mPredictedApps = new ArrayList<>();
// The of ordered component names as a result of a search query
@@ -268,7 +268,7 @@ public class AlphabeticalAppsList {
* Sets the current set of predicted apps. Since this can be called before we get the full set
* of applications, we should merge the results only in onAppsUpdated() which is idempotent.
*/
public void setPredictedApps(List<ComponentName> apps) {
public void setPredictedApps(List<ComponentKey> apps) {
mPredictedAppComponents.clear();
mPredictedAppComponents.addAll(apps);
onAppsUpdated();
@@ -386,21 +386,27 @@ public class AlphabeticalAppsList {
if (DEBUG_PREDICTIONS) {
if (mPredictedAppComponents.isEmpty() && !mApps.isEmpty()) {
mPredictedAppComponents.add(mApps.get(0).componentName);
mPredictedAppComponents.add(mApps.get(0).componentName);
mPredictedAppComponents.add(mApps.get(0).componentName);
mPredictedAppComponents.add(mApps.get(0).componentName);
mPredictedAppComponents.add(new ComponentKey(mApps.get(0).componentName,
UserHandleCompat.myUserHandle()));
mPredictedAppComponents.add(new ComponentKey(mApps.get(0).componentName,
UserHandleCompat.myUserHandle()));
mPredictedAppComponents.add(new ComponentKey(mApps.get(0).componentName,
UserHandleCompat.myUserHandle()));
mPredictedAppComponents.add(new ComponentKey(mApps.get(0).componentName,
UserHandleCompat.myUserHandle()));
}
}
// Process the predicted app components
mPredictedApps.clear();
if (mPredictedAppComponents != null && !mPredictedAppComponents.isEmpty() && !hasFilter()) {
for (ComponentName cn : mPredictedAppComponents) {
for (AppInfo info : mApps) {
if (cn.equals(info.componentName)) {
mPredictedApps.add(info);
break;
for (ComponentKey ck : mPredictedAppComponents) {
AppInfo info = mComponentToAppMap.get(ck);
if (info != null) {
mPredictedApps.add(info);
} else {
if (LauncherAppState.isDogfoodBuild()) {
Log.e(TAG, "Predicted app not found: " + ck.flattenToString(mLauncher));
}
}
// Stop at the number of predicted apps
src/com/android/launcher3/util/ComponentKey.java
+31 -1
View File
@@ -17,8 +17,9 @@ package com.android.launcher3.util;
*/
import android.content.ComponentName;
import android.content.Context;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import java.util.Arrays;
@@ -38,6 +39,35 @@ public class ComponentKey {
}
/**
* Creates a new component key from an encoded component key string in the form of
* [flattenedComponentString#userId]. If the userId is not present, then it defaults
* to the current user.
*/
public ComponentKey(Context context, String componentKeyStr) {
int userDelimiterIndex = componentKeyStr.indexOf("#");
if (userDelimiterIndex != -1) {
String componentStr = componentKeyStr.substring(0, userDelimiterIndex);
Long componentUser = Long.valueOf(componentKeyStr.substring(userDelimiterIndex + 1));
componentName = ComponentName.unflattenFromString(componentStr);
user = UserManagerCompat.getInstance(context)
.getUserForSerialNumber(componentUser.longValue());
} else {
// No user provided, default to the current user
componentName = ComponentName.unflattenFromString(componentKeyStr);
user = UserHandleCompat.myUserHandle();
}
mHashCode = Arrays.hashCode(new Object[] {componentName, user});
}
/**
* Encodes a component key as a string of the form [flattenedComponentString#userId].
*/
public String flattenToString(Context context) {
return componentName.flattenToString() + "#" +
UserManagerCompat.getInstance(context).getSerialNumberForUser(user);
}
@Override
public int hashCode() {
return mHashCode;