Merge "Rename "transparency" to "availability" Rename "visibility" to "accessLevel""

5 files changed, 38 insertions, 38 deletions

diff --git a/src/com/android/calendar/CalendarEventModel.java b/src/com/android/calendar/CalendarEventModel.java
index d196dc45..44814e45 100644
--- a/src/com/android/calendar/CalendarEventModel.java
+++ b/src/com/android/calendar/CalendarEventModel.java
@@ -214,7 +214,7 @@ public class CalendarEventModel implements Serializable {
     public String mTimezone2 = null;
     public boolean mAllDay = false;
     public boolean mHasAlarm = false;
-    public boolean mTransparency = false;
+    public boolean mAvailability = false;
 
     // PROVIDER_NOTES How does an event not have attendee data? The owner is added
     // as an attendee by default.
@@ -235,7 +235,7 @@ public class CalendarEventModel implements Serializable {
     // updated with an event cursor.
     public boolean mModelUpdatedWithEventCursor;
 
-    public int mVisibility = 0;
+    public int mAccessLevel = 0;
     public ArrayList<ReminderEntry> mReminders;
     public ArrayList<ReminderEntry> mDefaultReminders;
 
@@ -289,14 +289,14 @@ public class CalendarEventModel implements Serializable {
             mDescription = description;
         }
 
-        int transparency = intent.getIntExtra(Events.AVAILABILITY, -1);
-        if (transparency != -1) {
-            mTransparency = transparency != 0;
+        int availability = intent.getIntExtra(Events.AVAILABILITY, -1);
+        if (availability != -1) {
+            mAvailability = availability != 0;
         }
 
-        int visibility = intent.getIntExtra(Events.ACCESS_LEVEL, -1);
-        if (visibility != -1) {
-            mVisibility = visibility;
+        int accessLevel = intent.getIntExtra(Events.ACCESS_LEVEL, -1);
+        if (accessLevel != -1) {
+            mAccessLevel = accessLevel;
         }
 
         String rrule = intent.getStringExtra(Events.RRULE);
@@ -383,7 +383,7 @@ public class CalendarEventModel implements Serializable {
         mGuestsCanModify = false;
         mGuestsCanInviteOthers = false;
         mGuestsCanSeeGuests = false;
-        mVisibility = 0;
+        mAccessLevel = 0;
         mOrganizerCanRespond = false;
         mCalendarAccessLevel = Calendars.CONTRIBUTOR_ACCESS;
         mModelUpdatedWithEventCursor = false;
@@ -453,9 +453,9 @@ public class CalendarEventModel implements Serializable {
         result = prime * result + ((mTimezone == null) ? 0 : mTimezone.hashCode());
         result = prime * result + ((mTimezone2 == null) ? 0 : mTimezone2.hashCode());
         result = prime * result + ((mTitle == null) ? 0 : mTitle.hashCode());
-        result = prime * result + (mTransparency ? 1231 : 1237);
+        result = prime * result + (mAvailability ? 1231 : 1237);
         result = prime * result + ((mUri == null) ? 0 : mUri.hashCode());
-        result = prime * result + mVisibility;
+        result = prime * result + mAccessLevel;
         return result;
     }
 
@@ -723,7 +723,7 @@ public class CalendarEventModel implements Serializable {
             return false;
         }
 
-        if (mTransparency != originalModel.mTransparency) {
+        if (mAvailability != originalModel.mAvailability) {
             return false;
         }
 
@@ -735,7 +735,7 @@ public class CalendarEventModel implements Serializable {
             return false;
         }
 
-        if (mVisibility != originalModel.mVisibility) {
+        if (mAccessLevel != originalModel.mAccessLevel) {
             return false;
         }
         return true;
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index 5b7a67d8..ae453e2c 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -3978,7 +3978,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
     private static int getEventAccessLevel(Context context, Event e) {
         ContentResolver cr = context.getContentResolver();
 
-        int visibility = Calendars.NO_ACCESS;
+        int accessLevel = Calendars.NO_ACCESS;
 
         // Get the calendar id for this event
         Cursor cursor = cr.query(ContentUris.withAppendedId(Events.CONTENT_URI, e.id),
@@ -4007,12 +4007,12 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         String calendarOwnerAccount = null;
         if (cursor != null) {
             cursor.moveToFirst();
-            visibility = cursor.getInt(CALENDARS_INDEX_ACCESS_LEVEL);
+            accessLevel = cursor.getInt(CALENDARS_INDEX_ACCESS_LEVEL);
             calendarOwnerAccount = cursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
             cursor.close();
         }
 
-        if (visibility < Calendars.CONTRIBUTOR_ACCESS) {
+        if (accessLevel < Calendars.CONTRIBUTOR_ACCESS) {
             return ACCESS_LEVEL_NONE;
         }
 
diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java
index fb7364ea..db3ed59c 100644
--- a/src/com/android/calendar/event/EditEventHelper.java
+++ b/src/com/android/calendar/event/EditEventHelper.java
@@ -93,8 +93,8 @@ public class EditEventHelper {
     protected static final int EVENT_INDEX_TIMEZONE = 10;
     protected static final int EVENT_INDEX_RRULE = 11;
     protected static final int EVENT_INDEX_SYNC_ID = 12;
-    protected static final int EVENT_INDEX_TRANSPARENCY = 13;
-    protected static final int EVENT_INDEX_VISIBILITY = 14;
+    protected static final int EVENT_INDEX_AVAILABILITY = 13;
+    protected static final int EVENT_INDEX_ACCESS_LEVEL = 14;
     protected static final int EVENT_INDEX_OWNER_ACCOUNT = 15;
     protected static final int EVENT_INDEX_HAS_ATTENDEE_DATA = 16;
     protected static final int EVENT_INDEX_ORIGINAL_EVENT = 17;
@@ -987,8 +987,8 @@ public class EditEventHelper {
         String rRule = cursor.getString(EVENT_INDEX_RRULE);
         model.mRrule = rRule;
         model.mSyncId = cursor.getString(EVENT_INDEX_SYNC_ID);
-        model.mTransparency = cursor.getInt(EVENT_INDEX_TRANSPARENCY) != 0;
-        int visibility = cursor.getInt(EVENT_INDEX_VISIBILITY);
+        model.mAvailability = cursor.getInt(EVENT_INDEX_AVAILABILITY) != 0;
+        int accessLevel = cursor.getInt(EVENT_INDEX_ACCESS_LEVEL);
         model.mOwnerAccount = cursor.getString(EVENT_INDEX_OWNER_ACCOUNT);
         model.mHasAttendeeData = cursor.getInt(EVENT_INDEX_HAS_ATTENDEE_DATA) != 0;
         model.mOriginalEvent = cursor.getString(EVENT_INDEX_ORIGINAL_EVENT);
@@ -996,13 +996,13 @@ public class EditEventHelper {
         model.mIsOrganizer = model.mOwnerAccount.equalsIgnoreCase(model.mOrganizer);
         model.mGuestsCanModify = cursor.getInt(EVENT_INDEX_GUESTS_CAN_MODIFY) != 0;
 
-        if (visibility > 0) {
+        if (accessLevel > 0) {
             // For now the array contains the values 0, 2, and 3. We subtract
             // one to make it easier to handle in code as 0,1,2.
             // Default (0), Private (1), Public (2)
-            visibility--;
+            accessLevel--;
         }
-        model.mVisibility = visibility;
+        model.mAccessLevel = accessLevel;
 
         boolean hasRRule = !TextUtils.isEmpty(rRule);
 
@@ -1184,16 +1184,16 @@ public class EditEventHelper {
         } else {
             values.put(Events.EVENT_LOCATION, (String) null);
         }
-        values.put(Events.AVAILABILITY, model.mTransparency ? 1 : 0);
+        values.put(Events.AVAILABILITY, model.mAvailability ? 1 : 0);
         values.put(Events.HAS_ATTENDEE_DATA, model.mHasAttendeeData ? 1 : 0);
 
-        int visibility = model.mVisibility;
-        if (visibility > 0) {
+        int accessLevel = model.mAccessLevel;
+        if (accessLevel > 0) {
             // For now the array contains the values 0, 2, and 3. We add one to match.
             // Default (0), Private (2), Public (3)
-            visibility++;
+            accessLevel++;
         }
-        values.put(Events.ACCESS_LEVEL, visibility);
+        values.put(Events.ACCESS_LEVEL, accessLevel);
 
         return values;
     }
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index c053bbd5..daea4e4f 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -113,8 +113,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
     CheckBox mAllDayCheckBox;
     Spinner mCalendarsSpinner;
     Spinner mRepeatsSpinner;
-    Spinner mTransparencySpinner;
-    Spinner mVisibilitySpinner;
+    Spinner mAvailabilitySpinner;
+    Spinner mAccessLevelSpinner;
     RadioGroup mResponseRadioGroup;
     TextView mTitleTextView;
     TextView mLocationTextView;
@@ -772,8 +772,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
             mModel.mEnd = mEndTime.toMillis(true);
         }
         mModel.mTimezone = mTimezone;
-        mModel.mVisibility = mVisibilitySpinner.getSelectedItemPosition();
-        mModel.mTransparency = mTransparencySpinner.getSelectedItemPosition() != 0;
+        mModel.mAccessLevel = mAccessLevelSpinner.getSelectedItemPosition();
+        mModel.mAvailability = mAvailabilitySpinner.getSelectedItemPosition() != 0;
 
         int selection;
         // If we're making an exception we don't want it to be a repeating
@@ -824,8 +824,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
         mEndDateHome = (TextView) view.findViewById(R.id.end_date_home_tz);
         mAllDayCheckBox = (CheckBox) view.findViewById(R.id.is_all_day);
         mRepeatsSpinner = (Spinner) view.findViewById(R.id.repeats);
-        mTransparencySpinner = (Spinner) view.findViewById(R.id.availability);
-        mVisibilitySpinner = (Spinner) view.findViewById(R.id.visibility);
+        mAvailabilitySpinner = (Spinner) view.findViewById(R.id.availability);
+        mAccessLevelSpinner = (Spinner) view.findViewById(R.id.visibility);
         mCalendarSelectorGroup = view.findViewById(R.id.calendar_selector_group);
         mCalendarStaticGroup = view.findViewById(R.id.calendar_group);
         mRemindersGroup = view.findViewById(R.id.reminders_row);
@@ -1082,8 +1082,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
         }
         mLocationTextView.setText(model.mLocation);
         mDescriptionTextView.setText(model.mDescription);
-        mTransparencySpinner.setSelection(model.mTransparency ? 1 : 0);
-        mVisibilitySpinner.setSelection(model.mVisibility);
+        mAvailabilitySpinner.setSelection(model.mAvailability ? 1 : 0);
+        mAccessLevelSpinner.setSelection(model.mAccessLevel);
 
         View responseLabel = mView.findViewById(R.id.response_label);
         if (canRespond) {
diff --git a/tests/src/com/android/calendar/event/EditEventHelperTest.java b/tests/src/com/android/calendar/event/EditEventHelperTest.java
index acfce039..3336768d 100644
--- a/tests/src/com/android/calendar/event/EditEventHelperTest.java
+++ b/tests/src/com/android/calendar/event/EditEventHelperTest.java
@@ -1479,8 +1479,8 @@ public class EditEventHelperTest extends AndroidTestCase {
         model.mTimezone = "UTC";
         model.mRrule = "FREQ=DAILY;WKST=SU";
         model.mSyncId = "unique per calendar stuff";
-        model.mTransparency = false;
-        model.mVisibility = 2; // This is one less than the values written if >0
+        model.mAvailability = false;
+        model.mAccessLevel = 2; // This is one less than the values written if >0
         model.mOwnerAccount = "steve@gmail.com";
         model.mHasAttendeeData = true;