diff options
author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-10 09:42:27 -0700 |
---|---|---|
committer | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-14 15:21:47 -0700 |
commit | 03dc824d37099b29acb5a0aa28e881d5b05cce0e (patch) | |
tree | 146c411c4375c59c6a11689b7d591a26c4afce4f /src/com/android/packageinstaller/permission/model | |
parent | 46fed54b3ee49e4bebabca50bcff5bceaece96b8 (diff) | |
download | android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.tar.gz android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.tar.bz2 android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.zip |
Changing layout to make button animations work
- Fix the Permissions Dialogs for round layout
- Show animation for the buttons
- Also fixed the names ellipsis issue.
- Fixed the theming of the dialogs.
Bug: 23118402
Change-Id: I385c827ac41b06222334c36bfda2c70b346232a2
Diffstat (limited to 'src/com/android/packageinstaller/permission/model')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissions.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissions.java b/src/com/android/packageinstaller/permission/model/AppPermissions.java index d465ee09..a0f23d64 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissions.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissions.java @@ -23,6 +23,8 @@ import android.text.BidiFormatter; import android.text.TextPaint; import android.text.TextUtils; +import com.android.packageinstaller.DeviceUtils; + import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -165,9 +167,12 @@ public final class AppPermissions { private static CharSequence loadEllipsizedAppLabel(Context context, PackageInfo packageInfo) { String label = packageInfo.applicationInfo.loadLabel( context.getPackageManager()).toString(); - String noNewLineLabel = label.replace("\n", " "); - String ellipsizedLabel = TextUtils.ellipsize(noNewLineLabel, sAppLabelEllipsizePaint, + String ellipsizedLabel = label.replace("\n", " "); + if (!DeviceUtils.isWear(context)) { + // Only ellipsize for non-Wear devices. + ellipsizedLabel = TextUtils.ellipsize(ellipsizedLabel, sAppLabelEllipsizePaint, MAX_APP_LABEL_LENGTH_PIXELS, TextUtils.TruncateAt.END).toString(); + } return BidiFormatter.getInstance().unicodeWrap(ellipsizedLabel); } } |