Merge "Revert^2 "Add waiting screen before PS setup completion"" into main
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f374c38..2b2a1b8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5184,9 +5184,11 @@
<activity
android:name="com.android.settings.network.WepNetworkDialogActivity"
+ android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
+ android:excludeFromRecents="true"
android:exported="true"
- android:theme="@style/Theme.SpaLib.Dialog"
- android:permission="android.permission.NETWORK_SETTINGS">
+ android:permission="android.permission.NETWORK_SETTINGS"
+ android:theme="@style/Theme.SpaLib.Dialog">
</activity>
<!-- This is the longest AndroidManifest.xml ever. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f147c5e..53a189f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4421,8 +4421,10 @@
<!-- Title text for 'Tap to click'. [CHAR LIMIT=35] -->
<string name="trackpad_tap_to_click">Tap to click</string>
- <!-- TODO(b/321978150): mark as translatable once we have finalized text from UX. -->
- <string name="trackpad_tap_dragging" translatable="false">Tap dragging</string>
+ <!-- Title text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=35] -->
+ <string name="trackpad_tap_dragging_title">Tap dragging</string>
+ <!-- Summary text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=60] -->
+ <string name="trackpad_tap_dragging_summary">Tap and drag your finger on the touchpad to move objects</string>
<!-- Title text for 'Touchpad gestures' [CHAR LIMIT=35] -->
<string name="trackpad_touchpad_gesture_title">Touchpad gestures</string>
<!-- Summary text for 'Touchpad gestures' [CHAR LIMIT=60] -->
diff --git a/res/xml/trackpad_settings.xml b/res/xml/trackpad_settings.xml
index 6601036..fcd43a5 100644
--- a/res/xml/trackpad_settings.xml
+++ b/res/xml/trackpad_settings.xml
@@ -48,10 +48,10 @@
android:order="30"
settings:keywords="@string/keywords_trackpad_bottom_right_tap"/>
- <!-- TODO(b/321978150): add a summary line once we have finalized text from UX. -->
<SwitchPreferenceCompat
android:key="trackpad_tap_dragging"
- android:title="@string/trackpad_tap_dragging"
+ android:title="@string/trackpad_tap_dragging_title"
+ android:summary="@string/trackpad_tap_dragging_summary"
settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController"
android:order="35"/>
diff --git a/src/com/android/settings/applications/credentials/CredentialsPickerActivity.java b/src/com/android/settings/applications/credentials/CredentialsPickerActivity.java
index 479a184..44dbac0 100644
--- a/src/com/android/settings/applications/credentials/CredentialsPickerActivity.java
+++ b/src/com/android/settings/applications/credentials/CredentialsPickerActivity.java
@@ -54,7 +54,12 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
- injectFragmentIntoIntent(this, getIntent());
+ final String packageName = getCallingPackage();
+ final Intent intent = getIntent();
+
+ intent.putExtra(DefaultCombinedPicker.EXTRA_PACKAGE_NAME, packageName);
+ injectFragmentIntoIntent(this, intent);
+
super.onCreate(savedInstanceState);
}
diff --git a/src/com/android/settings/network/WepNetworkDialogActivity.kt b/src/com/android/settings/network/WepNetworkDialogActivity.kt
index fef93ef..d6fa795 100644
--- a/src/com/android/settings/network/WepNetworkDialogActivity.kt
+++ b/src/com/android/settings/network/WepNetworkDialogActivity.kt
@@ -27,18 +27,21 @@
import com.android.settings.R
import com.android.settings.core.SubSettingLauncher
import com.android.settings.wifi.ConfigureWifiSettings
-import com.android.settingslib.spa.SpaBaseDialogActivity
+import com.android.settingslib.spa.SpaDialogWindowTypeActivity
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
-import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogWithIcon
+import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogContent
import com.android.settingslib.wifi.WifiUtils.Companion.SSID
-class WepNetworkDialogActivity : SpaBaseDialogActivity() {
+class WepNetworkDialogActivity : SpaDialogWindowTypeActivity() {
+
+ // TODO: Set different window type when called from Quick Settings.
+ override val dialogWindowType = null
+
@Composable
override fun Content() {
val context = LocalContext.current
val wifiManager = context.getSystemService(WifiManager::class.java)
- SettingsAlertDialogWithIcon(
- onDismissRequest = { finish() },
+ SettingsAlertDialogContent(
confirmButton = AlertDialogButton(
getString(R.string.wifi_settings_ssid_block_button_close)
) { finish() },
@@ -67,4 +70,4 @@
)
})
}
-}
\ No newline at end of file
+}