Merge "AOSP/Calendar - Update language to comply with Android's inclusive language guidance" am: 27e95b5dbftemp_sam_160260413

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1373918

Change-Id: Iaeca9b46eb05073fc497dc29926f04aaf485b396

3 files changed, 12 insertions, 12 deletions

diff --git a/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml b/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml
index 7f64a7b2..5e315825 100644
--- a/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml
+++ b/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml
@@ -55,7 +55,7 @@
             android:textSize="18sp" />
     </LinearLayout>
 
-    <!-- This is a dummy view to make hiding/unhiding easier -->
+    <!-- This is a nonessential view to make hiding/unhiding easier -->
     <View
         android:id="@+id/mini_month_container"
         android:layout_below="@id/date_group"
diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java
index b95c7c3d..0aa83d02 100644
--- a/src/com/android/calendar/EventInfoFragment.java
+++ b/src/com/android/calendar/EventInfoFragment.java
@@ -217,8 +217,8 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
 
     static {
         if (!Utils.isJellybeanOrLater()) {
-            EVENT_PROJECTION[EVENT_INDEX_CUSTOM_APP_PACKAGE] = Events._ID; // dummy value
-            EVENT_PROJECTION[EVENT_INDEX_CUSTOM_APP_URI] = Events._ID; // dummy value
+            EVENT_PROJECTION[EVENT_INDEX_CUSTOM_APP_PACKAGE] = Events._ID; // nonessential value
+            EVENT_PROJECTION[EVENT_INDEX_CUSTOM_APP_URI] = Events._ID; // nonessential value
         }
     }
 
diff --git a/src/com/android/calendar/StickyHeaderListView.java b/src/com/android/calendar/StickyHeaderListView.java
index 25955a05..981e7af7 100644
--- a/src/com/android/calendar/StickyHeaderListView.java
+++ b/src/com/android/calendar/StickyHeaderListView.java
@@ -58,7 +58,7 @@ public class StickyHeaderListView extends FrameLayout implements OnScrollListene
     protected HeaderIndexer mIndexer = null;
     protected HeaderHeightListener mHeaderHeightListener = null;
     protected View mStickyHeader = null;
-    protected View mDummyHeader = null; // A invisible header used when a section has no header
+    protected View mNonessentialHeader = null; // A invisible header used when a section has no header
     protected ListView mListView = null;
     protected ListView.OnScrollListener mListener = null;
 
@@ -269,11 +269,11 @@ public class StickyHeaderListView extends FrameLayout implements OnScrollListene
             boolean newView = false;
             if (sectionPos != mCurrentSectionPos) {
 
-                // No header for current position , use the dummy invisible one, hide the separator
+                // No header for current position , use the nonessential invisible one, hide the separator
                 if (sectionPos == -1) {
                     sectionSize = 0;
                     this.removeView(mStickyHeader);
-                    mStickyHeader = mDummyHeader;
+                    mStickyHeader = mNonessentialHeader;
                     if (mSeparatorView != null) {
                         mSeparatorView.setVisibility(View.GONE);
                     }
@@ -320,14 +320,14 @@ public class StickyHeaderListView extends FrameLayout implements OnScrollListene
                     }
                 } else if (stickyHeaderHeight != 0) {
                     mStickyHeader.setTranslationY(0);
-                    if (mSeparatorView != null && !mStickyHeader.equals(mDummyHeader)) {
+                    if (mSeparatorView != null && !mStickyHeader.equals(mNonessentialHeader)) {
                         mSeparatorView.setVisibility(View.VISIBLE);
                     }
                 }
                 if (newView) {
                     mStickyHeader.setVisibility(View.INVISIBLE);
                     this.addView(mStickyHeader);
-                    if (mSeparatorView != null && !mStickyHeader.equals(mDummyHeader)){
+                    if (mSeparatorView != null && !mStickyHeader.equals(mNonessentialHeader)){
                         FrameLayout.LayoutParams params =
                                 new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
                                         mSeparatorWidth);
@@ -382,12 +382,12 @@ public class StickyHeaderListView extends FrameLayout implements OnScrollListene
             setListView(new ListView(mContext));
         }
 
-        // Create a dummy view , it will be used in case a section has no header
-        mDummyHeader = new View (mContext);
+        // Create a nonessential view , it will be used in case a section has no header
+        mNonessentialHeader = new View (mContext);
         ViewGroup.LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT,
                 1, Gravity.TOP);
-        mDummyHeader.setLayoutParams(params);
-        mDummyHeader.setBackgroundColor(Color.TRANSPARENT);
+        mNonessentialHeader.setLayoutParams(params);
+        mNonessentialHeader.setBackgroundColor(Color.TRANSPARENT);
 
         mChildViewsCreated = true;
     }