Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of afed6f8 to nyc-dev" into nyc-dev

Browse Source
This commit is contained in:
Chen Xu
2016-06-09 02:32:51 +00:00
committed by Android (Google) Code Review
parent e8ebd8aea0 7978147771
commit 0c4f1c7e5c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/pm/PackageItemInfo.java
View File

@@ -29,7 +29,9 @@ import android.text.Html;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Printer; import android.util.Printer;
import android.text.BidiFormatter;
import android.text.TextPaint;
import android.text.Html;
import java.text.Collator; import java.text.Collator;
import java.util.Comparator; import java.util.Comparator;
@@ -44,7 +46,6 @@ import java.util.Comparator;
*/ */
public class PackageItemInfo { public class PackageItemInfo {
private static final float MAX_LABEL_SIZE_PX = 500f; private static final float MAX_LABEL_SIZE_PX = 500f;
/** /**
* Public name of this item. From the "android:name" attribute. * Public name of this item. From the "android:name" attribute.
*/ */
@@ -145,7 +146,7 @@ public class PackageItemInfo {
} }
return packageName; return packageName;
} }
/** /**
* Same as {@link #loadLabel(PackageManager)} with the addition that * Same as {@link #loadLabel(PackageManager)} with the addition that
* the returned label is safe for being presented in the UI since it * the returned label is safe for being presented in the UI since it