diff options
| author | 2024-12-05 16:09:28 +0000 | |
|---|---|---|
| committer | 2024-12-05 16:09:28 +0000 | |
| commit | d4337b34d42888582fbd659093e491e9b20ebe53 (patch) | |
| tree | 159232598335b3f5988a8c997c45a6a299783c01 /packages/Shell | |
| parent | 285e082c6e911ae187090f8f50bd4e6805d17d99 (diff) | |
| parent | 287cc43fdd3a438640831e3d629fd8147f965f7e (diff) | |
Merge "Use WearBugreportWarningActivity from SystemUI in Shell" into main
Diffstat (limited to 'packages/Shell')
| -rw-r--r-- | packages/Shell/res/values/defaults.xml | 5 | ||||
| -rw-r--r-- | packages/Shell/src/com/android/shell/BugreportProgressService.java | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/packages/Shell/res/values/defaults.xml b/packages/Shell/res/values/defaults.xml new file mode 100644 index 000000000000..b693cc826be0 --- /dev/null +++ b/packages/Shell/res/values/defaults.xml @@ -0,0 +1,5 @@ +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Default for Wear bugreport warning activity--> + <!-- DO NOT TRANSLATE --> + <string name="system_ui_wear_bugreport_warning_activity" /> +</resources>
\ No newline at end of file diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 9736831a0793..0694b6123c11 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -1365,7 +1365,11 @@ public class BugreportProgressService extends Service { */ private Intent buildWearWarningIntent() { Intent intent = new Intent(); - intent.setClassName(mContext, getPackageName() + ".WearBugreportWarningActivity"); + String systemUIPackage = mContext.getResources().getString( + com.android.internal.R.string.config_systemUi); + String wearBugreportWarningActivity = getResources() + .getString(R.string.system_ui_wear_bugreport_warning_activity); + intent.setClassName(systemUIPackage, wearBugreportWarningActivity); if (mContext.getPackageManager().resolveActivity(intent, /* flags */ 0) == null) { Log.e(TAG, "Cannot find wear bugreport warning activity"); return buildWarningIntent(mContext, /* sendIntent */ null); |