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

am 676bf550: Merge "Update ApiDemos to use API 20, default theme"

Browse Source 
* commit '676bf550071505e6b1153e0674fd46b6a2c2129e':
  Update ApiDemos to use API 20, default theme
This commit is contained in:
Alan Viverette
2014-04-09 22:47:16 +00:00
committed by Android Git Automerger
parent fbf3f914b3 676bf55007
commit 3ccf4b430d
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/ApiDemos/AndroidManifest.xml
View File

@@ -37,7 +37,7 @@
<!-- For android.media.audiofx.Visualizer --> <!-- For android.media.audiofx.Visualizer -->
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19" /> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="20" />
<!-- We will request access to the camera, saying we require a camera <!-- We will request access to the camera, saying we require a camera
of some sort but not one with autofocus capability. --> of some sort but not one with autofocus capability. -->
@@ -48,7 +48,6 @@
<application android:name="ApiDemosApplication" <application android:name="ApiDemosApplication"
android:label="@string/activity_sample_code" android:label="@string/activity_sample_code"
android:icon="@drawable/app_sample_code" android:icon="@drawable/app_sample_code"
android:theme="@style/ThemeCurrent"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:supportsRtl="true"> android:supportsRtl="true">

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project <!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
--> -->
<resources> <resources>
<!-- This resource is true if running under at least L-Release <!-- This resource is true if running under at least KitKat
API level. The default value is false; an alternative value API level. The default value is false; an alternative value
for L-Release is true. --> for KitKat is true. -->
<bool name="atLeastLRelease">true</bool> <bool name="atLeastKitKat">true</bool>
</resources> </resources>

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project <!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -16,18 +16,18 @@
<resources> <resources>
<!-- For API level XX or later, the Quantum theme is available and we prefer that. --> <!-- For API level XX or later, the Quantum theme is available and we prefer that. -->
<style name="ThemeCurrent" parent="android:Theme.Quantum.Light"> <style name="ThemeCurrent" parent="android:Theme.Quantum">
</style> </style>
<!-- For API level XX or later, the Holo theme is available and we prefer that. --> <!-- 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.Quantum.Dialog">
</style> </style>
<!-- For API level XX or later, we can use the magical DialogWhenLarge theme. --> <!-- 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.Quantum.DialogWhenLarge">
</style> </style>
<style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum.Light"> <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum">
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item> <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>

8
samples/ApiDemos/res/values-v99/bools.xml → samples/ApiDemos/res/values-v20/bools.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project <!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
--> -->
<resources> <resources>
<!-- This resource is true if running under at least KitKat <!-- This resource is true if running under at least L-Release
API level. The default value is false; an alternative value API level. The default value is false; an alternative value
for KitKat is true. --> for L-Release is true. -->
<bool name="atLeastKitKat">true</bool> <bool name="atLeastLRelease">true</bool>
</resources> </resources>

10
samples/ApiDemos/res/values-v99/styles.xml → samples/ApiDemos/res/values-v20/styles.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project <!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -16,18 +16,18 @@
<resources> <resources>
<!-- For API level XX or later, the Quantum theme is available and we prefer that. --> <!-- For API level XX or later, the Quantum theme is available and we prefer that. -->
<style name="ThemeCurrent" parent="android:Theme.Quantum"> <style name="ThemeCurrent" parent="android:Theme.Quantum.Light">
</style> </style>
<!-- For API level XX or later, the Holo theme is available and we prefer that. --> <!-- 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.Quantum.Light.Dialog">
</style> </style>
<!-- For API level XX or later, we can use the magical DialogWhenLarge theme. --> <!-- 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.Quantum.Light.DialogWhenLarge">
</style> </style>
<style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum"> <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum.Light">
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item> <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>