diff options
author | Romain Guy <romainguy@android.com> | 2009-11-12 00:05:37 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-12 00:05:37 -0800 |
commit | 54250dc119131935cfe5f76b6cc7a779e8cb14b1 (patch) | |
tree | fbc67d935e0b99ef44244f2dbef936c0ca64430b /res | |
parent | 64f7488ae1575af46cfd57a5347c0ba6100fc1cc (diff) | |
parent | 0af2d2d2e31cc119bf7f321bd8209f121f0a626c (diff) | |
download | android_packages_apps_Trebuchet-54250dc119131935cfe5f76b6cc7a779e8cb14b1.tar.gz android_packages_apps_Trebuchet-54250dc119131935cfe5f76b6cc7a779e8cb14b1.tar.bz2 android_packages_apps_Trebuchet-54250dc119131935cfe5f76b6cc7a779e8cb14b1.zip |
am 0af2d2d2: am 9e6dc486: am a87ee1a4: Final set of wallpapers.
Merge commit '0af2d2d2e31cc119bf7f321bd8209f121f0a626c'
* commit '0af2d2d2e31cc119bf7f321bd8209f121f0a626c':
Final set of wallpapers.
Diffstat (limited to 'res')
50 files changed, 12 insertions, 53 deletions
diff --git a/res/drawable-hdpi/wallpaper_bentgrass.jpg b/res/drawable-hdpi/wallpaper_bentgrass.jpg Binary files differdeleted file mode 100644 index 811149b16..000000000 --- a/res/drawable-hdpi/wallpaper_bentgrass.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_bentgrass_small.jpg b/res/drawable-hdpi/wallpaper_bentgrass_small.jpg Binary files differdeleted file mode 100644 index 68e11ffdf..000000000 --- a/res/drawable-hdpi/wallpaper_bentgrass_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_brown.jpg b/res/drawable-hdpi/wallpaper_brown.jpg Binary files differnew file mode 100644 index 000000000..d4c4f6626 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_brown.jpg diff --git a/res/drawable-hdpi/wallpaper_brown_small.jpg b/res/drawable-hdpi/wallpaper_brown_small.jpg Binary files differnew file mode 100644 index 000000000..99bfec869 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_brown_small.jpg diff --git a/res/drawable-hdpi/wallpaper_darkgraylined.jpg b/res/drawable-hdpi/wallpaper_darkgraylined.jpg Binary files differnew file mode 100644 index 000000000..42c8fd1ea --- /dev/null +++ b/res/drawable-hdpi/wallpaper_darkgraylined.jpg diff --git a/res/drawable-hdpi/wallpaper_darkgraylined_small.jpg b/res/drawable-hdpi/wallpaper_darkgraylined_small.jpg Binary files differnew file mode 100644 index 000000000..8f5433a1f --- /dev/null +++ b/res/drawable-hdpi/wallpaper_darkgraylined_small.jpg diff --git a/res/drawable-hdpi/wallpaper_despair.jpg b/res/drawable-hdpi/wallpaper_despair.jpg Binary files differdeleted file mode 100644 index 49933c112..000000000 --- a/res/drawable-hdpi/wallpaper_despair.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_despair_small.jpg b/res/drawable-hdpi/wallpaper_despair_small.jpg Binary files differdeleted file mode 100644 index bae448d6d..000000000 --- a/res/drawable-hdpi/wallpaper_despair_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_fumes.jpg b/res/drawable-hdpi/wallpaper_fumes.jpg Binary files differdeleted file mode 100644 index db5af29b9..000000000 --- a/res/drawable-hdpi/wallpaper_fumes.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_fumes_small.jpg b/res/drawable-hdpi/wallpaper_fumes_small.jpg Binary files differdeleted file mode 100644 index edc94082d..000000000 --- a/res/drawable-hdpi/wallpaper_fumes_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_grass_dawn.jpg b/res/drawable-hdpi/wallpaper_grass_dawn.jpg Binary files differdeleted file mode 100644 index 773d77bef..000000000 --- a/res/drawable-hdpi/wallpaper_grass_dawn.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_grass_dawn_small.jpg b/res/drawable-hdpi/wallpaper_grass_dawn_small.jpg Binary files differdeleted file mode 100644 index 50eaee3fd..000000000 --- a/res/drawable-hdpi/wallpaper_grass_dawn_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_grass_day.jpg b/res/drawable-hdpi/wallpaper_grass_day.jpg Binary files differdeleted file mode 100644 index 8de6483a5..000000000 --- a/res/drawable-hdpi/wallpaper_grass_day.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_grass_day_small.jpg b/res/drawable-hdpi/wallpaper_grass_day_small.jpg Binary files differdeleted file mode 100644 index 398d2a6bc..000000000 --- a/res/drawable-hdpi/wallpaper_grass_day_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_grass_twilight.jpg b/res/drawable-hdpi/wallpaper_grass_twilight.jpg Binary files differdeleted file mode 100644 index 79798de41..000000000 --- a/res/drawable-hdpi/wallpaper_grass_twilight.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_grass_twilight_small.jpg b/res/drawable-hdpi/wallpaper_grass_twilight_small.jpg Binary files differdeleted file mode 100644 index 5206c0b90..000000000 --- a/res/drawable-hdpi/wallpaper_grass_twilight_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_greencorr.jpg b/res/drawable-hdpi/wallpaper_greencorr.jpg Binary files differnew file mode 100644 index 000000000..2e97fdbc2 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_greencorr.jpg diff --git a/res/drawable-hdpi/wallpaper_greencorr_small.jpg b/res/drawable-hdpi/wallpaper_greencorr_small.jpg Binary files differnew file mode 100644 index 000000000..9a3fcd1d7 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_greencorr_small.jpg diff --git a/res/drawable-hdpi/wallpaper_hazybluedots.jpg b/res/drawable-hdpi/wallpaper_hazybluedots.jpg Binary files differnew file mode 100644 index 000000000..40e16379e --- /dev/null +++ b/res/drawable-hdpi/wallpaper_hazybluedots.jpg diff --git a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg b/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg Binary files differnew file mode 100644 index 000000000..273b7acc9 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg diff --git a/res/drawable-hdpi/wallpaper_jellyfish.jpg b/res/drawable-hdpi/wallpaper_jellyfish.jpg Binary files differdeleted file mode 100644 index 554000941..000000000 --- a/res/drawable-hdpi/wallpaper_jellyfish.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_jellyfish_small.jpg b/res/drawable-hdpi/wallpaper_jellyfish_small.jpg Binary files differdeleted file mode 100644 index 4ade3deb1..000000000 --- a/res/drawable-hdpi/wallpaper_jellyfish_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_lavadark.jpg b/res/drawable-hdpi/wallpaper_lavadark.jpg Binary files differnew file mode 100644 index 000000000..e587e7da6 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_lavadark.jpg diff --git a/res/drawable-hdpi/wallpaper_lavadark_small.jpg b/res/drawable-hdpi/wallpaper_lavadark_small.jpg Binary files differnew file mode 100644 index 000000000..4134d2531 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_lavadark_small.jpg diff --git a/res/drawable-hdpi/wallpaper_leaves.jpg b/res/drawable-hdpi/wallpaper_leaves.jpg Binary files differdeleted file mode 100644 index 3d20d6972..000000000 --- a/res/drawable-hdpi/wallpaper_leaves.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_leaves_small.jpg b/res/drawable-hdpi/wallpaper_leaves_small.jpg Binary files differdeleted file mode 100644 index 96bc7ad05..000000000 --- a/res/drawable-hdpi/wallpaper_leaves_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_nexusrain.jpg b/res/drawable-hdpi/wallpaper_nexusrain.jpg Binary files differnew file mode 100644 index 000000000..05b56ad52 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_nexusrain.jpg diff --git a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg Binary files differnew file mode 100644 index 000000000..42e9ca462 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg diff --git a/res/drawable-hdpi/wallpaper_noexpectsthe.jpg b/res/drawable-hdpi/wallpaper_noexpectsthe.jpg Binary files differnew file mode 100644 index 000000000..3532bf31c --- /dev/null +++ b/res/drawable-hdpi/wallpaper_noexpectsthe.jpg diff --git a/res/drawable-hdpi/wallpaper_noexpectsthe_small.jpg b/res/drawable-hdpi/wallpaper_noexpectsthe_small.jpg Binary files differnew file mode 100644 index 000000000..309fb1d66 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_noexpectsthe_small.jpg diff --git a/res/drawable-hdpi/wallpaper_paradise.jpg b/res/drawable-hdpi/wallpaper_paradise.jpg Binary files differdeleted file mode 100644 index 34e58f493..000000000 --- a/res/drawable-hdpi/wallpaper_paradise.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_paradise_small.jpg b/res/drawable-hdpi/wallpaper_paradise_small.jpg Binary files differdeleted file mode 100644 index 0a6e40c76..000000000 --- a/res/drawable-hdpi/wallpaper_paradise_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_pcut.jpg b/res/drawable-hdpi/wallpaper_pcut.jpg Binary files differnew file mode 100644 index 000000000..eb342d6a8 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_pcut.jpg diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg Binary files differnew file mode 100644 index 000000000..c6dc8d11f --- /dev/null +++ b/res/drawable-hdpi/wallpaper_pcut_small.jpg diff --git a/res/drawable-hdpi/wallpaper_purple.jpg b/res/drawable-hdpi/wallpaper_purple.jpg Binary files differnew file mode 100644 index 000000000..8c2b02744 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_purple.jpg diff --git a/res/drawable-hdpi/wallpaper_purple_small.jpg b/res/drawable-hdpi/wallpaper_purple_small.jpg Binary files differnew file mode 100644 index 000000000..d4e89ebe2 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_purple_small.jpg diff --git a/res/drawable-hdpi/wallpaper_rainbokeh.jpg b/res/drawable-hdpi/wallpaper_rainbokeh.jpg Binary files differdeleted file mode 100644 index 3c256bb69..000000000 --- a/res/drawable-hdpi/wallpaper_rainbokeh.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_rainbokeh_small.jpg b/res/drawable-hdpi/wallpaper_rainbokeh_small.jpg Binary files differdeleted file mode 100644 index 1c1413b84..000000000 --- a/res/drawable-hdpi/wallpaper_rainbokeh_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_ricefield.jpg b/res/drawable-hdpi/wallpaper_ricefield.jpg Binary files differdeleted file mode 100644 index f47c3de13..000000000 --- a/res/drawable-hdpi/wallpaper_ricefield.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_ricefield_small.jpg b/res/drawable-hdpi/wallpaper_ricefield_small.jpg Binary files differdeleted file mode 100644 index 2e780482e..000000000 --- a/res/drawable-hdpi/wallpaper_ricefield_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_ropelights.jpg b/res/drawable-hdpi/wallpaper_ropelights.jpg Binary files differnew file mode 100644 index 000000000..5b8fde631 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_ropelights.jpg diff --git a/res/drawable-hdpi/wallpaper_ropelights_small.jpg b/res/drawable-hdpi/wallpaper_ropelights_small.jpg Binary files differnew file mode 100644 index 000000000..f8c949d81 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_ropelights_small.jpg diff --git a/res/drawable-hdpi/wallpaper_snow_leopard.jpg b/res/drawable-hdpi/wallpaper_snow_leopard.jpg Binary files differdeleted file mode 100644 index 4fb3ac47e..000000000 --- a/res/drawable-hdpi/wallpaper_snow_leopard.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_snow_leopard_small.jpg b/res/drawable-hdpi/wallpaper_snow_leopard_small.jpg Binary files differdeleted file mode 100644 index 46c7701ba..000000000 --- a/res/drawable-hdpi/wallpaper_snow_leopard_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_sunset.jpg b/res/drawable-hdpi/wallpaper_sunset.jpg Binary files differdeleted file mode 100644 index e912fdcac..000000000 --- a/res/drawable-hdpi/wallpaper_sunset.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_sunset_small.jpg b/res/drawable-hdpi/wallpaper_sunset_small.jpg Binary files differdeleted file mode 100644 index 7b2ffb5d3..000000000 --- a/res/drawable-hdpi/wallpaper_sunset_small.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_valley.jpg b/res/drawable-hdpi/wallpaper_valley.jpg Binary files differdeleted file mode 100644 index 084098b01..000000000 --- a/res/drawable-hdpi/wallpaper_valley.jpg +++ /dev/null diff --git a/res/drawable-hdpi/wallpaper_valley_small.jpg b/res/drawable-hdpi/wallpaper_valley_small.jpg Binary files differdeleted file mode 100644 index 0dfcbc5cb..000000000 --- a/res/drawable-hdpi/wallpaper_valley_small.jpg +++ /dev/null diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml index 8d1501387..45e0c31e9 100644 --- a/res/values-hdpi/wallpapers.xml +++ b/res/values-hdpi/wallpapers.xml @@ -17,28 +17,23 @@ <resources> <string-array name="wallpapers" translatable="false"> - <item>wallpaper_bentgrass</item> - <item>wallpaper_canyon</item> - <item>wallpaper_desert</item> - <item>wallpaper_despair</item> + <item>wallpaper_nexusrain</item> + <item>wallpaper_darkgraylined</item> + <item>wallpaper_brown</item> + <item>wallpaper_nooneexpectsthe</item> + <item>wallpaper_lavadark</item> + <item>wallpaper_greencorr</item> + <item>wallpaper_pcut</item> + <item>wallpaper_hazybluedots</item> + <item>wallpaper_purple</item> <item>wallpaper_electric</item> - <item>wallpaper_fumes</item> - <item>wallpaper_goldengate</item> <item>wallpaper_grass</item> - <item>wallpaper_jellyfish</item> - <item>wallpaper_leaves</item> <item>wallpaper_monumentvalley</item> - <item>wallpaper_paradise</item> - <item>wallpaper_rainbokeh</item> - <item>wallpaper_ricefield</item> - <item>wallpaper_snow_leopard</item> - <item>wallpaper_sunset</item> <item>wallpaper_tree</item> - <item>wallpaper_valley</item> <item>wallpaper_zanzibar</item> - <item>wallpaper_grass_day</item> - <item>wallpaper_grass_dawn</item> - <item>wallpaper_grass_twilight</item> + <item>wallpaper_desert</item> + <item>wallpaper_canyon</item> + <item>wallpaper_goldengate</item> <item>wallpaper_grass_night</item> <item>wallpaper_galaxy</item> </string-array> diff --git a/res/values-mdpi/wallpapers.xml b/res/values-mdpi/wallpapers.xml deleted file mode 100644 index 352a626c3..000000000 --- a/res/values-mdpi/wallpapers.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (C) 2009 Google Inc. - * - * 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> - <string-array name="wallpapers" translatable="false"> - <item>wallpaper_bentgrass</item> - <item>wallpaper_canyon</item> - <item>wallpaper_despair</item> - <item>wallpaper_electric</item> - <item>wallpaper_goldengate</item> - <item>wallpaper_grass</item> - <item>wallpaper_jellyfish</item> - <item>wallpaper_leaves</item> - <item>wallpaper_monumentvalley</item> - <item>wallpaper_paradise</item> - <item>wallpaper_rainbokeh</item> - <item>wallpaper_ricefield</item> - <item>wallpaper_sunset</item> - <item>wallpaper_tree</item> - <item>wallpaper_valley</item> - </string-array> -</resources> |