Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
packages_apps_Calendar
Commits
00b8c1a3
Commit
00b8c1a3
authored
14 years ago
by
Mason Tang
Browse files
Options
Download
Email Patches
Plain Diff
Moved agenda-related classes into an agenda package
Change-Id: If834a652490938b4a31bfd5f6fa4e1aea2a6ffa7
parent
1d564f63
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
38 additions
and
31 deletions
+38
-31
res/layout/agenda_item.xml
res/layout/agenda_item.xml
+2
-2
src/com/android/calendar/AllInOneActivity.java
src/com/android/calendar/AllInOneActivity.java
+1
-0
src/com/android/calendar/CalendarController.java
src/com/android/calendar/CalendarController.java
+9
-9
src/com/android/calendar/SearchActivity.java
src/com/android/calendar/SearchActivity.java
+1
-0
src/com/android/calendar/agenda/AgendaAdapter.java
src/com/android/calendar/agenda/AgendaAdapter.java
+3
-1
src/com/android/calendar/agenda/AgendaByDayAdapter.java
src/com/android/calendar/agenda/AgendaByDayAdapter.java
+3
-2
src/com/android/calendar/agenda/AgendaFragment.java
src/com/android/calendar/agenda/AgendaFragment.java
+8
-11
src/com/android/calendar/agenda/AgendaItemView.java
src/com/android/calendar/agenda/AgendaItemView.java
+2
-2
src/com/android/calendar/agenda/AgendaListView.java
src/com/android/calendar/agenda/AgendaListView.java
+5
-3
src/com/android/calendar/agenda/AgendaWindowAdapter.java
src/com/android/calendar/agenda/AgendaWindowAdapter.java
+4
-1
No files found.
res/layout/agenda_item.xml
View file @
00b8c1a3
...
...
@@ -14,7 +14,7 @@
limitations under the License.
-->
<com.android.calendar.AgendaItemView
<com.android.calendar.
agenda.
AgendaItemView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@android:id/content"
android:layout_height=
"wrap_content"
...
...
@@ -57,4 +57,4 @@
android:textColor=
"?android:attr/textColorSecondary"
style=
"?android:attr/textAppearanceSmallInverse"
/>
</com.android.calendar.AgendaItemView>
</com.android.calendar.
agenda.
AgendaItemView>
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AllInOneActivity.java
View file @
00b8c1a3
...
...
@@ -20,6 +20,7 @@ import com.android.calendar.CalendarController.EventHandler;
import
com.android.calendar.CalendarController.EventInfo
;
import
com.android.calendar.CalendarController.EventType
;
import
com.android.calendar.CalendarController.ViewType
;
import
com.android.calendar.agenda.AgendaFragment
;
import
com.android.calendar.selectcalendars.SelectCalendarsFragment
;
import
android.app.ActionBar
;
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/CalendarController.java
View file @
00b8c1a3
...
...
@@ -103,15 +103,15 @@ public class CalendarController {
}
public
static
class
EventInfo
{
long
eventType
;
// one of the EventType
int
viewType
;
// one of the ViewType
long
id
;
// event id
Time
selectedTime
;
// the selected time in focus
Time
startTime
;
// start of a range of time.
Time
endTime
;
// end of a range of time.
int
x
;
// x coordinate in the activity space
int
y
;
// y coordinate in the activity space
String
query
;
// query for a user search
public
long
eventType
;
// one of the EventType
public
int
viewType
;
// one of the ViewType
public
long
id
;
// event id
public
Time
selectedTime
;
// the selected time in focus
public
Time
startTime
;
// start of a range of time.
public
Time
endTime
;
// end of a range of time.
public
int
x
;
// x coordinate in the activity space
public
int
y
;
// y coordinate in the activity space
public
String
query
;
// query for a user search
}
// FRAG_TODO remove unneeded api's
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/SearchActivity.java
View file @
00b8c1a3
...
...
@@ -21,6 +21,7 @@ import static android.provider.Calendar.EVENT_END_TIME;
import
com.android.calendar.CalendarController.EventInfo
;
import
com.android.calendar.CalendarController.EventType
;
import
com.android.calendar.CalendarController.ViewType
;
import
com.android.calendar.agenda.AgendaFragment
;
import
dalvik.system.VMRuntime
;
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AgendaAdapter.java
→
src/com/android/calendar/
agenda/
AgendaAdapter.java
View file @
00b8c1a3
...
...
@@ -14,7 +14,9 @@
* limitations under the License.
*/
package
com.android.calendar
;
package
com.android.calendar.agenda
;
import
com.android.calendar.R
;
import
android.content.Context
;
import
android.content.res.Resources
;
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AgendaByDayAdapter.java
→
src/com/android/calendar/
agenda/
AgendaByDayAdapter.java
View file @
00b8c1a3
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
com.android.calendar
;
package
com.android.calendar
.agenda
;
import
android.content.Context
;
import
android.database.Cursor
;
...
...
@@ -26,7 +26,8 @@ import android.view.ViewGroup;
import
android.widget.BaseAdapter
;
import
android.widget.TextView
;
import
com.android.calendar.AgendaWindowAdapter.DayAdapterInfo
;
import
com.android.calendar.agenda.AgendaWindowAdapter.DayAdapterInfo
;
import
com.android.calendar.R
;
import
java.util.ArrayList
;
import
java.util.Formatter
;
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AgendaFragment.java
→
src/com/android/calendar/
agenda/
AgendaFragment.java
View file @
00b8c1a3
...
...
@@ -14,28 +14,25 @@
* limitations under the License.
*/
package
com.android.calendar
;
import
com.android.calendar.CalendarController.EventInfo
;
import
com.android.calendar.CalendarController.EventType
;
import
dalvik.system.VMRuntime
;
package
com.android.calendar.agenda
;
import
android.app.Fragment
;
import
android.content.BroadcastReceiver
;
import
android.content.ContentResolver
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.database.ContentObserver
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.text.format.Time
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.android.calendar.CalendarController
;
import
com.android.calendar.CalendarController.EventInfo
;
import
com.android.calendar.CalendarController.EventType
;
import
com.android.calendar.CalendarPreferenceActivity
;
import
dalvik.system.VMRuntime
;
public
class
AgendaFragment
extends
Fragment
implements
CalendarController
.
EventHandler
{
private
static
final
String
TAG
=
AgendaFragment
.
class
.
getSimpleName
();
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AgendaItemView.java
→
src/com/android/calendar/
agenda/
AgendaItemView.java
View file @
00b8c1a3
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
com.android.calendar
;
package
com.android.calendar
.agenda
;
import
android.content.Context
;
import
android.graphics.Canvas
;
...
...
@@ -22,7 +22,7 @@ import android.graphics.Paint;
import
android.util.AttributeSet
;
import
android.widget.RelativeLayout
;
import
com.android.calendar.AgendaAdapter.ViewHolder
;
import
com.android.calendar.
agenda.
AgendaAdapter.ViewHolder
;
/**
* A custom layout for each item in the Agenda list view.
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AgendaListView.java
→
src/com/android/calendar/
agenda/
AgendaListView.java
View file @
00b8c1a3
...
...
@@ -14,11 +14,13 @@
* limitations under the License.
*/
package
com.android.calendar
;
package
com.android.calendar
.agenda
;
import
com.android.calendar.AgendaAdapter.ViewHolder
;
import
com.android.calendar.AgendaWindowAdapter.EventInfo
;
import
com.android.calendar.CalendarController
;
import
com.android.calendar.CalendarController.EventType
;
import
com.android.calendar.DeleteEventHelper
;
import
com.android.calendar.agenda.AgendaAdapter.ViewHolder
;
import
com.android.calendar.agenda.AgendaWindowAdapter.EventInfo
;
import
android.content.Context
;
import
android.graphics.Rect
;
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/AgendaWindowAdapter.java
→
src/com/android/calendar/
agenda/
AgendaWindowAdapter.java
View file @
00b8c1a3
...
...
@@ -14,7 +14,10 @@
* limitations under the License.
*/
package
com.android.calendar
;
package
com.android.calendar.agenda
;
import
com.android.calendar.R
;
import
com.android.calendar.Utils
;
import
android.content.AsyncQueryHandler
;
import
android.content.ContentResolver
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment