diff options
author | Raman Tenneti <rtenneti@google.com> | 2020-07-27 16:27:22 -0700 |
---|---|---|
committer | Raman Tenneti <rtenneti@google.com> | 2020-07-28 00:55:53 +0000 |
commit | f7adee7b185cb30bb5cd6856ae8e03ebce6e35ec (patch) | |
tree | 95eb2f22366d41c4f5af4a5c13cf79b99c986863 | |
parent | 13209dae16b21b30dafe64b99601e214ab2aa03f (diff) | |
download | Calendar-f7adee7b185cb30bb5cd6856ae8e03ebce6e35ec.tar.gz |
AOSP/Calendar - Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
BUG=161896447
Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI.
$ make -j 40
$ make Calendar -j
$ make CalendarTests -j
$ ls -l out/target/product/bonito/product/app/Calendar/Calendar.apk out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk
$ adb install -r -d -g out/target/product/bonito/product/app/Calendar/Calendar.apk
$ adb install -r -d -g out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk
$ adb shell am instrument -w com.android.calendar.tests
Time: 0.127
OK (22 tests)
Change-Id: I120568d69f9b2cbf63c1846e4113b32e8cd3a35c
-rw-r--r-- | res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml | 2 | ||||
-rw-r--r-- | src/com/android/calendar/EventInfoFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/calendar/StickyHeaderListView.java | 18 |
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; } |