From c6e8fba20c3a5c0c16526eaf829f0adb8f77e51c Mon Sep 17 00:00:00 2001 From: tornaco Date: Fri, 17 Jun 2022 22:33:23 +0800 Subject: [PATCH] [services] add more activity types --- .../android/thanos/core/app/start/StartReason.kt | 4 ++++ .../thanos/start/DetailedStartRecordsActivity.java | 11 ++++++++++- android/internal/Thanox-Internal | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/app/start/StartReason.kt b/android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/app/start/StartReason.kt index e49f9eaab..a9637b656 100644 --- a/android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/app/start/StartReason.kt +++ b/android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/app/start/StartReason.kt @@ -8,5 +8,9 @@ interface StartReason { const val PROVIDER = 0x4 const val BROADCAST = 0x5 const val OTHERS = 0x6 + + const val PRE_ACTIVITY = 0x7 + const val PRE_TOP_ACTIVITY = 0x8 + const val TOP_ACTIVITY = 0x9 } } diff --git a/android/app/src/main/java/github/tornaco/android/thanos/start/DetailedStartRecordsActivity.java b/android/app/src/main/java/github/tornaco/android/thanos/start/DetailedStartRecordsActivity.java index f2e54c114..19a35db54 100644 --- a/android/app/src/main/java/github/tornaco/android/thanos/start/DetailedStartRecordsActivity.java +++ b/android/app/src/main/java/github/tornaco/android/thanos/start/DetailedStartRecordsActivity.java @@ -117,7 +117,7 @@ protected AppItemClickListener onCreateAppItemViewClickListener() { .setMessage(appInfo.getStr()) .setPositiveButton(R.string.feature_title_apps_manager, (dialog, which) -> AppDetailsActivity.start(thisActivity(), appInfo)).setNegativeButton(R.string.menu_title_start_restrict_charts_view_detailed_records_for_this_package, - (dialog, which) -> DetailedStartRecordsActivity.start(thisActivity(), appInfo.getPkgName())) + (dialog, which) -> DetailedStartRecordsActivity.start(thisActivity(), appInfo.getPkgName())) .show(); }; @@ -182,6 +182,15 @@ private String getStartMethodDesc(StartRecord startRecord, PackageManager packag case StartReason.ACTIVITY: methodStr = "Activity"; break; + case StartReason.TOP_ACTIVITY: + methodStr = "Top Activity"; + break; + case StartReason.PRE_ACTIVITY: + methodStr = "Pre Activity"; + break; + case StartReason.PRE_TOP_ACTIVITY: + methodStr = "Pre Top Activity"; + break; case StartReason.BROADCAST: methodStr = "Broadcast"; break; diff --git a/android/internal/Thanox-Internal b/android/internal/Thanox-Internal index 47f7f0936..57375ed9f 160000 --- a/android/internal/Thanox-Internal +++ b/android/internal/Thanox-Internal @@ -1 +1 @@ -Subproject commit 47f7f093607d6a5344c7d8043f3692ee72861f2e +Subproject commit 57375ed9f7458c75a4691132b1fbab487b39fb4e