diff options
author | Daniel Sandler <dsandler@android.com> | 2014-12-03 17:19:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 17:19:19 +0000 |
commit | b06074723fbed960749bab2b6e6b7e013f012e6a (patch) | |
tree | a999ca11367f86248c91a400037f00fae3ef96c1 /packages/SystemUI/res | |
parent | 5f23693b5cad0647a6bd95ba50dc87bb9023e864 (diff) | |
parent | 195c438883dfcca799aa456dfe52d24c077e40da (diff) | |
download | frameworks_base-b06074723fbed960749bab2b6e6b7e013f012e6a.zip frameworks_base-b06074723fbed960749bab2b6e6b7e013f012e6a.tar.gz frameworks_base-b06074723fbed960749bab2b6e6b7e013f012e6a.tar.bz2 |
am 195c4388: Fixing bugs in the LLand.
* commit '195c438883dfcca799aa456dfe52d24c077e40da':
Fixing bugs in the LLand.
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/drawable/pop_ball.xml | 29 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/pop_belt.xml | 8 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/pop_pizza.xml | 16 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/pop_swirl.xml | 8 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/pop_vortex.xml | 2 | ||||
-rw-r--r-- | packages/SystemUI/res/values/lland_config.xml | 2 |
6 files changed, 47 insertions, 18 deletions
diff --git a/packages/SystemUI/res/drawable/pop_ball.xml b/packages/SystemUI/res/drawable/pop_ball.xml new file mode 100644 index 0000000..ee1220f --- /dev/null +++ b/packages/SystemUI/res/drawable/pop_ball.xml @@ -0,0 +1,29 @@ +<!-- +Copyright (C) 2014 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> + <path + android:pathData="M0,50 a50,50 0 1 1 100,0 + a50,50 0 1 1 -100,0" + android:fillColor="#FFFF1744"/> + <path + android:pathData="M16,36 A24,24 0 1 1 64,36 + M64,36 A24,24 0 1 1 16,36" + android:fillColor="#20FFFFFF"/> +</vector> diff --git a/packages/SystemUI/res/drawable/pop_belt.xml b/packages/SystemUI/res/drawable/pop_belt.xml index 5c0c3d7..e0ea575 100644 --- a/packages/SystemUI/res/drawable/pop_belt.xml +++ b/packages/SystemUI/res/drawable/pop_belt.xml @@ -20,14 +20,14 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="100.0"> <path android:pathData="M50.000000,50.000000m-47.599998,0.000000a47.599998,47.599998 0.000000,1.000000 1.000000,95.199997 0.000000a47.599998,47.599998 0.000000,1.000000 1.000000,-95.199997 0.000000" - android:fillColor="#D81B60"/> + android:fillColor="#9C27B0"/> <path android:pathData="M50.000000,2.429000c-26.337999,0.000000 -47.688999,21.351000 -47.688999,47.688999c0.000000,13.168000 5.337000,25.091000 13.968000,33.722000l67.444000,-67.443001C75.092003,7.766000 63.168999,2.429000 50.000000,2.429000z" - android:fillColor="#F06292"/> + android:fillColor="#BA68C8"/> <path android:pathData="M0.000000,41.573002l100.000000,0.000000l0.000000,17.090000l-100.000000,0.000000z" - android:fillColor="#D81B60"/> + android:fillColor="#9C27B0"/> <path android:pathData="M0.000000,58.662998l0.000000,-17.089996 100.000000,0.000000z" - android:fillColor="#F06292"/> + android:fillColor="#BA68C8"/> </vector> diff --git a/packages/SystemUI/res/drawable/pop_pizza.xml b/packages/SystemUI/res/drawable/pop_pizza.xml index b6d2bb3..1806b5a 100644 --- a/packages/SystemUI/res/drawable/pop_pizza.xml +++ b/packages/SystemUI/res/drawable/pop_pizza.xml @@ -20,26 +20,26 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="100.0"> <path android:pathData="M14.645000,14.645000C5.597000,23.693001 0.000000,36.193001 0.000000,50.000000l50.000000,0.000000L14.645000,14.645000z" - android:fillColor="#7BAAF7"/> + android:fillColor="#2979FF"/> <path android:pathData="M100.000000,50.000000c0.000000,-13.807000 -5.597000,-26.306999 -14.645000,-35.355000L50.000000,50.000000L100.000000,50.000000z" - android:fillColor="#D81B60"/> + android:fillColor="#FF1744"/> <path android:pathData="M85.355003,14.645000C76.306999,5.597000 63.806999,0.000000 50.000000,0.000000l0.000000,50.000000L85.355003,14.645000z" - android:fillColor="#F06292"/> + android:fillColor="#0F9D58"/> <path android:pathData="M50.000000,0.000000C36.193001,0.000000 23.693001,5.597000 14.645000,14.645000L50.000000,50.000000L50.000000,0.000000z" - android:fillColor="#FFF176"/> + android:fillColor="#FFBC00"/> <path android:pathData="M50.000000,50.000000l35.355000,35.355000C94.403000,76.307999 100.000000,63.807999 100.000000,50.000000L50.000000,50.000000z" - android:fillColor="#7BAAF7"/> + android:fillColor="#2979FF"/> <path android:pathData="M50.000000,100.000000c13.807000,0.000000 26.306999,-5.596000 35.355000,-14.645000L50.000000,50.000000L50.000000,100.000000z" - android:fillColor="#FFF176"/> + android:fillColor="#FFBC00"/> <path android:pathData="M14.645000,85.355003C23.693001,94.403999 36.193001,100.000000 50.000000,100.000000L50.000000,50.000000L14.645000,85.355003z" - android:fillColor="#F06292"/> + android:fillColor="#0F9D58"/> <path android:pathData="M0.000000,50.000000c0.000000,13.808000 5.597000,26.308001 14.645000,35.355000L50.000000,50.000000L0.000000,50.000000z" - android:fillColor="#D81B60"/> + android:fillColor="#FF1744"/> </vector> diff --git a/packages/SystemUI/res/drawable/pop_swirl.xml b/packages/SystemUI/res/drawable/pop_swirl.xml index acd6d3d..f87569b 100644 --- a/packages/SystemUI/res/drawable/pop_swirl.xml +++ b/packages/SystemUI/res/drawable/pop_swirl.xml @@ -20,7 +20,7 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="100.0"> <path android:pathData="M50.000000,50.000000C86.898003,27.834999 79.244003,11.688000 76.177002,7.399000c-7.240000,-4.459000 -15.703000,-7.112000 -24.770000,-7.363000C56.247002,2.253000 70.815002,12.456000 50.000000,50.000000z" - android:fillColor="#82B1FF"/> + android:fillColor="#FFFFFA"/> <path android:pathData="M50.000000,50.000000c20.815001,-37.543999 6.247000,-47.747002 1.407000,-49.964001C50.938000,0.022000 50.472000,0.000000 50.000000,0.000000c-8.627000,0.000000 -16.743999,2.186000 -23.827000,6.032000C31.392000,5.514000 49.251999,6.903000 50.000000,50.000000z" android:fillColor="#76FF03"/> @@ -32,7 +32,7 @@ Copyright (C) 2014 The Android Open Source Project android:fillColor="#303F9F"/> <path android:pathData="M50.000000,50.000000C27.834000,13.103000 11.687000,20.757000 7.398000,23.823999C2.940000,31.063000 0.287000,39.527000 0.035000,48.592999C2.253000,43.752998 12.456000,29.184999 50.000000,50.000000z" - android:fillColor="#FAFAFA"/> + android:fillColor="#FFFFFA"/> <path android:pathData="M50.000000,50.000000C49.251999,6.903000 31.392000,5.514000 26.173000,6.032000c-7.709000,4.187000 -14.188000,10.344000 -18.774000,17.792000C11.687000,20.757000 27.834000,13.103000 50.000000,50.000000z" android:fillColor="#303F9F"/> @@ -44,13 +44,13 @@ Copyright (C) 2014 The Android Open Source Project android:fillColor="#303F9F"/> <path android:pathData="M50.000000,50.000000c22.166000,36.897999 38.313000,29.243999 42.602001,26.177999c4.458000,-7.240000 7.111000,-15.703000 7.363000,-24.770000C97.747002,56.248001 87.543999,70.816002 50.000000,50.000000z" - android:fillColor="#FAFAFA"/> + android:fillColor="#FFFFFA"/> <path android:pathData="M50.000000,50.000000c-20.815001,37.544998 -6.247000,47.748001 -1.407000,49.965000C49.062000,99.978996 49.528000,100.000000 50.000000,100.000000c8.627000,0.000000 16.743999,-2.185000 23.827000,-6.031000C68.608002,94.486000 50.748001,93.098000 50.000000,50.000000z" android:fillColor="#76FF03"/> <path android:pathData="M50.000000,50.000000C13.103000,72.166000 20.757000,88.313004 23.823000,92.601997c7.240000,4.459000 15.703000,7.112000 24.770000,7.363000C43.752998,97.748001 29.184999,87.544998 50.000000,50.000000z" - android:fillColor="#82B1FF"/> + android:fillColor="#FFFFFA"/> <path android:pathData="M50.000000,50.000000C6.902000,50.749001 5.514000,68.609001 6.032000,73.828003c4.186000,7.708000 10.344000,14.188000 17.791000,18.773001C20.757000,88.313004 13.103000,72.166000 50.000000,50.000000z" android:fillColor="#303F9F"/> diff --git a/packages/SystemUI/res/drawable/pop_vortex.xml b/packages/SystemUI/res/drawable/pop_vortex.xml index faefcb1..2380e68 100644 --- a/packages/SystemUI/res/drawable/pop_vortex.xml +++ b/packages/SystemUI/res/drawable/pop_vortex.xml @@ -20,7 +20,7 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="100.0"> <path android:pathData="M50.000000,50.000000m-50.000000,0.000000a50.000000,50.000000 0.000000,1.000000 1.000000,100.000000 0.000000a50.000000,50.000000 0.000000,1.000000 1.000000,-100.000000 0.000000" - android:fillColor="#FFF176"/> + android:fillColor="#F8F8FF"/> <path android:pathData="M58.658001,89.648003c-19.330000,0.000000 -35.000000,-15.670000 -35.000000,-35.000000c0.000000,-13.531000 10.969000,-24.500000 24.500000,-24.500000c9.472000,0.000000 17.150000,7.679000 17.150000,17.150000c0.000000,6.631000 -5.375000,12.006000 -12.006000,12.006000c-3.798000,0.000000 -7.004000,-2.522000 -8.045000,-5.982000c1.021000,1.136000 2.497000,1.854000 4.145000,1.854000c2.644000,0.000000 4.853000,-1.841000 5.428000,-4.310000c0.175000,-0.558000 0.271000,-1.150000 0.271000,-1.766000c0.000000,-4.642000 -3.763000,-8.404000 -8.403000,-8.404000c-6.631000,0.000000 -12.006000,5.375000 -12.006000,12.006000c0.000000,9.472000 7.679000,17.149000 17.150000,17.149000c13.531000,0.000000 24.500000,-10.969000 24.500000,-24.500000c0.000000,-19.330000 -15.670000,-35.000000 -35.000000,-35.000000c-12.963000,0.000000 -24.773001,4.935000 -33.657001,13.025000C2.824000,31.087000 0.000000,40.212002 0.000000,50.000000c0.000000,27.615000 22.386000,50.000000 50.000000,50.000000c17.825001,0.000000 33.462002,-9.335000 42.313999,-23.375999C83.431000,84.714996 71.621002,89.648003 58.658001,89.648003z" android:fillColor="#7BAAF7"/> diff --git a/packages/SystemUI/res/values/lland_config.xml b/packages/SystemUI/res/values/lland_config.xml index 5d74082..a9e732e 100644 --- a/packages/SystemUI/res/values/lland_config.xml +++ b/packages/SystemUI/res/values/lland_config.xml @@ -26,7 +26,7 @@ <dimen name="obstacle_width">90dp</dimen> <dimen name="obstacle_stem_width">12dp</dimen> <dimen name="obstacle_gap">170dp</dimen> - <dimen name="obstacle_height_min">40dp</dimen> + <dimen name="obstacle_height_min">48dp</dimen> <dimen name="building_width_min">20dp</dimen> <dimen name="building_width_max">250dp</dimen> <dimen name="building_height_min">20dp</dimen> |