diff options
author | Robert Greenwalt <robdroid@android.com> | 2009-04-22 14:35:11 -0700 |
---|---|---|
committer | Robert Greenwalt <robdroid@android.com> | 2009-04-22 14:35:11 -0700 |
commit | 96e20409afc720f61d0cd49bf1441f62069bd6bb (patch) | |
tree | 8088015f1763a454848ad35d4f5dc8f64ebcf6f4 /tests/AndroidTests/res/values-mcc110-xx/configVarying.xml | |
parent | 644cf62660c87a9b8d5bcb22412cc2ad2aeea291 (diff) | |
download | frameworks_base-96e20409afc720f61d0cd49bf1441f62069bd6bb.zip frameworks_base-96e20409afc720f61d0cd49bf1441f62069bd6bb.tar.gz frameworks_base-96e20409afc720f61d0cd49bf1441f62069bd6bb.tar.bz2 |
Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date: Wed Apr 22 14:31:26 2009 -0700
Additional fixes and tests for density.
commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date: Tue Apr 14 14:39:00 2009 -0700
Fix runtime resource selection logic.
Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
Diffstat (limited to 'tests/AndroidTests/res/values-mcc110-xx/configVarying.xml')
-rw-r--r-- | tests/AndroidTests/res/values-mcc110-xx/configVarying.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/AndroidTests/res/values-mcc110-xx/configVarying.xml b/tests/AndroidTests/res/values-mcc110-xx/configVarying.xml new file mode 100644 index 0000000..82e2435 --- /dev/null +++ b/tests/AndroidTests/res/values-mcc110-xx/configVarying.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2007 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> + <item type="configVarying" name="simple">simple mcc110 xx</item> + <bag type="configVarying" name="bag"> + <item name="testString">bag mcc110 xx</item> + </bag> +</resources> |