Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803,... (430f5c3d) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/LauncherActivityInfo.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -20,12 +20,10 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Resources;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.DisplayMetrics;
		import android.util.Log;

		/**
		* A representation of an activity that can belong to this user or a managed
		@@ -173,12 +171,6 @@ public class LauncherActivityInfo {
		public Drawable getBadgedIcon(int density) {
		Drawable originalIcon = getIcon(density);

		if (originalIcon instanceof BitmapDrawable) {
		// TODO: Go through LauncherAppsService
		return mPm.getUserBadgedIcon(originalIcon, mUser);
		} else {
		Log.e(TAG, "Unable to create badged icon for " + mActivityInfo);
		}
		return originalIcon;
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

		QSTileLayout tileLayout = mQsPanel.getTileLayout();
		mAllViews.add((View) tileLayout);
		int heightDiff = mQsPanel.getBottom() - mQs.getHeader().getBottom()
		int height = mQs.getView() != null ? mQs.getView().getMeasuredHeight() : 0;
		int heightDiff = height - mQs.getHeader().getBottom()
		+ mQs.getHeader().getPaddingBottom();
		firstPageBuilder.addFloat(tileLayout, "translationY", heightDiff, 0);

+3 −2

Original line number	Diff line number	Diff line
		@@ -256,7 +256,8 @@ public class QSFragment extends Fragment implements QS {
		}
		mHeader.setExpansion(mKeyguardShowing ? 1 : expansion);
		mFooter.setExpansion(mKeyguardShowing ? 1 : expansion);
		int heightDiff = mQSPanel.getBottom() - mHeader.getBottom() + mHeader.getPaddingBottom();
		int heightDiff = mQSPanel.getBottom() - mHeader.getBottom() + mHeader.getPaddingBottom()
		+ mFooter.getHeight();
		mQSPanel.setTranslationY(translationScaleY * heightDiff);
		mQSDetail.setFullyExpanded(expansion == 1);

		@@ -265,7 +266,7 @@ public class QSFragment extends Fragment implements QS {
		}

		// Set bounds on the QS panel so it doesn't run over the header.
		mQsBounds.top = (int) (mQSPanel.getHeight() * (1 - expansion));
		mQsBounds.top = (int) -mQSPanel.getTranslationY();
		mQsBounds.right = mQSPanel.getWidth();
		mQsBounds.bottom = mQSPanel.getHeight();
		mQSPanel.setClipBounds(mQsBounds);

+5 −2

Original line number	Diff line number	Diff line
		@@ -7207,12 +7207,15 @@ public class PackageManagerService extends IPackageManager.Stub
		// load resources from the correct package
		installerInfo.resolvePackageName = info.getComponentInfo().packageName;
		resolveInfos.set(i, installerInfo);
		}
		continue;
		}
		}
		// caller is a full app, don't need to apply any other filtering
		if (ephemeralPkgName == null) {
		continue;
		} else if (ephemeralPkgName.equals(info.activityInfo.packageName)) {
		// caller is same app; don't need to apply any other filtering
		continue;
		}
		// allow activities that have been explicitly exposed to ephemeral apps
		if (!isEphemeralApp
		@@ -19960,7 +19963,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// Queue up an async operation since the package deletion may take a little while.
		mHandler.post(new Runnable() {
		public void run() {
		final PackageSetting ps = (PackageSetting) pkg.mExtras;
		final PackageSetting ps = pkg == null ? null : (PackageSetting) pkg.mExtras;
		boolean doClearData = true;
		if (ps != null) {
		final boolean targetIsInstantApp =