| commit | d7549bd69b33b222dc4f7a4647f92ce8f468a08f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 30 01:43:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 30 01:43:11 2020 +0000 |
| tree | e1b422c6eceef1d095f836ce67696dc273969a50 | |
| parent | 2da894ea4204d0c0ba15dd69cce42d22b089c623 [diff] | |
| parent | 3e07b44e4c8f9b2afc0c55a89f0a601642450518 [diff] |
Merge "AOSP/Music - Update language to comply with Android's inclusive language guidance." am: 48d6933716 am: a0ca86e022 am: 3e07b44e4c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Music/+/1378551 Change-Id: I5228ea3076cd22c9c670ab48624d526eabf1b634
diff --git a/kotlin/src/com/android/music/MusicPicker.kt b/kotlin/src/com/android/music/MusicPicker.kt index 8c8b460..2a265ff 100644 --- a/kotlin/src/com/android/music/MusicPicker.kt +++ b/kotlin/src/com/android/music/MusicPicker.kt
@@ -27,7 +27,7 @@ import android.widget.ListView /** - * A dummy class to handle android.intent.action.PICK Intent. + * A placeholder class to handle android.intent.action.PICK Intent. */ class MusicPicker : ListActivity(), View.OnClickListener { /** Uri to the directory of all music being displayed. */
diff --git a/src/com/android/music/MusicPicker.java b/src/com/android/music/MusicPicker.java index b244146..547b9ba 100644 --- a/src/com/android/music/MusicPicker.java +++ b/src/com/android/music/MusicPicker.java
@@ -28,7 +28,7 @@ import android.widget.ListView; /** - * A dummy class to handle android.intent.action.PICK Intent. + * A placeholder class to handle android.intent.action.PICK Intent. */ public class MusicPicker extends ListActivity implements View.OnClickListener { static final boolean DBG = false;