diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2019-05-20 21:20:41 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 21:20:41 -0700 |
commit | b1f825f052f29e4c644ecc1f758d1947c2df4b6f (patch) | |
tree | 2b8dd9bd90813b2b28c10e3154315069396b905c | |
parent | b10744f1d35f731eb04bb4f22577117abc3f8d3b (diff) | |
parent | 8f4ffea5e2b35f5c839b8a29c331fd6fe30396f6 (diff) | |
download | setupcompat-b1f825f052f29e4c644ecc1f758d1947c2df4b6f.tar.gz |
Import updated Android SetupCompat Library 248976877platform-tools-29.0.5ndk-sysroot-r21
am: 8f4ffea5e2
Change-Id: Iba2b0e6a1bff477aed2f1bbd9b599bbcf2eea942
-rw-r--r-- | main/java/com/google/android/setupcompat/util/WizardManagerHelper.java | 20 | ||||
-rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java | 8 |
2 files changed, 20 insertions, 8 deletions
diff --git a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java index 3896731..36b7d38 100644 --- a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java +++ b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java @@ -113,12 +113,8 @@ public class WizardManagerHelper { } } - /** - * Checks whether an intent is intended to be used within the setup wizard flow. - * - * @param intent The intent to be checked, usually from {@link Activity#getIntent()}. - * @return true if the intent passed in was intended to be used with setup wizard. - */ + /** @deprecated Use {@link isInitialSetupWizard} instead. */ + @Deprecated public static boolean isSetupWizardIntent(Intent intent) { return intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false); } @@ -191,6 +187,16 @@ public class WizardManagerHelper { } /** + * Checks whether an intent is is running in the initial setup wizard flow. + * + * @param intent The intent to be checked, usually from {@link Activity#getIntent()}. + * @return true if the intent passed in was intended to be used with setup wizard. + */ + public static boolean isInitialSetupWizard(Intent intent) { + return intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false); + } + + /** * Returns true if the intent passed in indicates that it is running in any setup wizard flow, * including initial setup and deferred setup etc. * @@ -205,7 +211,7 @@ public class WizardManagerHelper { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { return originalIntent.getBooleanExtra(EXTRA_IS_SETUP_FLOW, false); } else { - return isSetupWizardIntent(originalIntent) + return isInitialSetupWizard(originalIntent) || isPreDeferredSetupWizard(originalIntent) || isDeferredSetupWizard(originalIntent); } diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java index 6dd71b2..eac403f 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java @@ -325,7 +325,13 @@ public class PartnerConfigHelper { private Resources getResourcesByPackageName(Context context, String packageName) throws PackageManager.NameNotFoundException { PackageManager manager = context.getPackageManager(); - return manager.getResourcesForApplication(packageName); + if (Build.VERSION.SDK_INT >= VERSION_CODES.N) { + return manager.getResourcesForApplication( + manager.getApplicationInfo(packageName, PackageManager.MATCH_DISABLED_COMPONENTS)); + } else { + return manager.getResourcesForApplication( + manager.getApplicationInfo(packageName, PackageManager.GET_DISABLED_COMPONENTS)); + } } private ResourceEntry getResourceEntryFromKey(String resourceName) { |