From a1f21d976c9339bbdd7d1e12700723edd60c2346 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 10 Jun 2024 07:27:24 -0700
Subject: [PATCH] Rename "preset file" to just "preset" in transformer demo

The new name means we can add streams and other sources that aren't files in
future, for example, screen recording input.

PiperOrigin-RevId: 641894319
---
 .../transformer/ConfigurationActivity.java    | 29 +++++++++----------
 .../res/layout/configuration_activity.xml     |  6 ++--
 .../src/main/res/values/strings.xml           |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java
index bdecd4a1e2..470ec5f18b 100644
--- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java
+++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java
@@ -154,7 +154,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
   private Runnable onPermissionsGranted;
   private ActivityResultLauncher<Intent> videoLocalFilePickerLauncher;
   private ActivityResultLauncher<Intent> overlayLocalFilePickerLauncher;
-  private Button selectPresetFileButton;
+  private Button selectPresetButton;
   private Button selectLocalFileButton;
   private TextView selectedFileTextView;
   private CheckBox removeAudioCheckbox;
@@ -178,7 +178,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
   private Button selectVideoEffectsButton;
   private boolean[] audioEffectsSelections;
   private boolean[] videoEffectsSelections;
-  private String[] presetFileDescriptions;
+  private String[] presetDescriptions;
   private Uri localFileUri;
   private int inputUriPosition;
   private long trimStartMs;
@@ -217,8 +217,8 @@ public final class ConfigurationActivity extends AppCompatActivity {
             new ActivityResultContracts.StartActivityForResult(),
             this::overlayLocalFilePickerLauncherResult);
 
-    selectPresetFileButton = findViewById(R.id.select_preset_file_button);
-    selectPresetFileButton.setOnClickListener(view -> selectPresetFile());
+    selectPresetButton = findViewById(R.id.select_preset_button);
+    selectPresetButton.setOnClickListener(view -> selectPreset());
 
     selectLocalFileButton = findViewById(R.id.select_local_file_button);
     selectLocalFileButton.setOnClickListener(
@@ -228,8 +228,8 @@ public final class ConfigurationActivity extends AppCompatActivity {
                 /* mimeTypes= */ new String[] {"image/*", "video/*", "audio/*"}));
 
     selectedFileTextView = findViewById(R.id.selected_file_text_view);
-    presetFileDescriptions = getResources().getStringArray(R.array.preset_descriptions);
-    selectedFileTextView.setText(presetFileDescriptions[inputUriPosition]);
+    presetDescriptions = getResources().getStringArray(R.array.preset_descriptions);
+    selectedFileTextView.setText(presetDescriptions[inputUriPosition]);
 
     removeAudioCheckbox = findViewById(R.id.remove_audio_checkbox);
     removeAudioCheckbox.setOnClickListener(this::onRemoveAudio);
@@ -339,7 +339,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
     super.onResume();
     @Nullable Uri intentUri = getIntent().getData();
     if (intentUri != null) {
-      selectPresetFileButton.setEnabled(false);
+      selectPresetButton.setEnabled(false);
       selectLocalFileButton.setEnabled(false);
       selectedFileTextView.setText(intentUri.toString());
     }
@@ -419,28 +419,27 @@ public final class ConfigurationActivity extends AppCompatActivity {
     } else if (localFileUri != null) {
       intentUri = localFileUri;
     } else {
-      String[] presetFileUris = getResources().getStringArray(R.array.preset_uris);
-      intentUri = Uri.parse(presetFileUris[inputUriPosition]);
+      String[] presetUris = getResources().getStringArray(R.array.preset_uris);
+      intentUri = Uri.parse(presetUris[inputUriPosition]);
     }
     transformerIntent.setData(intentUri);
 
     startActivity(transformerIntent);
   }
 
-  private void selectPresetFile() {
+  private void selectPreset() {
     new AlertDialog.Builder(/* context= */ this)
-        .setTitle(R.string.select_preset_file_title)
-        .setSingleChoiceItems(
-            presetFileDescriptions, inputUriPosition, this::selectPresetFileInDialog)
+        .setTitle(R.string.select_preset_title)
+        .setSingleChoiceItems(presetDescriptions, inputUriPosition, this::selectPresetInDialog)
         .setPositiveButton(android.R.string.ok, /* listener= */ null)
         .create()
         .show();
   }
 
-  private void selectPresetFileInDialog(DialogInterface dialog, int which) {
+  private void selectPresetInDialog(DialogInterface dialog, int which) {
     inputUriPosition = which;
     localFileUri = null;
-    selectedFileTextView.setText(presetFileDescriptions[inputUriPosition]);
+    selectedFileTextView.setText(presetDescriptions[inputUriPosition]);
   }
 
   private void selectLocalFile(
diff --git a/demos/transformer/src/main/res/layout/configuration_activity.xml b/demos/transformer/src/main/res/layout/configuration_activity.xml
index 3c5bee54bf..e69403202b 100644
--- a/demos/transformer/src/main/res/layout/configuration_activity.xml
+++ b/demos/transformer/src/main/res/layout/configuration_activity.xml
@@ -33,12 +33,12 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
   <Button
-    android:id="@+id/select_preset_file_button"
+    android:id="@+id/select_preset_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="32dp"
     android:layout_marginStart="8dp"
-    android:text="@string/select_preset_file_title"
+    android:text="@string/select_preset_title"
     android:textSize="12sp"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/configuration_text_view" />
@@ -66,7 +66,7 @@
     android:gravity="center"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/select_preset_file_button" />
+    app:layout_constraintTop_toBottomOf="@+id/select_preset_button" />
   <androidx.core.widget.NestedScrollView
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/demos/transformer/src/main/res/values/strings.xml b/demos/transformer/src/main/res/values/strings.xml
index fb587ddfc6..4a77884980 100644
--- a/demos/transformer/src/main/res/values/strings.xml
+++ b/demos/transformer/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="app_name" translatable="false">Transformer Demo</string>
   <string name="configuration" translatable="false">Configuration</string>
-  <string name="select_preset_file_title" translatable="false">Choose preset file</string>
+  <string name="select_preset_title" translatable="false">Choose preset input</string>
   <string name="select_local_file_title">Choose local file</string>
   <string name="local_file_picker_failed">File couldn\'t be opened. Please try again.</string>
   <string name="remove_audio" translatable="false">Remove audio</string>