diff options
| author | Michael Chan <mchan@android.com> | 2011-03-03 16:12:29 -0800 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2011-03-03 16:12:40 -0800 |
| commit | b9b34ea19f7b74f6d9dceccc19cc110d68291c74 (patch) | |
| tree | e2f8bccbbea8da2cd8feea50821cff2ec87f5ea7 | |
| parent | 6a63ba8178e4b5de41b78c65588fd9bb6e5fc24e (diff) | |
| download | android_packages_apps_Calendar-b9b34ea19f7b74f6d9dceccc19cc110d68291c74.tar.gz android_packages_apps_Calendar-b9b34ea19f7b74f6d9dceccc19cc110d68291c74.tar.bz2 android_packages_apps_Calendar-b9b34ea19f7b74f6d9dceccc19cc110d68291c74.zip | |
Clean up
Change-Id: I90d04b6a44642cca4e7065f3d0ed7cd2a5b70b1d
40 files changed, 69 insertions, 144 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f2fd0245..5c2a3b26 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -153,7 +153,7 @@ <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" /> </receiver> - <service android:name=".widget.CalendarAppWidgetService" + <service android:name=".widget.CalendarAppWidgetService" android:permission="android.permission.BIND_REMOTEVIEWS" android:exported="false"/> diff --git a/res/anim/slide_left_in.xml b/res/anim/slide_left_in.xml index c72fd87b..f04d3704 100644 --- a/res/anim/slide_left_in.xml +++ b/res/anim/slide_left_in.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/anim/slide_left_out.xml b/res/anim/slide_left_out.xml index e4308ec0..c5da1e60 100644 --- a/res/anim/slide_left_out.xml +++ b/res/anim/slide_left_out.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/anim/slide_right_in.xml b/res/anim/slide_right_in.xml index f2f97fcd..75d4e6aa 100644 --- a/res/anim/slide_right_in.xml +++ b/res/anim/slide_right_in.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/anim/slide_right_out.xml b/res/anim/slide_right_out.xml index 1807f107..a918d666 100644 --- a/res/anim/slide_right_out.xml +++ b/res/anim/slide_right_out.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/drawable/calendars_item.xml b/res/drawable/calendars_item.xml index 6520b528..272f8223 100644 --- a/res/drawable/calendars_item.xml +++ b/res/drawable/calendars_item.xml @@ -4,9 +4,9 @@ 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. @@ -14,9 +14,9 @@ limitations under the License. --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + <corners android:radius="6dip"/> <solid android:color="#00ffffff"/> </shape> diff --git a/res/layout-land/all_in_one.xml b/res/layout-land/all_in_one.xml index 77b124ff..f850656d 100644 --- a/res/layout-land/all_in_one.xml +++ b/res/layout-land/all_in_one.xml @@ -19,7 +19,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@null"> - <!-- This is a dummy view to make hiding/unhiding easier --> <View android:id="@+id/mini_month_container" @@ -46,7 +45,7 @@ android:gravity="right|bottom" style="@style/TextAppearance.Date_Range_Title" android:visibility="gone" /> - + <FrameLayout android:id="@+id/mini_month" diff --git a/res/layout/agenda_reminder_item.xml b/res/layout/agenda_reminder_item.xml index 48df7769..dadbc4b7 100644 --- a/res/layout/agenda_reminder_item.xml +++ b/res/layout/agenda_reminder_item.xml @@ -4,9 +4,9 @@ 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. @@ -18,7 +18,7 @@ android:orientation="horizontal" android:layout_height="wrap_content" android:layout_width="match_parent"> - + <ImageView android:id="@+id/reminder_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -27,7 +27,7 @@ android:focusable="false" android:clickable="false" /> - + <TextView android:id="@+id/reminder" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/alert_activity.xml b/res/layout/alert_activity.xml index 7e10c2e0..9b980a62 100644 --- a/res/layout/alert_activity.xml +++ b/res/layout/alert_activity.xml @@ -53,4 +53,4 @@ android:text="@string/dismiss_all_label" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/alert_item.xml b/res/layout/alert_item.xml index a5e1cdf0..79563f1d 100644 --- a/res/layout/alert_item.xml +++ b/res/layout/alert_item.xml @@ -81,4 +81,4 @@ android:ellipsize="end" android:maxLines="1" android:textSize="14sp" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/all_in_one.xml b/res/layout/all_in_one.xml index 43640b19..6ac84fad 100644 --- a/res/layout/all_in_one.xml +++ b/res/layout/all_in_one.xml @@ -49,7 +49,7 @@ android:visibility="gone" /> </LinearLayout> - + <FrameLayout android:id="@+id/calendar_list" android:layout_alignParentBottom="true" diff --git a/res/layout/appwidget_loading.xml b/res/layout/appwidget_loading.xml index ead5a540..46763360 100644 --- a/res/layout/appwidget_loading.xml +++ b/res/layout/appwidget_loading.xml @@ -35,4 +35,4 @@ android:textColor="@color/appwidget_no_events" android:text="@string/loading" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/appwidget_no_events.xml b/res/layout/appwidget_no_events.xml index e7303a64..8996aae3 100644 --- a/res/layout/appwidget_no_events.xml +++ b/res/layout/appwidget_no_events.xml @@ -35,4 +35,4 @@ android:textColor="@color/appwidget_no_events" android:text="@string/gadget_no_events" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/bubble_event.xml b/res/layout/bubble_event.xml index 2f9b347f..30acc4e1 100644 --- a/res/layout/bubble_event.xml +++ b/res/layout/bubble_event.xml @@ -4,9 +4,9 @@ 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. @@ -22,7 +22,7 @@ android:paddingLeft="10dip" android:layout_width="wrap_content" android:layout_height="wrap_content"> - + <TextView android:id="@+id/event_title" android:textStyle="bold" android:textColor="@color/panel_text_foreground" diff --git a/res/layout/calendars_item.xml b/res/layout/calendars_item.xml index 3f0208f9..b04e4403 100644 --- a/res/layout/calendars_item.xml +++ b/res/layout/calendars_item.xml @@ -4,9 +4,9 @@ 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. @@ -20,10 +20,10 @@ android:layout_width="match_parent"> <ImageView android:id="@+id/right_arrow" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/calendars_item"/> - + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/calendars_item"/> + <TextView android:id="@+id/calendar_name" style="?android:attr/spinnerItemStyle" android:layout_width="wrap_content" diff --git a/res/layout/edit_event_1.xml b/res/layout/edit_event_1.xml index 8f90a25c..ceb2a5d0 100644 --- a/res/layout/edit_event_1.xml +++ b/res/layout/edit_event_1.xml @@ -209,7 +209,7 @@ <CheckBox android:id="@+id/is_all_day" android:layout_height="match_parent" - android:layout_gravity="center_vertical" + android:layout_gravity="center_vertical" android:gravity="center_vertical" /> </TableRow> @@ -306,4 +306,4 @@ style="@style/TextAppearance.EditEvent_Value" android:prompt="@string/privacy_label" /> </TableRow> -</TableLayout>
\ No newline at end of file +</TableLayout> diff --git a/res/layout/edit_event_2.xml b/res/layout/edit_event_2.xml index a6c27d0f..2264578d 100644 --- a/res/layout/edit_event_2.xml +++ b/res/layout/edit_event_2.xml @@ -118,4 +118,4 @@ android:animateLayoutChanges="true"> </com.android.calendar.event.AttendeesView> </TableRow> -</TableLayout>
\ No newline at end of file +</TableLayout> diff --git a/res/layout/edit_event_fragment.xml b/res/layout/edit_event_fragment.xml index 30d1f4d2..6e2ba706 100644 --- a/res/layout/edit_event_fragment.xml +++ b/res/layout/edit_event_fragment.xml @@ -18,4 +18,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/edit_event"> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/res/layout/edit_reminder_item.xml b/res/layout/edit_reminder_item.xml index e79765eb..e6569a7f 100644 --- a/res/layout/edit_reminder_item.xml +++ b/res/layout/edit_reminder_item.xml @@ -4,9 +4,9 @@ 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. @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:paddingTop="1dip" android:layout_height="wrap_content"> - + <Spinner android:id="@+id/reminder_value" style="@style/TextAppearance.EditEvent_Value" android:layout_width="0dip" diff --git a/res/layout/email_autocomplete_item_loading.xml b/res/layout/email_autocomplete_item_loading.xml index 7a56d405..832b2dff 100644 --- a/res/layout/email_autocomplete_item_loading.xml +++ b/res/layout/email_autocomplete_item_loading.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/layout/event_info.xml b/res/layout/event_info.xml index 73bf1fa9..56ae58f7 100644 --- a/res/layout/event_info.xml +++ b/res/layout/event_info.xml @@ -204,4 +204,4 @@ style="?android:attr/buttonBarButtonStyle" android:text="@string/delete_label" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/full_month_by_week.xml b/res/layout/full_month_by_week.xml index 125d05fe..0071c368 100644 --- a/res/layout/full_month_by_week.xml +++ b/res/layout/full_month_by_week.xml @@ -2,16 +2,16 @@ <!-- /* Copyright 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 +** 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 +** 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 +** 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. */ --> diff --git a/res/layout/ics_import_activity.xml b/res/layout/ics_import_activity.xml index 1797d341..157d901c 100644 --- a/res/layout/ics_import_activity.xml +++ b/res/layout/ics_import_activity.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/layout/month_by_week.xml b/res/layout/month_by_week.xml index 7e79c86e..721ae7c6 100644 --- a/res/layout/month_by_week.xml +++ b/res/layout/month_by_week.xml @@ -2,16 +2,16 @@ <!-- /* Copyright 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 +** 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 +** 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 +** 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. */ --> @@ -34,5 +34,5 @@ <include android:id="@+id/day_names" layout="@layout/mini_month_header" /> <include android:id="@+id/week_list" layout="@android:layout/list_content"/> - + </LinearLayout> diff --git a/res/layout/timezone_footer.xml b/res/layout/timezone_footer.xml index 26dd94e5..9ac1a6f0 100644 --- a/res/layout/timezone_footer.xml +++ b/res/layout/timezone_footer.xml @@ -24,4 +24,4 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:paddingLeft="10dip" android:paddingRight="10dip" - style="?android:attr/textAppearanceMedium" />
\ No newline at end of file + style="?android:attr/textAppearanceMedium" /> diff --git a/res/values-ja/donottranslate.xml b/res/values-ja/donottranslate.xml index 6988a55e..1c5005be 100644 --- a/res/values-ja/donottranslate.xml +++ b/res/values-ja/donottranslate.xml @@ -4,9 +4,9 @@ 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. diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 99c97c92..8ac46dd6 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,4 +18,4 @@ <!-- MultiStateButton doesn't define any special attributes --> <declare-styleable name="com.android.calendar.MultiStateButton"> </declare-styleable> -</resources>
\ No newline at end of file +</resources> diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml index 814dae10..06190528 100644 --- a/res/xml/searchable.xml +++ b/res/xml/searchable.xml @@ -18,4 +18,4 @@ android:label="@string/app_label" android:searchSuggestAuthority="com.android.calendar.CalendarRecentSuggestionsProvider" android:searchSuggestSelection=" ?" > -</searchable>
\ No newline at end of file +</searchable> diff --git a/src/com/android/calendar/DayFragment.java b/src/com/android/calendar/DayFragment.java index 741beca6..ea2f4d49 100644 --- a/src/com/android/calendar/DayFragment.java +++ b/src/com/android/calendar/DayFragment.java @@ -20,12 +20,8 @@ import com.android.calendar.CalendarController.EventInfo; import com.android.calendar.CalendarController.EventType; import android.app.Fragment; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.database.ContentObserver; import android.os.Bundle; -import android.os.Handler; import android.text.format.Time; import android.view.LayoutInflater; import android.view.View; @@ -72,36 +68,6 @@ public class DayFragment extends Fragment implements CalendarController.EventHan } }; - /** - * Listens for intent broadcasts - */ - private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - String action = intent.getAction(); - if (action.equals(Intent.ACTION_TIME_CHANGED) - || action.equals(Intent.ACTION_DATE_CHANGED) - || action.equals(Intent.ACTION_TIMEZONE_CHANGED)) { - eventsChanged(); - } - } - }; - - // Create an observer so that we can update the views whenever a - // Calendar event changes. - private ContentObserver mObserver = new ContentObserver(new Handler()) - { - @Override - public boolean deliverSelfNotifications() { - return true; - } - - @Override - public void onChange(boolean selfChange) { - eventsChanged(); - } - }; - private int mNumDays; public DayFragment() { diff --git a/src/com/android/calendar/Event.java b/src/com/android/calendar/Event.java index 5d5f6afa..541080ed 100644 --- a/src/com/android/calendar/Event.java +++ b/src/com/android/calendar/Event.java @@ -223,7 +223,6 @@ public class Event implements Cloneable { events.clear(); try { Time local = new Time(); - int count; local.set(start); int startDay = Time.getJulianDay(start, local.gmtoff); diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java index 05a464e3..859dfcf8 100644 --- a/src/com/android/calendar/EventInfoFragment.java +++ b/src/com/android/calendar/EventInfoFragment.java @@ -704,7 +704,6 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange ops.add(ContentProviderOperation.newInsert(Events.CONTENT_URI).withValues(values).build()); if (mHasAttendeeData) { - ContentProviderOperation.Builder b; // Insert the new attendees for (Attendee attendee : mAcceptedAttendees) { addAttendee( @@ -809,16 +808,10 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange String location = mEventCursor.getString(EVENT_INDEX_EVENT_LOCATION); String description = mEventCursor.getString(EVENT_INDEX_DESCRIPTION); String rRule = mEventCursor.getString(EVENT_INDEX_RRULE); - String eventTimezone = mEventCursor.getString(EVENT_INDEX_EVENT_TIMEZONE); mColor = mEventCursor.getInt(EVENT_INDEX_COLOR) & 0xbbffffff; view.findViewById(R.id.color).setBackgroundColor(mColor); - TextView title = mTitle; - -// View divider = view.findViewById(R.id.divider); -// divider.getBackground().setColorFilter(mColor, PorterDuff.Mode.SRC_IN); - // What if (eventName != null) { setTextCommon(view, R.id.title, eventName); diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java index d224e45e..1e991db4 100644 --- a/src/com/android/calendar/SearchActivity.java +++ b/src/com/android/calendar/SearchActivity.java @@ -72,7 +72,7 @@ public class SearchActivity extends Activity private EditEventFragment mEventInfoFragment; private long mCurrentEventId = -1; - + private String mQuery; private DeleteEventHelper mDeleteEventHelper; diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java index ea944c46..69c5441e 100644 --- a/src/com/android/calendar/Utils.java +++ b/src/com/android/calendar/Utils.java @@ -61,15 +61,8 @@ public class Utils { // exiting is identical to reverting public static final int DONE_EXIT = 1 << 0; - private static final int CLEAR_ALPHA_MASK = 0x00FFFFFF; - private static final int HIGH_ALPHA = 255 << 24; - private static final int MED_ALPHA = 180 << 24; - private static final int LOW_ALPHA = 150 << 24; - protected static final String OPEN_EMAIL_MARKER = " <"; protected static final String CLOSE_EMAIL_MARKER = ">"; - /* The corner should be rounded on the top right and bottom right */ - private static final float[] CORNERS = new float[] { 0, 0, 5, 5, 5, 5, 0, 0 }; public static final String INTENT_KEY_DETAIL_VIEW = "DETAIL_VIEW"; public static final String INTENT_KEY_VIEW_TYPE = "VIEW"; diff --git a/src/com/android/calendar/alerts/DismissAllAlarmsService.java b/src/com/android/calendar/alerts/DismissAllAlarmsService.java index d4051e5f..f04989fb 100644 --- a/src/com/android/calendar/alerts/DismissAllAlarmsService.java +++ b/src/com/android/calendar/alerts/DismissAllAlarmsService.java @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java index 2317b8c6..d6e66e98 100644 --- a/src/com/android/calendar/event/EditEventHelper.java +++ b/src/com/android/calendar/event/EditEventHelper.java @@ -639,7 +639,6 @@ public class EditEventHelper { // then we leave the DTSTART field alone. if (modifyWhich == MODIFY_ALL) { long oldStartMillis = originalModel.mStart; - long oldStartMillis2 = oldStartMillis; if (oldBegin != newBegin) { // The user changed the start time of this event long offset = newBegin - oldBegin; diff --git a/src/com/android/calendar/month/MonthByWeekFragment.java b/src/com/android/calendar/month/MonthByWeekFragment.java index ecc5ca8a..d68bf0c0 100644 --- a/src/com/android/calendar/month/MonthByWeekFragment.java +++ b/src/com/android/calendar/month/MonthByWeekFragment.java @@ -32,7 +32,6 @@ import android.content.Loader; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.os.Handler; import android.provider.Calendar.Attendees; import android.provider.Calendar.Calendars; import android.provider.Calendar.Instances; @@ -49,7 +48,6 @@ import android.view.ViewConfiguration; import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.AbsListView.OnScrollListener; -import android.widget.Adapter; import java.util.ArrayList; import java.util.Calendar; diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java b/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java index ce496eba..de3bb158 100644 --- a/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java +++ b/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java @@ -42,7 +42,6 @@ public class SelectCalendarsFragment extends Fragment implements AdapterView.OnItemClickListener, CalendarController.EventHandler { private static final String TAG = "Calendar"; - private static final String EXPANDED_KEY = "is_expanded"; private static final String IS_PRIMARY = "\"primary\""; private static final String SELECTION = Calendars.SYNC_EVENTS + "=?"; private static final String[] SELECTION_ARGS = new String[] {"1"}; @@ -68,13 +67,10 @@ public class SelectCalendarsFragment extends Fragment private static int mQueryToken; private View mView = null; - private Cursor mCursor = null; private ListView mList; private SelectCalendarsSimpleAdapter mAdapter; private Activity mContext; private AsyncQueryService mService; - private Object[] mTempRow = new Object[PROJECTION.length]; - private boolean mIsPaused = true; @Override public void onAttach(Activity activity) { @@ -83,7 +79,6 @@ public class SelectCalendarsFragment extends Fragment mService = new AsyncQueryService(activity) { @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - mCursor = cursor; mAdapter.changeCursor(cursor); } }; @@ -98,7 +93,6 @@ public class SelectCalendarsFragment extends Fragment public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - Activity activity = getActivity(); mView = inflater.inflate(R.layout.select_calendars_fragment, null); mList = (ListView)mView.findViewById(R.id.list); mList.setDivider(null); @@ -127,13 +121,6 @@ public class SelectCalendarsFragment extends Fragment mQueryToken = mService.getNextToken(); mService.startQuery(mQueryToken, null, Calendars.CONTENT_URI, PROJECTION, SELECTION, SELECTION_ARGS, Calendars._SYNC_ACCOUNT); - mIsPaused = false; - } - - @Override - public void onPause() { - mIsPaused = true; - super.onPause(); } /* diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java index 34efbef5..82654b57 100644 --- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java +++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java @@ -38,7 +38,6 @@ import java.util.HashMap; public class SelectCalendarsSyncAdapter extends BaseAdapter implements ListAdapter, CompoundButton.OnCheckedChangeListener { private static final String TAG = "SelCalsAdapter"; - private static final int SELECTED_BOX_BORDER = 4; private static int COLOR_CHIP_SIZE = 30; private RectShape r = new RectShape(); @@ -46,7 +45,6 @@ public class SelectCalendarsSyncAdapter extends BaseAdapter private static final int LAYOUT = R.layout.calendar_sync_item; private CalendarRow[] mData; private HashMap<Long, CalendarRow> mChanges = new HashMap<Long, CalendarRow>(); - private Cursor mCursor; private int mRowCount = 0; private int mIdColumn; @@ -78,13 +76,11 @@ public class SelectCalendarsSyncAdapter extends BaseAdapter private void initData(Cursor c) { if (c == null) { - mCursor = c; mRowCount = 0; mData = null; return; } - mCursor = c; mIdColumn = c.getColumnIndexOrThrow(Calendars._ID); mNameColumn = c.getColumnIndexOrThrow(Calendars.DISPLAY_NAME); mColorColumn = c.getColumnIndexOrThrow(Calendars.COLOR); diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java index 30c65860..71f3ac12 100644 --- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java +++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java @@ -71,9 +71,6 @@ public class SelectCalendarsSyncFragment extends ListFragment private static final int COLUMN_SELECTED = 5; private static final int COLUMN_SYNC_EVENTS = 6; - private static int mUpdateToken; - private static int mQueryToken; - private TextView mSyncStatus; private Button mAccountsButton; private Account mAccount; diff --git a/tests/src/com/android/calendar/CalendarLaunchPerformance.java b/tests/src/com/android/calendar/CalendarLaunchPerformance.java index ef032f75..a089d86d 100644 --- a/tests/src/com/android/calendar/CalendarLaunchPerformance.java +++ b/tests/src/com/android/calendar/CalendarLaunchPerformance.java @@ -20,13 +20,11 @@ import android.app.Activity; import android.test.LaunchPerformanceBase; import android.os.Bundle; -import java.util.Map; - /** * Instrumentation class for Browser launch performance testing. */ public class CalendarLaunchPerformance extends LaunchPerformanceBase { - + public static final String LOG_TAG = "CalendarLaunchPerformance"; public CalendarLaunchPerformance() { |