LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DO NOT MERGE Material theme

Browse Source 
BUG: 15467097
Change-Id: Icea9710a8733a0c79c114a56faa61db99b9723bd
This commit is contained in:
Alan Viverette
2014-06-06 13:52:28 -07:00
parent 11d8830d24
commit 14fba07cf0
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/ApiDemos/AndroidManifest.xml
View File

@@ -2168,8 +2168,8 @@
</activity>
<activity android:name=".view.Controls5"
android:label="Views/Controls/5. Quantum Light Theme"
android:theme="@android:style/Theme.Quantum.Light"
android:label="Views/Controls/5. Material Light Theme"
android:theme="@android:style/Theme.Material.Light"
android:enabled="@bool/atLeastLRelease">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2178,8 +2178,8 @@
</activity>
<activity android:name=".view.Controls6"
android:label="Views/Controls/6. Quantum Dark Theme"
android:theme="@android:style/Theme.Quantum"
android:label="Views/Controls/6. Material Dark Theme"
android:theme="@android:style/Theme.Material"
android:enabled="@bool/atLeastLRelease">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

8
samples/ApiDemos/res/values-v19/styles.xml
View File

@@ -15,15 +15,15 @@
-->
<resources>
<!-- For API level XX or later, the Quantum theme is available and we prefer that. -->
<style name="ThemeCurrent" parent="android:Theme.Quantum">
<!-- For API level XX or later, the Material theme is available and we prefer that. -->
<style name="ThemeCurrent" parent="android:Theme.Material">
</style>
<!-- For API level XX or later, the Holo theme is available and we prefer that. -->
<style name="ThemeCurrentDialog" parent="android:Theme.Quantum.Dialog">
<style name="ThemeCurrentDialog" parent="android:Theme.Material.Dialog">
</style>
<!-- For API level XX or later, we can use the magical DialogWhenLarge theme. -->
<style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.DialogWhenLarge">
<style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Material.DialogWhenLarge">
</style>
</resources>

8
samples/ApiDemos/res/values-v20/styles.xml
View File

@@ -15,15 +15,15 @@
-->
<resources>
<!-- For API level XX or later, the Quantum theme is available and we prefer that. -->
<style name="ThemeCurrent" parent="android:Theme.Quantum.Light">
<!-- For API level XX or later, the Material theme is available and we prefer that. -->
<style name="ThemeCurrent" parent="android:Theme.Material.Light">
</style>
<!-- For API level XX or later, the Holo theme is available and we prefer that. -->
<style name="ThemeCurrentDialog" parent="android:Theme.Quantum.Light.Dialog">
<style name="ThemeCurrentDialog" parent="android:Theme.Material.Light.Dialog">
</style>
<!-- For API level XX or later, we can use the magical DialogWhenLarge theme. -->
<style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
<style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Material.Light.DialogWhenLarge">
</style>
</resources>

6
samples/ApiDemos/res/values/styles.xml
View File

@@ -24,7 +24,7 @@
The default definition is the safe one, using a theme that has always
been defined. Look at values-11/styles.xml for a variation that is
selected when the holographic theme is available, or look at
values-XX/styles.xml for a variation that is selected when the quantum
values-XX/styles.xml for a variation that is selected when the material
theme is available. -->
<style name="ThemeCurrent" parent="android:Theme" />
@@ -37,7 +37,7 @@
The default definition is the safe one, using a theme that has always
been defined. Look at values-11/styles.xml for a variation that is
selected when the holographic theme is available, or look at
values-XX/styles.xml for a variation that is selected when the quantum
values-XX/styles.xml for a variation that is selected when the material
theme is available. -->
<style name="ThemeCurrentDialog" parent="android:Theme.Dialog" />
@@ -120,7 +120,7 @@
<item name="android:layout_height">wrap_content</item>
</style>
<style name="ActivityTransitionTheme" parent="android:Theme.Quantum">
<style name="ActivityTransitionTheme" parent="android:Theme.Material">
<item name="android:windowEnterTransition">@transition/explode</item>
<item name="android:windowExitTransition">@transition/explode</item>
<item name="android:windowSharedElementEnterTransition">@transition/move_image</item>