Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Return correct default theme on API >= 24\" into nyc-dev

Browse Source 
am: afaa1e9db1

Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497
This commit is contained in:
Alan Viverette
2016-06-08 20:20:44 +00:00
committed by android-build-merger
parent 40f71ac94f afaa1e9db1
commit 7fa09ec4dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/res/Resources.java
View File

@@ -126,9 +126,9 @@ public class Resources {
* Returns the most appropriate default theme for the specified target SDK version. * Returns the most appropriate default theme for the specified target SDK version.
* <ul> * <ul>
* <li>Below API 11: Gingerbread * <li>Below API 11: Gingerbread
* <li>APIs 11 thru 14: Holo * <li>APIs 12 thru 14: Holo
* <li>APIs 14 thru XX: Device default dark * <li>APIs 15 thru 23: Device default dark
* <li>API XX and above: Device default light with dark action bar * <li>APIs 24 and above: Device default light with dark action bar
* </ul> * </ul>
* *
* @param curTheme The current theme, or 0 if not specified. * @param curTheme The current theme, or 0 if not specified.
@@ -156,7 +156,7 @@ public class Resources {
if (targetSdkVersion < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { if (targetSdkVersion < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
return holo; return holo;
} }
if (targetSdkVersion < Build.VERSION_CODES.CUR_DEVELOPMENT) { if (targetSdkVersion < Build.VERSION_CODES.N) {
return dark; return dark;
} }
return deviceDefault; return deviceDefault;