diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:00:11 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:02:19 -0800 |
| commit | ef861375eebd9ac6cce7c0bb163380ab1c951063 (patch) | |
| tree | 870ae89605e49658de3e5abca2797b68c5efbb26 /res/layout/permission_description.xml | |
| parent | 9c78316fe6baa4f7fd7d5108349ecf8a2532b047 (diff) | |
| download | android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.gz android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.bz2 android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
Diffstat (limited to 'res/layout/permission_description.xml')
| -rw-r--r-- | res/layout/permission_description.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml index 3f1cf434..c9b60d64 100644 --- a/res/layout/permission_description.xml +++ b/res/layout/permission_description.xml @@ -26,15 +26,14 @@ android:layout_height="36dip" android:layout_marginTop="3dp" android:tint="?android:attr/colorAccent" - android:scaleType="fitCenter" /> + android:scaleType="fitCenter" > + </ImageView> <TextView android:id="@+id/permission_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/permission_icon" - android:lineSpacingMultiplier="1.024" - android:fontFamily="@*android:string/font_family_body_2_material" android:paddingStart="16dip" android:paddingEnd="8dip" style="?android:attr/textAppearanceMedium"> |