diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-10-28 07:17:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 07:17:29 +0000 |
| commit | 6526c6883bd55ccd664fc3d4bb5874f2e9dde2f7 (patch) | |
| tree | 6993842ab5048e5e51e08fbe82fb44a6fa58ad1b /res | |
| parent | 650f8eb24d0206349da832e98226b71db448aed9 (diff) | |
| parent | 5d0ba1740023cfe63d4980b8c09521f080060cf5 (diff) | |
| download | packages_apps_Contacts-6526c6883bd55ccd664fc3d4bb5874f2e9dde2f7.tar.gz packages_apps_Contacts-6526c6883bd55ccd664fc3d4bb5874f2e9dde2f7.tar.bz2 packages_apps_Contacts-6526c6883bd55ccd664fc3d4bb5874f2e9dde2f7.zip | |
am 5d0ba174: am 9a47c576: Merge "Avoid Resources" into lmp-mr1-dev
* commit '5d0ba1740023cfe63d4980b8c09521f080060cf5':
Avoid Resources$NotFoundException
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-land/vals.xml | 19 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/res/values-land/vals.xml b/res/values-land/vals.xml deleted file mode 100644 index ebcae31e9..000000000 --- a/res/values-land/vals.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - 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. - See the License for the specific language governing permissions and - limitations under the License. ---> -<resources> - <!-- The ratio of width:height for the contact's photo --> - <item name="quickcontact_photo_ratio" type="vals" format="float">0.7</item> -</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cd9795cca..857045c46 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,6 +22,8 @@ <dimen name="quickcontact_maximum_title_size">36dp</dimen> <!-- When QC is uncollapsed, the title has this much margin on its left, right and bottom --> <dimen name="quickcontact_title_initial_margin">16dp</dimen> + <!-- The ratio of width:height for the contact's photo in landscape --> + <item name="quickcontact_landscape_photo_ratio" type="dimen" format="float">0.7</item> <!-- Top padding of the entire contact editor --> <dimen name="editor_padding_top">0dip</dimen> |