commit 36f82a32a644e3c06e16283d33b9a74cac1935d8
author Adam Cohen <adamcohen@google.com> Fri Aug 08 04:33:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 07 17:50:16 2014 +0000
tree 3ba61801a05d57e3468ecc13d81b1e20939ce230
parent a66233aeb1ba7f152de73e66fd99ca0b90c6cf55
parent 7ec3bbff8b6364dc609eb06ba85e6f3bb999c67e

Merge "Fix screen issues with externally added items" into ub-now-porkchop

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f391a19..9b946af 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,6 +72,7 @@
     <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
     <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
     <uses-permission android:name="com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS" />
+    <uses-permission android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" />
 
     <application
         android:name="com.android.launcher3.LauncherApplication"

WallpaperPicker/src/com/android/launcher3/Partner.java

diff --git a/WallpaperPicker/src/com/android/launcher3/Partner.java b/WallpaperPicker/src/com/android/launcher3/Partner.java
index d172ce9..418ec9f 100644
--- a/WallpaperPicker/src/com/android/launcher3/Partner.java
+++ b/WallpaperPicker/src/com/android/launcher3/Partner.java
@@ -45,6 +45,8 @@
     public static final String RESOURCE_DEFAULT_WALLPAPER_HIDDEN = "default_wallpapper_hidden";
     public static final String RESOURCE_SYSTEM_WALLPAPER_DIR = "system_wallpaper_directory";
 
+    public static final String RESOURCE_REQUIRE_FIRST_RUN_FLOW = "requires_first_run_flow";
+
     private static boolean sSearched = false;
     private static Partner sPartner;
 
@@ -111,4 +113,10 @@
                 getPackageName());
         return (resId != 0) ? new File(getResources().getString(resId)) : null;
     }
+
+    public boolean requiresFirstRunFlow() {
+        int resId = getResources().getIdentifier(RESOURCE_REQUIRE_FIRST_RUN_FLOW, "bool",
+                getPackageName());
+        return resId != 0 && getResources().getBoolean(resId);
+    }
 }