diff options
45 files changed, 126 insertions, 19 deletions
diff --git a/res/drawable-hdpi/list_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png Binary files differnew file mode 100644 index 00000000..86578be4 --- /dev/null +++ b/res/drawable-hdpi/list_focused_holo.9.png diff --git a/res/drawable-hdpi/list_multi_left_activated_holo.9.png b/res/drawable-hdpi/list_multi_left_activated_holo.9.png Binary files differnew file mode 100644 index 00000000..c29bebbe --- /dev/null +++ b/res/drawable-hdpi/list_multi_left_activated_holo.9.png diff --git a/res/drawable-hdpi/list_multi_left_focused_holo.9.png b/res/drawable-hdpi/list_multi_left_focused_holo.9.png Binary files differnew file mode 100644 index 00000000..d69c7b07 --- /dev/null +++ b/res/drawable-hdpi/list_multi_left_focused_holo.9.png diff --git a/res/drawable-hdpi/list_multi_left_pressed_holo.9.png b/res/drawable-hdpi/list_multi_left_pressed_holo.9.png Binary files differnew file mode 100644 index 00000000..73155a0d --- /dev/null +++ b/res/drawable-hdpi/list_multi_left_pressed_holo.9.png diff --git a/res/drawable-hdpi/list_multi_left_primary_holo.9.png b/res/drawable-hdpi/list_multi_left_primary_holo.9.png Binary files differnew file mode 100644 index 00000000..ababa06a --- /dev/null +++ b/res/drawable-hdpi/list_multi_left_primary_holo.9.png diff --git a/res/drawable-hdpi/list_multi_left_secondary_holo.9.png b/res/drawable-hdpi/list_multi_left_secondary_holo.9.png Binary files differnew file mode 100644 index 00000000..1d9fadfe --- /dev/null +++ b/res/drawable-hdpi/list_multi_left_secondary_holo.9.png diff --git a/res/drawable-hdpi/list_pressed_holo.9.png b/res/drawable-hdpi/list_pressed_holo.9.png Binary files differnew file mode 100644 index 00000000..e72a8b86 --- /dev/null +++ b/res/drawable-hdpi/list_pressed_holo.9.png diff --git a/res/drawable-hdpi/list_primary_holo.9.png b/res/drawable-hdpi/list_primary_holo.9.png Binary files differnew file mode 100644 index 00000000..ecbdaa4d --- /dev/null +++ b/res/drawable-hdpi/list_primary_holo.9.png diff --git a/res/drawable-hdpi/list_secondary_holo.9.png b/res/drawable-hdpi/list_secondary_holo.9.png Binary files differnew file mode 100644 index 00000000..2aa33ec1 --- /dev/null +++ b/res/drawable-hdpi/list_secondary_holo.9.png diff --git a/res/drawable-hdpi/list_title_holo.9.png b/res/drawable-hdpi/list_title_holo.9.png Binary files differnew file mode 100644 index 00000000..df067be7 --- /dev/null +++ b/res/drawable-hdpi/list_title_holo.9.png diff --git a/res/drawable-hdpi/minical_bg_shadow_holo_light.9.png b/res/drawable-hdpi/minical_bg_shadow_holo_light.9.png Binary files differnew file mode 100644 index 00000000..fc1de235 --- /dev/null +++ b/res/drawable-hdpi/minical_bg_shadow_holo_light.9.png diff --git a/res/drawable-mdpi/list_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png Binary files differnew file mode 100644 index 00000000..05d097fa --- /dev/null +++ b/res/drawable-mdpi/list_focused_holo.9.png diff --git a/res/drawable-mdpi/list_multi_left_activated_holo.9.png b/res/drawable-mdpi/list_multi_left_activated_holo.9.png Binary files differnew file mode 100644 index 00000000..5aeefa48 --- /dev/null +++ b/res/drawable-mdpi/list_multi_left_activated_holo.9.png diff --git a/res/drawable-mdpi/list_multi_left_focused_holo.9.png b/res/drawable-mdpi/list_multi_left_focused_holo.9.png Binary files differnew file mode 100644 index 00000000..e322c7c8 --- /dev/null +++ b/res/drawable-mdpi/list_multi_left_focused_holo.9.png diff --git a/res/drawable-mdpi/list_multi_left_pressed_holo.9.png b/res/drawable-mdpi/list_multi_left_pressed_holo.9.png Binary files differnew file mode 100644 index 00000000..06265699 --- /dev/null +++ b/res/drawable-mdpi/list_multi_left_pressed_holo.9.png diff --git a/res/drawable-mdpi/list_multi_left_primary_holo.9.png b/res/drawable-mdpi/list_multi_left_primary_holo.9.png Binary files differnew file mode 100644 index 00000000..44d91f58 --- /dev/null +++ b/res/drawable-mdpi/list_multi_left_primary_holo.9.png diff --git a/res/drawable-mdpi/list_multi_left_secondary_holo.9.png b/res/drawable-mdpi/list_multi_left_secondary_holo.9.png Binary files differnew file mode 100644 index 00000000..a92f1e6d --- /dev/null +++ b/res/drawable-mdpi/list_multi_left_secondary_holo.9.png diff --git a/res/drawable-mdpi/list_pressed_holo.9.png b/res/drawable-mdpi/list_pressed_holo.9.png Binary files differnew file mode 100644 index 00000000..79d6d561 --- /dev/null +++ b/res/drawable-mdpi/list_pressed_holo.9.png diff --git a/res/drawable-mdpi/list_primary_holo.9.png b/res/drawable-mdpi/list_primary_holo.9.png Binary files differnew file mode 100644 index 00000000..38e9a45a --- /dev/null +++ b/res/drawable-mdpi/list_primary_holo.9.png diff --git a/res/drawable-mdpi/list_secondary_holo.9.png b/res/drawable-mdpi/list_secondary_holo.9.png Binary files differnew file mode 100644 index 00000000..29313f9d --- /dev/null +++ b/res/drawable-mdpi/list_secondary_holo.9.png diff --git a/res/drawable-mdpi/list_title_holo.9.png b/res/drawable-mdpi/list_title_holo.9.png Binary files differnew file mode 100644 index 00000000..fb71143c --- /dev/null +++ b/res/drawable-mdpi/list_title_holo.9.png diff --git a/res/drawable-mdpi/minical_bg_shadow_holo_light.9.png b/res/drawable-mdpi/minical_bg_shadow_holo_light.9.png Binary files differnew file mode 100644 index 00000000..7aae6040 --- /dev/null +++ b/res/drawable-mdpi/minical_bg_shadow_holo_light.9.png diff --git a/res/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png Binary files differnew file mode 100644 index 00000000..1e0c766f --- /dev/null +++ b/res/drawable-xhdpi/list_focused_holo.9.png diff --git a/res/drawable-xhdpi/list_multi_left_activated_holo.9.png b/res/drawable-xhdpi/list_multi_left_activated_holo.9.png Binary files differnew file mode 100644 index 00000000..cb97a149 --- /dev/null +++ b/res/drawable-xhdpi/list_multi_left_activated_holo.9.png diff --git a/res/drawable-xhdpi/list_multi_left_focused_holo.9.png b/res/drawable-xhdpi/list_multi_left_focused_holo.9.png Binary files differnew file mode 100644 index 00000000..84a3ea5f --- /dev/null +++ b/res/drawable-xhdpi/list_multi_left_focused_holo.9.png diff --git a/res/drawable-xhdpi/list_multi_left_pressed_holo.9.png b/res/drawable-xhdpi/list_multi_left_pressed_holo.9.png Binary files differnew file mode 100644 index 00000000..bacdf070 --- /dev/null +++ b/res/drawable-xhdpi/list_multi_left_pressed_holo.9.png diff --git a/res/drawable-xhdpi/list_multi_left_primary_holo.9.png b/res/drawable-xhdpi/list_multi_left_primary_holo.9.png Binary files differnew file mode 100644 index 00000000..add47586 --- /dev/null +++ b/res/drawable-xhdpi/list_multi_left_primary_holo.9.png diff --git a/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png b/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png Binary files differnew file mode 100644 index 00000000..6f676f43 --- /dev/null +++ b/res/drawable-xhdpi/list_multi_left_secondary_holo.9.png diff --git a/res/drawable-xhdpi/list_pressed_holo.9.png b/res/drawable-xhdpi/list_pressed_holo.9.png Binary files differnew file mode 100644 index 00000000..ab441a52 --- /dev/null +++ b/res/drawable-xhdpi/list_pressed_holo.9.png diff --git a/res/drawable-xhdpi/list_primary_holo.9.png b/res/drawable-xhdpi/list_primary_holo.9.png Binary files differnew file mode 100644 index 00000000..0f0e360e --- /dev/null +++ b/res/drawable-xhdpi/list_primary_holo.9.png diff --git a/res/drawable-xhdpi/list_secondary_holo.9.png b/res/drawable-xhdpi/list_secondary_holo.9.png Binary files differnew file mode 100644 index 00000000..e4ad123a --- /dev/null +++ b/res/drawable-xhdpi/list_secondary_holo.9.png diff --git a/res/drawable-xhdpi/list_title_holo.9.png b/res/drawable-xhdpi/list_title_holo.9.png Binary files differnew file mode 100644 index 00000000..48808bf2 --- /dev/null +++ b/res/drawable-xhdpi/list_title_holo.9.png diff --git a/res/drawable-xhdpi/minical_bg_shadow_holo_light.9.png b/res/drawable-xhdpi/minical_bg_shadow_holo_light.9.png Binary files differnew file mode 100644 index 00000000..3e963d5d --- /dev/null +++ b/res/drawable-xhdpi/minical_bg_shadow_holo_light.9.png diff --git a/res/drawable-xlarge/agenda_item_bg_primary.xml b/res/drawable-xlarge/agenda_item_bg_primary.xml new file mode 100644 index 00000000..2e283bf5 --- /dev/null +++ b/res/drawable-xlarge/agenda_item_bg_primary.xml @@ -0,0 +1,28 @@ +<?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" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + <item + android:state_focused="false" + android:state_pressed="false" + android:drawable="@drawable/list_multi_left_primary_holo" /> + <item + android:state_focused="true" + android:drawable="@drawable/list_multi_left_focused_holo" /> + <item + android:drawable="@drawable/list_multi_left_pressed_holo" /> +</selector> diff --git a/res/drawable-xlarge/agenda_item_bg_secondary.xml b/res/drawable-xlarge/agenda_item_bg_secondary.xml new file mode 100644 index 00000000..b5ecdb34 --- /dev/null +++ b/res/drawable-xlarge/agenda_item_bg_secondary.xml @@ -0,0 +1,28 @@ +<?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" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + <item + android:state_focused="false" + android:state_pressed="false" + android:drawable="@drawable/list_multi_left_secondary_holo" /> + <item + android:state_focused="true" + android:drawable="@drawable/list_multi_left_focused_holo" /> + <item + android:drawable="@drawable/list_multi_left_pressed_holo" /> +</selector> diff --git a/res/drawable/agenda_item_bg_primary.xml b/res/drawable/agenda_item_bg_primary.xml new file mode 100644 index 00000000..71c59b0d --- /dev/null +++ b/res/drawable/agenda_item_bg_primary.xml @@ -0,0 +1,28 @@ +<?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" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + <item + android:state_focused="false" + android:state_pressed="false" + android:drawable="@drawable/list_primary_holo" /> + <item + android:drawable="@drawable/list_pressed_holo" /> + <item + android:state_focused="true" + android:drawable="@drawable/list_focused_holo" /> +</selector> diff --git a/res/drawable/agenda_item_bg_secondary.xml b/res/drawable/agenda_item_bg_secondary.xml new file mode 100644 index 00000000..80780205 --- /dev/null +++ b/res/drawable/agenda_item_bg_secondary.xml @@ -0,0 +1,28 @@ +<?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" + android:exitFadeDuration="@android:integer/config_mediumAnimTime"> + <item + android:state_focused="false" + android:state_pressed="false" + android:drawable="@drawable/list_secondary_holo" /> + <item + android:drawable="@drawable/list_pressed_holo" /> + <item + android:state_focused="true" + android:drawable="@drawable/list_focused_holo" /> +</selector> diff --git a/res/layout-xlarge-land/all_in_one.xml b/res/layout-xlarge-land/all_in_one.xml index 6722bb30..2caa4cfa 100644 --- a/res/layout-xlarge-land/all_in_one.xml +++ b/res/layout-xlarge-land/all_in_one.xml @@ -89,12 +89,8 @@ android:id="@+id/mini_month" android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_marginRight="15dip" - android:layout_marginLeft="15dip" - android:layout_marginTop="0dip" - android:layout_marginBottom="0dip" android:layout_height="263dip" - android:layout_width="250dip" /> + android:layout_width="280dip" /> <FrameLayout android:id="@+id/calendar_list" diff --git a/res/layout-xlarge/agenda_fragment.xml b/res/layout-xlarge/agenda_fragment.xml index ae0e04e7..85496cab 100644 --- a/res/layout-xlarge/agenda_fragment.xml +++ b/res/layout-xlarge/agenda_fragment.xml @@ -39,7 +39,7 @@ android:layout_height="match_parent" android:layout_width="0px" android:layout_weight=".60" - android:layout_marginRight="32dip" + android:layout_marginRight="16dip" android:background="@color/agenda_general_background_color" android:layout_marginTop="0dip"/> </LinearLayout> diff --git a/res/layout-xlarge/all_in_one.xml b/res/layout-xlarge/all_in_one.xml index fe533736..fd78ea3b 100644 --- a/res/layout-xlarge/all_in_one.xml +++ b/res/layout-xlarge/all_in_one.xml @@ -62,13 +62,9 @@ android:orientation="vertical" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_marginRight="16dip" - android:layout_marginLeft="16dip" - android:layout_marginTop="10dip" - android:layout_marginBottom="0dip" android:visibility="gone" android:layout_height="300dip" - android:layout_width="264dip" > + android:layout_width="296dip" > <FrameLayout android:id="@+id/mini_month" diff --git a/res/layout/month_by_week.xml b/res/layout/month_by_week.xml index 7ef3276c..6c963e31 100644 --- a/res/layout/month_by_week.xml +++ b/res/layout/month_by_week.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" android:paddingBottom="15dip" android:fillViewport="true" - android:background="@color/mini_month_bg_color"> + android:background="@drawable/minical_bg_shadow_holo_light"> <TextView android:id="@+id/month_name" android:layout_width="match_parent" diff --git a/res/mipmap-xhdpi/ic_launcher_calendar.png b/res/mipmap-xhdpi/ic_launcher_calendar.png Binary files differnew file mode 100644 index 00000000..cd856cb4 --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_calendar.png diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java index 043aed8c..acb6b7e0 100644 --- a/src/com/android/calendar/SearchActivity.java +++ b/src/com/android/calendar/SearchActivity.java @@ -66,7 +66,7 @@ public class SearchActivity extends Activity implements CalendarController.Event private CalendarController mController; - private EditEventFragment mEventInfoFragment; + private EventInfoFragment mEventInfoFragment; private long mCurrentEventId = -1; @@ -170,7 +170,9 @@ public class SearchActivity extends Activity implements CalendarController.Event FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction ft = fragmentManager.beginTransaction(); - mEventInfoFragment = new EditEventFragment(event, true, null); + mEventInfoFragment = new EventInfoFragment(this, event.id, + event.startTime.toMillis(false), event.endTime.toMillis(false), + (int) event.extraLong, false); ft.replace(R.id.agenda_event_info, mEventInfoFragment); ft.commit(); mController.registerEventHandler(R.id.agenda_event_info, mEventInfoFragment); diff --git a/src/com/android/calendar/agenda/AgendaByDayAdapter.java b/src/com/android/calendar/agenda/AgendaByDayAdapter.java index 69250b0d..c9cc6f2a 100644 --- a/src/com/android/calendar/agenda/AgendaByDayAdapter.java +++ b/src/com/android/calendar/agenda/AgendaByDayAdapter.java @@ -254,10 +254,10 @@ public class AgendaByDayAdapter extends BaseAdapter { // Set the background of the view, it is different if it is before today or not if (row.mDay >= mTodayJulianDay) { - agendaDayView.setBackgroundColor(mBackgroundColor); + agendaDayView.setBackgroundResource(R.drawable.agenda_item_bg_primary); holder.grayed = false; } else { - agendaDayView.setBackgroundColor(mPastBackgroundColor); + agendaDayView.setBackgroundResource(R.drawable.agenda_item_bg_secondary); holder.grayed = true; } return agendaDayView; @@ -275,16 +275,16 @@ public class AgendaByDayAdapter extends BaseAdapter { // if event in the past , un-bold the title and set the background if (row.mDay < mTodayJulianDay) { - itemView.setBackgroundColor(mPastBackgroundColor); + itemView.setBackgroundResource(R.drawable.agenda_item_bg_secondary); title.setTypeface(Typeface.DEFAULT); holder.grayed = true; } else if (row.mDay == mTodayJulianDay && !allDay && eventEndTime < System.currentTimeMillis()){ - itemView.setBackgroundColor(mPastBackgroundColor); + itemView.setBackgroundResource(R.drawable.agenda_item_bg_secondary); title.setTypeface(Typeface.DEFAULT); holder.grayed = true; } else { - itemView.setBackgroundColor(mBackgroundColor); + itemView.setBackgroundResource(R.drawable.agenda_item_bg_primary); title.setTypeface(Typeface.DEFAULT_BOLD); holder.grayed = false; } diff --git a/src/com/android/calendar/agenda/AgendaFragment.java b/src/com/android/calendar/agenda/AgendaFragment.java index da49bde7..8ab17ab1 100644 --- a/src/com/android/calendar/agenda/AgendaFragment.java +++ b/src/com/android/calendar/agenda/AgendaFragment.java @@ -131,6 +131,7 @@ public class AgendaFragment extends Fragment implements CalendarController.Event View v = inflater.inflate(R.layout.agenda_fragment, null); mAgendaListView = (AgendaListView)v.findViewById(R.id.agenda_events_list); + mAgendaListView.setClickable(true); mAgendaListView.goTo(mTime, -1, mQuery, true); if (savedInstanceState != null) { |
