1 files changed, 19 insertions, 14 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java
index 84669da2..a8d0c512 100644
--- a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java
@@ -34,7 +34,9 @@ import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.preference.TwoStatePreference;
+import android.text.Html;
 import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.util.TypedValue;
@@ -67,7 +69,8 @@ public final class ReviewPermissionsActivity extends Activity
 
         if (DeviceUtils.isWear(this)) {
             Fragment fragment = ReviewPermissionsWearFragment.newInstance(packageInfo);
-            getFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
+            getFragmentManager().beginTransaction()
+                    .replace(android.R.id.content, fragment).commit();
         } else {
             setContentView(R.layout.review_permissions);
             if (getFragmentManager().findFragmentById(R.id.preferences_frame) == null) {
@@ -108,6 +111,7 @@ public final class ReviewPermissionsActivity extends Activity
 
         private Button mContinueButton;
         private Button mCancelButton;
+        private Button mMoreInfoButton;
 
         private PreferenceCategory mNewPermissionsCategory;
 
@@ -188,6 +192,12 @@ public final class ReviewPermissionsActivity extends Activity
             } else if (view == mCancelButton) {
                 executeCallback(false);
                 activity.setResult(Activity.RESULT_CANCELED);
+            } else if (view == mMoreInfoButton) {
+                Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
+                intent.putExtra(Intent.EXTRA_PACKAGE_NAME,
+                        mAppPermissions.getPackageInfo().packageName);
+                intent.putExtra(ManagePermissionsActivity.EXTRA_ALL_PERMISSIONS, true);
+                getActivity().startActivity(intent);
             }
             activity.finish();
         }
@@ -258,34 +268,29 @@ public final class ReviewPermissionsActivity extends Activity
             iconView.setImageDrawable(icon);
 
             // Set message
-            String appLabel = mAppPermissions.getAppLabel().toString();
             final int labelTemplateResId = isPackageUpdated()
                     ?  R.string.permission_review_title_template_update
                     :  R.string.permission_review_title_template_install;
-            SpannableString message = new SpannableString(getString(labelTemplateResId, appLabel));
+            Spanned message = Html.fromHtml(getString(labelTemplateResId,
+                    mAppPermissions.getAppLabel()), 0);
+
             // Set the permission message as the title so it can be announced.
-            activity.setTitle(message);
+            activity.setTitle(message.toString());
 
             // Color the app name.
-            final int appLabelStart = message.toString().indexOf(appLabel, 0);
-            final int appLabelLength = appLabel.length();
-
-            TypedValue typedValue = new TypedValue();
-            activity.getTheme().resolveAttribute(android.R.attr.colorAccent, typedValue, true);
-            final int color = activity.getColor(typedValue.resourceId);
-
-            message.setSpan(new ForegroundColorSpan(color), appLabelStart,
-                    appLabelStart + appLabelLength, 0);
             TextView permissionsMessageView = (TextView) activity.findViewById(
                     R.id.permissions_message);
             permissionsMessageView.setText(message);
 
-
             mContinueButton = (Button) getActivity().findViewById(R.id.continue_button);
             mContinueButton.setOnClickListener(this);
 
             mCancelButton = (Button) getActivity().findViewById(R.id.cancel_button);
             mCancelButton.setOnClickListener(this);
+
+            mMoreInfoButton = (Button)  getActivity().findViewById(
+                    R.id.permission_more_info_button);
+            mMoreInfoButton.setOnClickListener(this);
         }
 
         private void loadPreferences() {