From 045de11a3b4cbe9048d3921a615ddbd3b8b506d8 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 4 Nov 2010 14:23:57 -0700
Subject: [PATCH] Fix bug 3163150 - move holo extended themes to an overlay
 file.

The file themes_extended is meant to be overridden per-device in an
overlay file. The overlay should include enhancements appropriate for
the device when hardware acceleration is requested by an app.

Change-Id: If2878b973845f1793a00651089bc0dd66952d916
---
 core/res/res/values/themes.xml          | 14 ----------
 core/res/res/values/themes_extended.xml | 35 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 core/res/res/values/themes_extended.xml

diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 80072f42471a5..e92ebba276c63 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -1129,20 +1129,6 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
-
-    <!-- Variant of the holographic dark theme that includes extra decorations
-         appropriate for when hardware acceleration is in use. -->
-    <style name="Theme.Holo.Extended">
-        <item name="windowBackground">@android:drawable/background_holo_dark</item>
-        <item name="colorBackgroundCacheHint">@android:color/transparent</item>
-    </style>
-
-    <!-- Variant of the holographic light theme that includes extra decorations
-         appropriate for when hardware acceleration is in use. -->
-    <style name="Theme.Holo.Light.Extended">
-        <item name="windowBackground">@android:drawable/background_holo_light</item>
-        <item name="colorBackgroundCacheHint">@android:color/transparent</item>
-    </style>
  
     <!-- Dialog themes for Holo -->
 
diff --git a/core/res/res/values/themes_extended.xml b/core/res/res/values/themes_extended.xml
new file mode 100644
index 0000000000000..064e935b38cab
--- /dev/null
+++ b/core/res/res/values/themes_extended.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!--
+    This theme file includes empty stubs for the "Extended" themes. These
+    by default are identical to their parent themes. Device overlays in
+    the build tree should include an overlay for this file with appropriate
+    enhancements for the device. Those defining the device-specific overlay can
+    assume that any activity using an extended theme is also requesting
+    hardware acceleration.
+-->
+<resources>
+    <!-- Variant of the holographic dark theme that includes extra decorations
+         appropriate for when hardware acceleration is in use. -->
+    <style name="Theme.Holo.Extended">
+    </style>
+
+    <!-- Variant of the holographic light theme that includes extra decorations
+         appropriate for when hardware acceleration is in use. -->
+    <style name="Theme.Holo.Light.Extended">
+    </style>
+</resources>