diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 10:20:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 10:20:30 -0700 |
| commit | ea839a72fd68e0b796e6dd2384de1447d06d9b62 (patch) | |
| tree | 252e5887b534ba256f598b8a9c01527a081b6294 | |
| parent | 6ee9952bc20be72b9419cb653c9e2e833889a3d3 (diff) | |
| parent | 22136fe1df5f3e081d4a42b13d5ce74049ad11a1 (diff) | |
| download | frameworks_base-ea839a72fd68e0b796e6dd2384de1447d06d9b62.zip frameworks_base-ea839a72fd68e0b796e6dd2384de1447d06d9b62.tar.gz frameworks_base-ea839a72fd68e0b796e6dd2384de1447d06d9b62.tar.bz2 | |
Merge change 22766 into eclair
* changes:
Add assets for fasttrack badges.
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_dark.xml | 28 | ||||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_dark_normal.9.png | bin | 0 -> 624 bytes | |||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_dark_pressed.9.png | bin | 0 -> 846 bytes | |||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_light.xml | 28 | ||||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_light_normal.9.png | bin | 0 -> 824 bytes | |||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_light_pressed.9.png | bin | 0 -> 831 bytes | |||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_middle_normal.9.png | bin | 1174 -> 606 bytes | |||
| -rw-r--r-- | core/res/res/drawable/fasttrack_badge_middle_pressed.9.png | bin | 1567 -> 818 bytes | |||
| -rw-r--r-- | core/res/res/layout/contact_header.xml | 4 |
9 files changed, 58 insertions, 2 deletions
diff --git a/core/res/res/drawable/fasttrack_badge_dark.xml b/core/res/res/drawable/fasttrack_badge_dark.xml new file mode 100644 index 0000000..c60d403 --- /dev/null +++ b/core/res/res/drawable/fasttrack_badge_dark.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="false" + android:state_selected="false" + android:state_pressed="false" + android:drawable="@drawable/fasttrack_badge_dark_normal" /> + + <item + android:state_pressed="true" + android:drawable="@drawable/fasttrack_badge_dark_pressed" /> + +</selector> diff --git a/core/res/res/drawable/fasttrack_badge_dark_normal.9.png b/core/res/res/drawable/fasttrack_badge_dark_normal.9.png Binary files differnew file mode 100644 index 0000000..52bb08c --- /dev/null +++ b/core/res/res/drawable/fasttrack_badge_dark_normal.9.png diff --git a/core/res/res/drawable/fasttrack_badge_dark_pressed.9.png b/core/res/res/drawable/fasttrack_badge_dark_pressed.9.png Binary files differnew file mode 100644 index 0000000..84a6783 --- /dev/null +++ b/core/res/res/drawable/fasttrack_badge_dark_pressed.9.png diff --git a/core/res/res/drawable/fasttrack_badge_light.xml b/core/res/res/drawable/fasttrack_badge_light.xml new file mode 100644 index 0000000..fd81258 --- /dev/null +++ b/core/res/res/drawable/fasttrack_badge_light.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="false" + android:state_selected="false" + android:state_pressed="false" + android:drawable="@drawable/fasttrack_badge_light_normal" /> + + <item + android:state_pressed="true" + android:drawable="@drawable/fasttrack_badge_light_pressed" /> + +</selector> diff --git a/core/res/res/drawable/fasttrack_badge_light_normal.9.png b/core/res/res/drawable/fasttrack_badge_light_normal.9.png Binary files differnew file mode 100644 index 0000000..595b179 --- /dev/null +++ b/core/res/res/drawable/fasttrack_badge_light_normal.9.png diff --git a/core/res/res/drawable/fasttrack_badge_light_pressed.9.png b/core/res/res/drawable/fasttrack_badge_light_pressed.9.png Binary files differnew file mode 100644 index 0000000..8e3f557 --- /dev/null +++ b/core/res/res/drawable/fasttrack_badge_light_pressed.9.png diff --git a/core/res/res/drawable/fasttrack_badge_middle_normal.9.png b/core/res/res/drawable/fasttrack_badge_middle_normal.9.png Binary files differindex 1ac6ef9..07df063 100644 --- a/core/res/res/drawable/fasttrack_badge_middle_normal.9.png +++ b/core/res/res/drawable/fasttrack_badge_middle_normal.9.png diff --git a/core/res/res/drawable/fasttrack_badge_middle_pressed.9.png b/core/res/res/drawable/fasttrack_badge_middle_pressed.9.png Binary files differindex 33921ba..ded95f6 100644 --- a/core/res/res/drawable/fasttrack_badge_middle_pressed.9.png +++ b/core/res/res/drawable/fasttrack_badge_middle_pressed.9.png diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml index 8c1957d..ba91e00 100644 --- a/core/res/res/layout/contact_header.xml +++ b/core/res/res/layout/contact_header.xml @@ -24,8 +24,8 @@ android:gravity="center_vertical"> <ImageView android:id="@+id/photo" - android:layout_width="56dip" - android:layout_height="64dip" + android:layout_width="48dip" + android:layout_height="52dip" android:layout_marginRight="10dip" android:layout_marginLeft="10dip" android:scaleType="fitCenter" |
