summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable-hdpi/ic_allday_collapse_large_holo_light.png (renamed from res/drawable-hdpi/ic_allday_collapse_holo_light.png)bin834 -> 834 bytes
-rw-r--r--res/drawable-hdpi/ic_allday_collapse_small_holo_light.pngbin0 -> 538 bytes
-rw-r--r--res/drawable-hdpi/ic_allday_expand_large_holo_light.png (renamed from res/drawable-hdpi/ic_allday_expand_holo_light.png)bin824 -> 824 bytes
-rw-r--r--res/drawable-hdpi/ic_allday_expand_small_holo_light.pngbin0 -> 529 bytes
-rw-r--r--res/drawable-hdpi/ic_contact_picture.pngbin2270 -> 915 bytes
-rw-r--r--res/drawable-hdpi/list_activated_holo.9.pngbin1278 -> 982 bytes
-rw-r--r--res/drawable-hdpi/list_multi_left_primary_holo.9.pngbin221 -> 228 bytes
-rw-r--r--res/drawable-hdpi/list_multi_left_secondary_holo.9.pngbin226 -> 225 bytes
-rw-r--r--res/drawable-mdpi/ic_allday_collapse_large_holo_light.png (renamed from res/drawable-mdpi/ic_allday_collapse_holo_light.png)bin629 -> 629 bytes
-rw-r--r--res/drawable-mdpi/ic_allday_collapse_small_holo_light.pngbin0 -> 428 bytes
-rw-r--r--res/drawable-mdpi/ic_allday_expand_large_holo_light.png (renamed from res/drawable-mdpi/ic_allday_expand_holo_light.png)bin622 -> 622 bytes
-rw-r--r--res/drawable-mdpi/ic_allday_expand_small_holo_light.pngbin0 -> 425 bytes
-rw-r--r--res/drawable-mdpi/ic_contact_picture.pngbin1553 -> 692 bytes
-rw-r--r--res/drawable-mdpi/list_activated_holo.9.pngbin798 -> 629 bytes
-rw-r--r--res/drawable-mdpi/list_multi_left_primary_holo.9.pngbin192 -> 199 bytes
-rw-r--r--res/drawable-mdpi/list_multi_left_secondary_holo.9.pngbin192 -> 198 bytes
-rw-r--r--res/drawable-xhdpi/ic_allday_collapse_large_holo_light.png (renamed from res/drawable-xhdpi/ic_allday_collapse_holo_light.png)bin1072 -> 1072 bytes
-rw-r--r--res/drawable-xhdpi/ic_allday_collapse_small_holo_light.pngbin0 -> 663 bytes
-rw-r--r--res/drawable-xhdpi/ic_allday_expand_large_holo_light.png (renamed from res/drawable-xhdpi/ic_allday_expand_holo_light.png)bin1075 -> 1075 bytes
-rw-r--r--res/drawable-xhdpi/ic_allday_expand_small_holo_light.pngbin0 -> 658 bytes
-rw-r--r--res/drawable-xhdpi/ic_contact_picture.pngbin2905 -> 1138 bytes
-rw-r--r--res/drawable-xhdpi/list_activated_holo.9.pngbin0 -> 1667 bytes
-rw-r--r--res/drawable-xhdpi/list_div_top_btm_cal_widget_holo.9.pngbin294 -> 308 bytes
-rw-r--r--res/drawable-xhdpi/list_multi_left_primary_holo.9.pngbin251 -> 256 bytes
-rw-r--r--res/drawable-xhdpi/list_multi_left_secondary_holo.9.pngbin245 -> 259 bytes
-rw-r--r--res/drawable-xlarge/ic_allday_collapse_holo_light.xml21
-rw-r--r--res/drawable-xlarge/ic_allday_expand_holo_light.xml21
-rw-r--r--res/drawable/ic_allday_collapse_holo_light.xml21
-rw-r--r--res/drawable/ic_allday_expand_holo_light.xml21
-rw-r--r--src/com/android/calendar/AllInOneActivity.java8
30 files changed, 92 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_allday_collapse_holo_light.png b/res/drawable-hdpi/ic_allday_collapse_large_holo_light.png
index 1f0ddb51..1f0ddb51 100644
--- a/res/drawable-hdpi/ic_allday_collapse_holo_light.png
+++ b/res/drawable-hdpi/ic_allday_collapse_large_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_allday_collapse_small_holo_light.png b/res/drawable-hdpi/ic_allday_collapse_small_holo_light.png
new file mode 100644
index 00000000..a819104d
--- /dev/null
+++ b/res/drawable-hdpi/ic_allday_collapse_small_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_allday_expand_holo_light.png b/res/drawable-hdpi/ic_allday_expand_large_holo_light.png
index 8fb93eed..8fb93eed 100644
--- a/res/drawable-hdpi/ic_allday_expand_holo_light.png
+++ b/res/drawable-hdpi/ic_allday_expand_large_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_allday_expand_small_holo_light.png b/res/drawable-hdpi/ic_allday_expand_small_holo_light.png
new file mode 100644
index 00000000..d5d5779f
--- /dev/null
+++ b/res/drawable-hdpi/ic_allday_expand_small_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
index 7c0a030c..c521ca6c 100644
--- a/res/drawable-hdpi/ic_contact_picture.png
+++ b/res/drawable-hdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png
index 07656b7d..c29bebbe 100644
--- a/res/drawable-hdpi/list_activated_holo.9.png
+++ b/res/drawable-hdpi/list_activated_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_multi_left_primary_holo.9.png b/res/drawable-hdpi/list_multi_left_primary_holo.9.png
index ababa06a..c023091f 100644
--- a/res/drawable-hdpi/list_multi_left_primary_holo.9.png
+++ b/res/drawable-hdpi/list_multi_left_primary_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_multi_left_secondary_holo.9.png b/res/drawable-hdpi/list_multi_left_secondary_holo.9.png
index 1d9fadfe..006abd67 100644
--- a/res/drawable-hdpi/list_multi_left_secondary_holo.9.png
+++ b/res/drawable-hdpi/list_multi_left_secondary_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allday_collapse_holo_light.png b/res/drawable-mdpi/ic_allday_collapse_large_holo_light.png
index 50b0d902..50b0d902 100644
--- a/res/drawable-mdpi/ic_allday_collapse_holo_light.png
+++ b/res/drawable-mdpi/ic_allday_collapse_large_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allday_collapse_small_holo_light.png b/res/drawable-mdpi/ic_allday_collapse_small_holo_light.png
new file mode 100644
index 00000000..c3bf7cc0
--- /dev/null
+++ b/res/drawable-mdpi/ic_allday_collapse_small_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allday_expand_holo_light.png b/res/drawable-mdpi/ic_allday_expand_large_holo_light.png
index b2d6a616..b2d6a616 100644
--- a/res/drawable-mdpi/ic_allday_expand_holo_light.png
+++ b/res/drawable-mdpi/ic_allday_expand_large_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allday_expand_small_holo_light.png b/res/drawable-mdpi/ic_allday_expand_small_holo_light.png
new file mode 100644
index 00000000..18a4e2b9
--- /dev/null
+++ b/res/drawable-mdpi/ic_allday_expand_small_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
index aa0187d4..e17a5da6 100644
--- a/res/drawable-mdpi/ic_contact_picture.png
+++ b/res/drawable-mdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png
index 1a277111..5aeefa48 100644
--- a/res/drawable-mdpi/list_activated_holo.9.png
+++ b/res/drawable-mdpi/list_activated_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_multi_left_primary_holo.9.png b/res/drawable-mdpi/list_multi_left_primary_holo.9.png
index 44d91f58..63655b3c 100644
--- a/res/drawable-mdpi/list_multi_left_primary_holo.9.png
+++ b/res/drawable-mdpi/list_multi_left_primary_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_multi_left_secondary_holo.9.png b/res/drawable-mdpi/list_multi_left_secondary_holo.9.png
index a92f1e6d..62b88f2c 100644
--- a/res/drawable-mdpi/list_multi_left_secondary_holo.9.png
+++ b/res/drawable-mdpi/list_multi_left_secondary_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allday_collapse_holo_light.png b/res/drawable-xhdpi/ic_allday_collapse_large_holo_light.png
index fb65b00a..fb65b00a 100644
--- a/res/drawable-xhdpi/ic_allday_collapse_holo_light.png
+++ b/res/drawable-xhdpi/ic_allday_collapse_large_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allday_collapse_small_holo_light.png b/res/drawable-xhdpi/ic_allday_collapse_small_holo_light.png
new file mode 100644
index 00000000..4ab06dc1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_allday_collapse_small_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allday_expand_holo_light.png b/res/drawable-xhdpi/ic_allday_expand_large_holo_light.png
index 088732aa..088732aa 100644
--- a/res/drawable-xhdpi/ic_allday_expand_holo_light.png
+++ b/res/drawable-xhdpi/ic_allday_expand_large_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allday_expand_small_holo_light.png b/res/drawable-xhdpi/ic_allday_expand_small_holo_light.png
new file mode 100644
index 00000000..59c192e4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_allday_expand_small_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture.png b/res/drawable-xhdpi/ic_contact_picture.png
index 0dd8c3be..78338c3e 100644
--- a/res/drawable-xhdpi/ic_contact_picture.png
+++ b/res/drawable-xhdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png
new file mode 100644
index 00000000..cb97a149
--- /dev/null
+++ b/res/drawable-xhdpi/list_activated_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_div_top_btm_cal_widget_holo.9.png b/res/drawable-xhdpi/list_div_top_btm_cal_widget_holo.9.png
index ab402d46..db693ac1 100644
--- a/res/drawable-xhdpi/list_div_top_btm_cal_widget_holo.9.png
+++ b/res/drawable-xhdpi/list_div_top_btm_cal_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_multi_left_primary_holo.9.png b/res/drawable-xhdpi/list_multi_left_primary_holo.9.png
index add47586..c3fb45c1 100644
--- a/res/drawable-xhdpi/list_multi_left_primary_holo.9.png
+++ b/res/drawable-xhdpi/list_multi_left_primary_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png b/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png
index 6f676f43..4479d896 100644
--- a/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png
+++ b/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png
Binary files differ
diff --git a/res/drawable-xlarge/ic_allday_collapse_holo_light.xml b/res/drawable-xlarge/ic_allday_collapse_holo_light.xml
new file mode 100644
index 00000000..a7b5c97a
--- /dev/null
+++ b/res/drawable-xlarge/ic_allday_collapse_holo_light.xml
@@ -0,0 +1,21 @@
+<?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"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item
+ android:drawable="@drawable/ic_allday_collapse_large_holo_light" />
+</selector>
diff --git a/res/drawable-xlarge/ic_allday_expand_holo_light.xml b/res/drawable-xlarge/ic_allday_expand_holo_light.xml
new file mode 100644
index 00000000..4f50c4e5
--- /dev/null
+++ b/res/drawable-xlarge/ic_allday_expand_holo_light.xml
@@ -0,0 +1,21 @@
+<?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"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item
+ android:drawable="@drawable/ic_allday_expand_large_holo_light" />
+</selector>
diff --git a/res/drawable/ic_allday_collapse_holo_light.xml b/res/drawable/ic_allday_collapse_holo_light.xml
new file mode 100644
index 00000000..ecc25610
--- /dev/null
+++ b/res/drawable/ic_allday_collapse_holo_light.xml
@@ -0,0 +1,21 @@
+<?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"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item
+ android:drawable="@drawable/ic_allday_collapse_small_holo_light" />
+</selector>
diff --git a/res/drawable/ic_allday_expand_holo_light.xml b/res/drawable/ic_allday_expand_holo_light.xml
new file mode 100644
index 00000000..6ed977fd
--- /dev/null
+++ b/res/drawable/ic_allday_expand_holo_light.xml
@@ -0,0 +1,21 @@
+<?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"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item
+ android:drawable="@drawable/ic_allday_expand_small_holo_light" />
+</selector>
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index ca640b34..3f2d26e6 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -1116,4 +1116,12 @@ public class AllInOneActivity extends Activity implements EventHandler,
mSearchMenu.collapseActionView();
return false;
}
+
+ @Override
+ public boolean onSearchRequested() {
+ if (mSearchMenu != null) {
+ mSearchMenu.expandActionView();
+ }
+ return false;
+ }
}