am ea839a72: Merge change 22766 into eclair
Merge commit 'ea839a72fd68e0b796e6dd2384de1447d06d9b62' into eclair-plus-aosp * commit 'ea839a72fd68e0b796e6dd2384de1447d06d9b62': Add assets for fasttrack badges.
28
core/res/res/drawable/fasttrack_badge_dark.xml
Normal file
@@ -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>
|
||||
BIN
core/res/res/drawable/fasttrack_badge_dark_normal.9.png
Normal file
|
After Width: | Height: | Size: 624 B |
BIN
core/res/res/drawable/fasttrack_badge_dark_pressed.9.png
Normal file
|
After Width: | Height: | Size: 846 B |
28
core/res/res/drawable/fasttrack_badge_light.xml
Normal file
@@ -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>
|
||||
BIN
core/res/res/drawable/fasttrack_badge_light_normal.9.png
Normal file
|
After Width: | Height: | Size: 824 B |
BIN
core/res/res/drawable/fasttrack_badge_light_pressed.9.png
Normal file
|
After Width: | Height: | Size: 831 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 606 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 818 B |
@@ -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"
|
||||
|
||||