Loading packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java +53 −2 Original line number Diff line number Diff line Loading @@ -23,6 +23,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.Typeface; import android.media.projection.MediaProjectionManager; import android.media.projection.IMediaProjectionManager; import android.media.projection.IMediaProjection; Loading @@ -30,8 +31,16 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.text.BidiFormatter; import android.text.Spannable; import android.text.SpannableString; import android.text.TextPaint; import android.text.TextUtils; import android.text.style.StyleSpan; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.TextView; Loading @@ -43,6 +52,8 @@ import com.android.systemui.R; public class MediaProjectionPermissionActivity extends AlertActivity implements DialogInterface.OnClickListener, CheckBox.OnCheckedChangeListener { private static final String TAG = "MediaProjectionPermissionActivity"; private static final float MAX_APP_NAME_SIZE_PX = 500f; private static final String ELLIPSIS = "\u2026"; private boolean mPermanentGrant; private String mPackageName; Loading Loading @@ -87,11 +98,49 @@ public class MediaProjectionPermissionActivity extends AlertActivity return; } String appName = aInfo.loadLabel(packageManager).toString(); TextPaint paint = new TextPaint(); paint.setTextSize(42); String label = aInfo.loadLabel(packageManager).toString(); // If the label contains new line characters it may push the security // message below the fold of the dialog. Labels shouldn't have new line // characters anyways, so just truncate the message the first time one // is seen. final int labelLength = label.length(); int offset = 0; while (offset < labelLength) { final int codePoint = label.codePointAt(offset); final int type = Character.getType(codePoint); if (type == Character.LINE_SEPARATOR || type == Character.CONTROL || type == Character.PARAGRAPH_SEPARATOR) { label = label.substring(0, offset) + ELLIPSIS; break; } offset += Character.charCount(codePoint); } if (label.isEmpty()) { label = mPackageName; } String unsanitizedAppName = TextUtils.ellipsize(label, paint, MAX_APP_NAME_SIZE_PX, TextUtils.TruncateAt.END).toString(); String appName = BidiFormatter.getInstance().unicodeWrap(unsanitizedAppName); String actionText = getString(R.string.media_projection_dialog_text, appName); SpannableString message = new SpannableString(actionText); int appNameIndex = actionText.indexOf(appName); if (appNameIndex >= 0) { message.setSpan(new StyleSpan(Typeface.BOLD), appNameIndex, appNameIndex + appName.length(), 0); } final AlertController.AlertParams ap = mAlertParams; ap.mIcon = aInfo.loadIcon(packageManager); ap.mMessage = getString(R.string.media_projection_dialog_text, appName); ap.mMessage = message; ap.mPositiveButtonText = getString(R.string.media_projection_action_text); ap.mNegativeButtonText = getString(android.R.string.cancel); ap.mPositiveButtonListener = this; Loading @@ -105,6 +154,8 @@ public class MediaProjectionPermissionActivity extends AlertActivity rememberPermissionCheckbox.setOnCheckedChangeListener(this); setupAlert(); Button btn = mAlert.getButton(DialogInterface.BUTTON_POSITIVE); btn.getRootView().setFilterTouchesWhenObscured(true); } @Override Loading Loading
packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java +53 −2 Original line number Diff line number Diff line Loading @@ -23,6 +23,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.Typeface; import android.media.projection.MediaProjectionManager; import android.media.projection.IMediaProjectionManager; import android.media.projection.IMediaProjection; Loading @@ -30,8 +31,16 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.text.BidiFormatter; import android.text.Spannable; import android.text.SpannableString; import android.text.TextPaint; import android.text.TextUtils; import android.text.style.StyleSpan; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.TextView; Loading @@ -43,6 +52,8 @@ import com.android.systemui.R; public class MediaProjectionPermissionActivity extends AlertActivity implements DialogInterface.OnClickListener, CheckBox.OnCheckedChangeListener { private static final String TAG = "MediaProjectionPermissionActivity"; private static final float MAX_APP_NAME_SIZE_PX = 500f; private static final String ELLIPSIS = "\u2026"; private boolean mPermanentGrant; private String mPackageName; Loading Loading @@ -87,11 +98,49 @@ public class MediaProjectionPermissionActivity extends AlertActivity return; } String appName = aInfo.loadLabel(packageManager).toString(); TextPaint paint = new TextPaint(); paint.setTextSize(42); String label = aInfo.loadLabel(packageManager).toString(); // If the label contains new line characters it may push the security // message below the fold of the dialog. Labels shouldn't have new line // characters anyways, so just truncate the message the first time one // is seen. final int labelLength = label.length(); int offset = 0; while (offset < labelLength) { final int codePoint = label.codePointAt(offset); final int type = Character.getType(codePoint); if (type == Character.LINE_SEPARATOR || type == Character.CONTROL || type == Character.PARAGRAPH_SEPARATOR) { label = label.substring(0, offset) + ELLIPSIS; break; } offset += Character.charCount(codePoint); } if (label.isEmpty()) { label = mPackageName; } String unsanitizedAppName = TextUtils.ellipsize(label, paint, MAX_APP_NAME_SIZE_PX, TextUtils.TruncateAt.END).toString(); String appName = BidiFormatter.getInstance().unicodeWrap(unsanitizedAppName); String actionText = getString(R.string.media_projection_dialog_text, appName); SpannableString message = new SpannableString(actionText); int appNameIndex = actionText.indexOf(appName); if (appNameIndex >= 0) { message.setSpan(new StyleSpan(Typeface.BOLD), appNameIndex, appNameIndex + appName.length(), 0); } final AlertController.AlertParams ap = mAlertParams; ap.mIcon = aInfo.loadIcon(packageManager); ap.mMessage = getString(R.string.media_projection_dialog_text, appName); ap.mMessage = message; ap.mPositiveButtonText = getString(R.string.media_projection_action_text); ap.mNegativeButtonText = getString(android.R.string.cancel); ap.mPositiveButtonListener = this; Loading @@ -105,6 +154,8 @@ public class MediaProjectionPermissionActivity extends AlertActivity rememberPermissionCheckbox.setOnCheckedChangeListener(this); setupAlert(); Button btn = mAlert.getButton(DialogInterface.BUTTON_POSITIVE); btn.getRootView().setFilterTouchesWhenObscured(true); } @Override Loading