diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 22:06:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-20 22:06:35 +0000 |
| commit | 3f849f410808a0bca039d73fd763825c73d15419 (patch) | |
| tree | a9af0794f210bd49a37148dbb2740469ca327ebe /res/layout/app_details.xml | |
| parent | 786cf97b83a4e502b8683198cdea8872c8507b93 (diff) | |
| parent | ef861375eebd9ac6cce7c0bb163380ab1c951063 (diff) | |
| download | android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.gz android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.bz2 android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: ef861375ee
* commit 'ef861375eebd9ac6cce7c0bb163380ab1c951063':
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Diffstat (limited to 'res/layout/app_details.xml')
| -rw-r--r-- | res/layout/app_details.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 6a330c74..8f7d2cff 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,7 +32,7 @@ installation screens android:layout_width="32dip" android:layout_height="32dip" android:layout_marginStart="8dip" - android:background="@color/transparent" + android:background="@android:color/transparent" android:layout_alignParentStart="true" android:gravity="start" android:scaleType="centerCrop"/> @@ -61,6 +61,6 @@ installation screens android:layout_width="match_parent" android:layout_height="wrap_content" /> </FrameLayout> - + </RelativeLayout> |