Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0

Conflicts:
	BoardCommonConfig.mk
	camera/Android.mk
	common.mk
	configs/80cfw
	lpm.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Camera2/res/values/config.xml

1 files changed, 32 insertions, 0 deletions

diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
new file mode 100644
index 0000000..2bada88
--- /dev/null
+++ b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012 The CyanogenMod 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.cyanogenmod.settings.device;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class Startup extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(final Context context, final Intent bootintent) {
+        mDNIeScenario.restore(context);
+        mDNIeMode.restore(context);
+        mDNIeNegative.restore(context);
+        ScreenFragmentActivity.restore(context);
+    }
+}