diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-17 18:09:47 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 18:09:47 -0700 |
commit | 15181e7de3a8e2b2eb67761eb0b61072f44ba7f4 (patch) | |
tree | ef41e60fbaf0cac12b71fb34e1c6c9b0e1dbfd77 | |
parent | 6e6443e7c8abf8a48cbacfd84617e9b5c36c448f (diff) | |
parent | 112c225d6ced96df000831b2437d3aeda1b7da7d (diff) |
am 112c225d: Merge "Add highlight to contact tile row" into klp-dev
* commit '112c225d6ced96df000831b2437d3aeda1b7da7d':
Add highlight to contact tile row
-rw-r--r-- | res/drawable/bottom_border_background_pressed.xml | 19 | ||||
-rw-r--r-- | res/drawable/contact_list_item_background.xml | 19 | ||||
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteRegularRowView.java | 2 |
3 files changed, 39 insertions, 1 deletions
diff --git a/res/drawable/bottom_border_background_pressed.xml b/res/drawable/bottom_border_background_pressed.xml new file mode 100644 index 000000000..0924914e1 --- /dev/null +++ b/res/drawable/bottom_border_background_pressed.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/bottom_border_background" /> + <item android:drawable="@*android:drawable/list_selector_background_transition_holo_light" /> +</layer-list>
\ No newline at end of file diff --git a/res/drawable/contact_list_item_background.xml b/res/drawable/contact_list_item_background.xml new file mode 100644 index 000000000..5637f4d49 --- /dev/null +++ b/res/drawable/contact_list_item_background.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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_pressed="true" android:drawable="@drawable/bottom_border_background_pressed" /> + <item android:drawable="@drawable/bottom_border_background" /> +</selector> diff --git a/src/com/android/dialer/list/PhoneFavoriteRegularRowView.java b/src/com/android/dialer/list/PhoneFavoriteRegularRowView.java index efe7bdd7f..b4ad78467 100644 --- a/src/com/android/dialer/list/PhoneFavoriteRegularRowView.java +++ b/src/com/android/dialer/list/PhoneFavoriteRegularRowView.java @@ -56,7 +56,7 @@ public class PhoneFavoriteRegularRowView extends PhoneFavoriteTileView { rowPaddingBottom = resources.getDimensionPixelSize( R.dimen.favorites_row_bottom_padding); - favoriteContactCard.setBackgroundResource(R.drawable.bottom_border_background); + favoriteContactCard.setBackgroundResource(R.drawable.contact_list_item_background); favoriteContactCard.setPaddingRelative(rowPaddingStart, rowPaddingTop, rowPaddingEnd, rowPaddingBottom); |