aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use source bounds/activity options for App Info System Shortcut" into ub-launcher3-dorval

Browse Source
This commit is contained in:
Tony Wickham
2017-05-03 18:20:39 +00:00
committed by Android (Google) Code Review
parent 6d163e0fe7 e3c5925679
commit 82eb1f0ea6
5 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher3/InfoDropTarget.java
View File

@@ -19,6 +19,8 @@ package com.android.launcher3;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle;
import android.provider.Settings;
import android.util.AttributeSet;
import android.util.Log;
@@ -60,6 +62,11 @@ public class InfoDropTarget extends UninstallDropTarget {
*/
public static boolean startDetailsActivityForInfo(
ItemInfo info, Launcher launcher, DropTargetResultCallback callback) {
return startDetailsActivityForInfo(info, launcher, callback, null, null);
}
public static boolean startDetailsActivityForInfo(ItemInfo info, Launcher launcher,
DropTargetResultCallback callback, Rect sourceBounds, Bundle opts) {
boolean result = false;
ComponentName componentName = null;
if (info instanceof AppInfo) {
@@ -74,7 +81,7 @@ public class InfoDropTarget extends UninstallDropTarget {
if (componentName != null) {
try {
LauncherAppsCompat.getInstance(launcher)
.showAppDetailsForProfile(componentName, info.user);
.showAppDetailsForProfile(componentName, info.user, sourceBounds, opts);
result = true;
} catch (SecurityException | ActivityNotFoundException e) {
Toast.makeText(launcher, R.string.activity_not_found, Toast.LENGTH_SHORT).show();

4
src/com/android/launcher3/Launcher.java
View File

@@ -2668,7 +2668,7 @@ public class Launcher extends BaseActivity
}
@TargetApi(Build.VERSION_CODES.M)
private Bundle getActivityLaunchOptions(View v) {
public Bundle getActivityLaunchOptions(View v) {
if (Utilities.ATLEAST_MARSHMALLOW) {
int left = 0, top = 0;
int width = v.getMeasuredWidth(), height = v.getMeasuredHeight();
@@ -2694,7 +2694,7 @@ public class Launcher extends BaseActivity
return null;
}
private Rect getViewBounds(View v) {
public Rect getViewBounds(View v) {
int[] pos = new int[2];
v.getLocationOnScreen(pos);
return new Rect(pos[0], pos[1], pos[0] + v.getWidth(), pos[1] + v.getHeight());

7
src/com/android/launcher3/compat/LauncherAppsCompat.java
View File

@@ -78,7 +78,8 @@ public abstract class LauncherAppsCompat {
Rect sourceBounds, Bundle opts);
public abstract ApplicationInfo getApplicationInfo(
String packageName, int flags, UserHandle user);
public abstract void showAppDetailsForProfile(ComponentName component, UserHandle user);
public abstract void showAppDetailsForProfile(ComponentName component, UserHandle user,
Rect sourceBounds, Bundle opts);
public abstract void addOnAppsChangedCallback(OnAppsChangedCallbackCompat listener);
public abstract void removeOnAppsChangedCallback(OnAppsChangedCallbackCompat listener);
public abstract boolean isPackageEnabledForProfile(String packageName, UserHandle user);
@@ -142,4 +143,8 @@ public abstract class LauncherAppsCompat {
return null;
}
}
public void showAppDetailsForProfile(ComponentName component, UserHandle user) {
showAppDetailsForProfile(component, user, null, null);
}
}

5
src/com/android/launcher3/compat/LauncherAppsCompatVL.java
View File

@@ -95,8 +95,9 @@ public class LauncherAppsCompatVL extends LauncherAppsCompat {
}
@Override
public void showAppDetailsForProfile(ComponentName component, UserHandle user) {
mLauncherApps.startAppDetailsActivity(component, user, null, null);
public void showAppDetailsForProfile(ComponentName component, UserHandle user,
Rect sourceBounds, Bundle opts) {
mLauncherApps.startAppDetailsActivity(component, user, sourceBounds, opts);
}
@Override

6
src/com/android/launcher3/popup/SystemShortcut.java
View File

@@ -1,7 +1,9 @@
package com.android.launcher3.popup;
import android.content.Context;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
import com.android.launcher3.AbstractFloatingView;
@@ -82,7 +84,9 @@ public abstract class SystemShortcut {
return new View.OnClickListener() {
@Override
public void onClick(View view) {
InfoDropTarget.startDetailsActivityForInfo(itemInfo, launcher, null);
Rect sourceBounds = launcher.getViewBounds(view);
Bundle opts = launcher.getActivityLaunchOptions(view);
InfoDropTarget.startDetailsActivityForInfo(itemInfo, launcher, null, sourceBounds, opts);
}
};
}