Set activity label instead of window's accessibilityTitle
Clean up for aosp/3376055
Bug: 376780875
Test: follow the instruction in the bug
Change-Id: I7af3fe14a8f768d0022a0523a7301317931c9d80
diff --git a/android/TerminalApp/AndroidManifest.xml b/android/TerminalApp/AndroidManifest.xml
index a9d6e9d..a631d0f 100644
--- a/android/TerminalApp/AndroidManifest.xml
+++ b/android/TerminalApp/AndroidManifest.xml
@@ -47,9 +47,12 @@
</intent-filter>
</activity>
<activity android:name=".SettingsActivity" />
- <activity android:name=".SettingsDiskResizeActivity" />
- <activity android:name=".SettingsPortForwardingActivity" />
- <activity android:name=".SettingsRecoveryActivity" />
+ <activity android:name=".SettingsDiskResizeActivity"
+ android:label="@string/settings_disk_resize_title" />
+ <activity android:name=".SettingsPortForwardingActivity"
+ android:label="@string/settings_port_forwarding_title" />
+ <activity android:name=".SettingsRecoveryActivity"
+ android:label="@string/settings_recovery_title" />
<activity android:name=".ErrorActivity" />
<property
android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt
index d9086a4..2a505d8 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt
@@ -23,15 +23,11 @@
import android.icu.util.MeasureUnit
import android.os.Bundle
import android.os.FileUtils
-import android.os.Handler
-import android.os.Looper
import android.text.SpannableString
import android.text.Spanned
import android.text.TextUtils
import android.text.style.RelativeSizeSpan
import android.widget.SeekBar
-import android.view.Window
-import android.view.WindowManager
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
@@ -68,12 +64,6 @@
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_disk_resize)
- Handler(Looper.getMainLooper()).post {
- val lp: WindowManager.LayoutParams = getWindow().getAttributes()
- lp.accessibilityTitle = getString(R.string.settings_disk_resize_title)
- getWindow().setAttributes(lp)
- }
-
diskSizeStepMb = 1L shl resources.getInteger(R.integer.disk_size_round_up_step_size_in_mb)
val sharedPref =
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
index 0377de4..fe693c4 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
@@ -18,10 +18,6 @@
import android.content.Context
import android.content.SharedPreferences
import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.view.Window
-import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
@@ -34,12 +30,6 @@
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_port_forwarding)
- Handler(Looper.getMainLooper()).post {
- val lp: WindowManager.LayoutParams = getWindow().getAttributes()
- lp.accessibilityTitle = getString(R.string.settings_port_forwarding_title)
- getWindow().setAttributes(lp)
- }
-
mSharedPref =
this.getSharedPreferences(getString(R.string.preference_file_key), Context.MODE_PRIVATE)
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
index 3adeece..f986aa1 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
@@ -17,12 +17,8 @@
import android.content.Intent
import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
import android.util.Log
import android.view.View
-import android.view.Window
-import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
@@ -41,12 +37,6 @@
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_recovery)
- Handler(Looper.getMainLooper()).post {
- val lp: WindowManager.LayoutParams = getWindow().getAttributes()
- lp.accessibilityTitle = getString(R.string.settings_recovery_title)
- getWindow().setAttributes(lp)
- }
-
val resetCard = findViewById<MaterialCardView>(R.id.settings_recovery_reset_card)
resetCard.setOnClickListener {
var backupRootfs = false