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

Commit 10559085 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update usage of deprecated fields." into qt-dev

parents 10837ae2 859042c2

src/com/android/packageinstaller/permission/model/PermissionGroups.java

+3 −3
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.packageinstaller.permission.model;



import static android.content.pm.PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE;

import static android.content.pm.PackageItemInfo.SAFE_LABEL_FLAG_TRIM;

import static android.text.TextUtils.SAFE_STRING_FLAG_FIRST_LINE;

import static android.text.TextUtils.SAFE_STRING_FLAG_TRIM;



import android.Manifest;

import android.app.LoaderManager;
@@ -112,7 +112,7 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr 
    private static @NonNull CharSequence loadItemInfoLabel(@NonNull Context context,

            @NonNull PackageItemInfo itemInfo) {

        CharSequence label = itemInfo.loadSafeLabel(context.getPackageManager(), 0,

                SAFE_LABEL_FLAG_FIRST_LINE | SAFE_LABEL_FLAG_TRIM);

                SAFE_STRING_FLAG_FIRST_LINE | SAFE_STRING_FLAG_TRIM);

        if (label == null) {

            label = itemInfo.name;

        }

src/com/android/packageinstaller/permission/ui/handheld/AllAppPermissionsFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.net.Uri; 
import android.os.Build;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;

import android.view.MenuItem;

import android.widget.Switch;
@@ -261,7 +262,7 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { 
            icon = context.getDrawable(R.drawable.ic_perm_device_info);

        }

        pref.setIcon(Utils.applyTint(context, icon, android.R.attr.colorControlNormal));

        pref.setTitle(perm.loadSafeLabel(pm, 20000, PackageItemInfo.SAFE_LABEL_FLAG_TRIM));

        pref.setTitle(perm.loadSafeLabel(pm, 20000, TextUtils.SAFE_STRING_FLAG_TRIM));

        pref.setSingleLineTitle(false);

        final CharSequence desc = perm.loadDescription(pm);

src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
import android.app.AlertDialog;

import android.app.Dialog;

import android.content.DialogInterface;

import android.content.pm.PackageItemInfo;

import android.os.Bundle;

import android.text.BidiFormatter;

import android.text.TextUtils;

import android.widget.ImageView;

import android.widget.Switch;
@@ -437,8 +437,8 @@ class PermissionPreference extends MultiTargetSwitchPreference { 
        return BidiFormatter.getInstance().unicodeWrap(

                mGroup.getApp().applicationInfo.loadSafeLabel(getContext().getPackageManager(),

                        DEFAULT_MAX_LABEL_SIZE_PX,

                        PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                                | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE)

                        TextUtils.SAFE_STRING_FLAG_TRIM

                                | TextUtils.SAFE_STRING_FLAG_FIRST_LINE)

                        .toString());

    }