Merge "Fix bug 3163150 - move holo extended themes to an overlay file."
This commit is contained in:
@@ -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 -->
|
||||
|
||||
|
||||
35
core/res/res/values/themes_extended.xml
Normal file
35
core/res/res/values/themes_extended.xml
Normal file
@@ -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>
|
||||
Reference in New Issue
Block a user