diff options
| author | Adam Powell <adamp@google.com> | 2011-01-24 19:45:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-24 19:45:41 -0800 |
| commit | 68b29902c0832d78a6557f915168694f35b7ca8e (patch) | |
| tree | be2a8d4f30b1b8885351f09e974c263c2af2ccc4 /core | |
| parent | 34edd5b2678332e23bb78c59d4720c5b7b0e842e (diff) | |
| parent | 6d0576d3e82420cfc1840542bb897e5686d548e4 (diff) | |
| download | frameworks_base-68b29902c0832d78a6557f915168694f35b7ca8e.zip frameworks_base-68b29902c0832d78a6557f915168694f35b7ca8e.tar.gz frameworks_base-68b29902c0832d78a6557f915168694f35b7ca8e.tar.bz2 | |
Merge "Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken" into honeycomb
Diffstat (limited to 'core')
16 files changed, 44 insertions, 56 deletions
diff --git a/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png Binary files differindex bd353ae..00e8f06 100644 --- a/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png Binary files differindex d127b3c..997ccb2 100644 --- a/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png +++ b/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_holo_dark.9.png Binary files differdeleted file mode 100644 index b86c65a..0000000 --- a/core/res/res/drawable-hdpi/btn_group_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/btn_group_holo_light.9.png b/core/res/res/drawable-hdpi/btn_group_holo_light.9.png Binary files differdeleted file mode 100644 index 1248e88..0000000 --- a/core/res/res/drawable-hdpi/btn_group_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/btn_group_normal_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_normal_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..b2120f4 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_normal_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_normal_holo_light.9.png b/core/res/res/drawable-hdpi/btn_group_normal_holo_light.9.png Binary files differnew file mode 100644 index 0000000..782d36b --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_normal_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png Binary files differindex aa04cc9..5894afe 100644 --- a/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png Binary files differindex 25aefd2..1dfc7d3 100644 --- a/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png +++ b/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_group_holo_dark.9.png Binary files differdeleted file mode 100644 index 9541252..0000000 --- a/core/res/res/drawable-mdpi/btn_group_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/btn_group_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_holo_light.9.png Binary files differdeleted file mode 100644 index bf4f9b2..0000000 --- a/core/res/res/drawable-mdpi/btn_group_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/btn_group_normal_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_group_normal_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..c6257bb --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_normal_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_normal_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_normal_holo_light.9.png Binary files differnew file mode 100644 index 0000000..7e25ad3 --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_normal_holo_light.9.png diff --git a/core/res/res/drawable/btn_group_holo_dark.xml b/core/res/res/drawable/btn_group_holo_dark.xml new file mode 100644 index 0000000..553f023 --- /dev/null +++ b/core/res/res/drawable/btn_group_holo_dark.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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_enabled="true" + android:drawable="@drawable/btn_group_normal_holo_dark" /> + <item + android:drawable="@drawable/btn_group_disabled_holo_dark" /> +</selector> diff --git a/core/res/res/drawable/btn_group_holo_light.xml b/core/res/res/drawable/btn_group_holo_light.xml new file mode 100644 index 0000000..9c89eef --- /dev/null +++ b/core/res/res/drawable/btn_group_holo_light.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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_enabled="true" + android:drawable="@drawable/btn_group_normal_holo_light" /> + <item + android:drawable="@drawable/btn_group_disabled_holo_light" /> +</selector> diff --git a/core/res/res/drawable/group_button_background_holo_dark.xml b/core/res/res/drawable/group_button_background_holo_dark.xml deleted file mode 100644 index fa00785..0000000 --- a/core/res/res/drawable/group_button_background_holo_dark.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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_window_focused="false" android:drawable="@color/transparent" /> - - <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> - <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/btn_group_disabled_holo_dark" /> - <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/btn_group_disabled_holo_dark" /> - <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_dark" /> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_dark" /> - <item android:state_focused="true" android:drawable="@drawable/btn_group_focused_holo_dark" /> - <item android:drawable="@color/transparent" /> -</selector> diff --git a/core/res/res/drawable/group_button_background_holo_light.xml b/core/res/res/drawable/group_button_background_holo_light.xml deleted file mode 100644 index 1e74ec7..0000000 --- a/core/res/res/drawable/group_button_background_holo_light.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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_window_focused="false" android:drawable="@color/transparent" /> - - <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> - <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/btn_group_disabled_holo_light" /> - <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/btn_group_disabled_holo_light" /> - <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_light" /> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_light" /> - <item android:state_focused="true" android:drawable="@drawable/btn_group_focused_holo_light" /> - <item android:drawable="@color/transparent" /> -</selector> |
