Merge \\\"Return correct default theme on API >= 24\\\" into nyc-dev am: afaa1e9db1 am: 1bb283131f (8042dd84) · Commits · e / os / android_frameworks_base

core/java/android/content/res/Resources.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -126,9 +126,9 @@ public class Resources {
		* Returns the most appropriate default theme for the specified target SDK version.
		* <ul>
		* <li>Below API 11: Gingerbread
		* <li>APIs 11 thru 14: Holo
		* <li>APIs 14 thru XX: Device default dark
		* <li>API XX and above: Device default light with dark action bar
		* <li>APIs 12 thru 14: Holo
		* <li>APIs 15 thru 23: Device default dark
		* <li>APIs 24 and above: Device default light with dark action bar
		* </ul>
		*
		* @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) {
		return holo;
		}
		if (targetSdkVersion < Build.VERSION_CODES.CUR_DEVELOPMENT) {
		if (targetSdkVersion < Build.VERSION_CODES.N) {
		return dark;
		}
		return deviceDefault;