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

diff --cc src/com/android/launcher3/Launcher.java
Simple merge

diff --cc src/com/android/launcher3/popup/SystemShortcut.java
index 81460e4,08e17dc..f158f71
--- 1/src/com/android/launcher3/popup/SystemShortcut.java
--- 2/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@@ -1,10 -1,11 +1,12 @@@
  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;
  import com.android.launcher3.InfoDropTarget;
  import com.android.launcher3.ItemInfo;
  import com.android.launcher3.Launcher;