Import updated Android SetupCompat Library 248976877
am: 8f4ffea5e2
Change-Id: Ibaccaaf47e7096493aa8a884e5418f3145a67c22
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 @@
}
}
- /**
- * 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 @@
}
/**
+ * 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 @@
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 @@
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) {
