Merge branch 'ics' into replicant-4.0

Conflicts:
	config/common.mk

2 files changed, 39 insertions, 0 deletions

diff --git a/config/software_gl.mk b/config/software_gl.mk
new file mode 100644
index 0000000..ac729f5
--- /dev/null
+++ b/config/software_gl.mk
@@ -0,0 +1,17 @@
+# Software GL overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/software_gl
+
+# Board doesn't feature Hardware GL
+BOARD_USES_HGL := false
+
+# Don't use hardware opengl
+USE_OPENGL_RENDERER := false
+
+# Use software rendering
+PRODUCT_PROPERTY_OVERRIDES += \
+	debug.sf.hw=0 \
+	ro.config.disable_hw_accel=true
+
+# Disable fancy rotation animation
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.sys.rotationanimation=false
diff --git a/overlay/software_gl/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/software_gl/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..e8f2424
--- /dev/null
+++ b/overlay/software_gl/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources>
+    <fraction name="def_window_animation_scale">0%</fraction>
+    <fraction name="def_window_transition_scale">0%</fraction>
+</resources>