Merge "Add launcher customization receiver." into nyc-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e1178c5..1bc258b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,12 +23,12 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
+ android:enabled="false"
android:allowBackup="false"
android:label="@string/retail_demo_title"
android:supportsRtl="true">
<activity android:name=".DemoPlayer"
- android:enabled="false"
android:exported="true"
android:immersive="true"
android:screenOrientation="nosensor"
@@ -41,6 +41,13 @@
</intent-filter>
</activity>
+ <!-- This isn't a real receiver, it's only used as a marker interface. -->
+ <receiver android:name=".DemoModeCustomizationReceiver">
+ <intent-filter>
+ <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION" />
+ </intent-filter>
+ </receiver>
+
</application>
</manifest>
\ No newline at end of file
diff --git a/src/com/android/retaildemo/DemoModeCustomizationReceiver.java b/src/com/android/retaildemo/DemoModeCustomizationReceiver.java
new file mode 100644
index 0000000..7e59fc2
--- /dev/null
+++ b/src/com/android/retaildemo/DemoModeCustomizationReceiver.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.retaildemo;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class DemoModeCustomizationReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // Ignored
+ }
+}
\ No newline at end of file
