Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 456f64a8 authored by Wen ZHANG's avatar Wen ZHANG Committed by Wen Zhang
Browse files

Fix that HTML labels not handled in the permission review dialog 

Bug: 139921801
Test: Manually tested
Change-Id: I581497939cf8b7d1a05ad2f55ab978c65227fffe
(cherry picked from commit 86577b765f1e9c8066b2a179ad8d0d581177f324)
parent 9761d6b4

src/com/android/packageinstaller/permission/ui/wear/ReviewPermissionsWearFragment.java

+7 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable; 
import android.os.Bundle;

import android.os.RemoteCallback;

import android.text.SpannableString;

import android.text.Html;

import android.text.style.ForegroundColorSpan;

import android.util.Log;

import android.util.TypedValue;
@@ -273,7 +274,8 @@ public class ReviewPermissionsWearFragment extends PreferenceFragmentCompat 
        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));

        SpannableString message =

            new SpannableString(Html.fromHtml(getString(labelTemplateResId, appLabel)));



        // Color the app name.

        final int appLabelStart = message.toString().indexOf(appLabel, 0);
@@ -283,8 +285,10 @@ public class ReviewPermissionsWearFragment extends PreferenceFragmentCompat 
        activity.getTheme().resolveAttribute(android.R.attr.colorAccent, typedValue, true);

        final int color = activity.getColor(typedValue.resourceId);



        if (appLabelStart >= 0) {

            message.setSpan(new ForegroundColorSpan(color), appLabelStart,

                    appLabelStart + appLabelLength, 0);

        }



        titlePref.setTitle(message);