Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1

adamp · Android (Google) Code Review · commit 9a856f4ee7b4 · 2011-12-05T17:38:23.000-08:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -973,7 +973,7 @@ void applyLegacyRowBackground(StatusBarNotification sbn, View content) {
             } catch (NameNotFoundException ex) {
                 Slog.e(TAG, "Failed looking up ApplicationInfo for " + sbn.pkg, ex);
             }
-            if (version > 0 && version < Build.VERSION_CODES.HONEYCOMB) {
+            if (version > 0 && version < Build.VERSION_CODES.GINGERBREAD) {
                 content.setBackgroundResource(R.drawable.notification_row_legacy_bg);
             } else {
                 content.setBackgroundResource(R.drawable.notification_row_bg);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -1836,7 +1836,7 @@ void applyLegacyRowBackground(StatusBarNotification sbn, View content) {
             } catch (NameNotFoundException ex) {
                 Slog.e(TAG, "Failed looking up ApplicationInfo for " + sbn.pkg, ex);
             }
-            if (version > 0 && version < Build.VERSION_CODES.HONEYCOMB) {
+            if (version > 0 && version < Build.VERSION_CODES.GINGERBREAD) {
                 content.setBackgroundResource(R.drawable.notification_row_legacy_bg);
             } else {
                 content.setBackgroundResource(R.drawable.notification_row_bg);

Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,7 @@ void applyLegacyRowBackground(StatusBarNotification sbn, View content) {`
`973`	`973`	`} catch (NameNotFoundException ex) {`
`974`	`974`	`Slog.e(TAG, "Failed looking up ApplicationInfo for " + sbn.pkg, ex);`
`975`	`975`	`}`
`976`		`- if (version > 0 && version < Build.VERSION_CODES.HONEYCOMB) {`
	`976`	`+ if (version > 0 && version < Build.VERSION_CODES.GINGERBREAD) {`
`977`	`977`	`content.setBackgroundResource(R.drawable.notification_row_legacy_bg);`
`978`	`978`	`} else {`
`979`	`979`	`content.setBackgroundResource(R.drawable.notification_row_bg);`
Original file line number	Diff line number	Diff line change
`@@ -1836,7 +1836,7 @@ void applyLegacyRowBackground(StatusBarNotification sbn, View content) {`
`1836`	`1836`	`} catch (NameNotFoundException ex) {`
`1837`	`1837`	`Slog.e(TAG, "Failed looking up ApplicationInfo for " + sbn.pkg, ex);`
`1838`	`1838`	`}`
`1839`		`- if (version > 0 && version < Build.VERSION_CODES.HONEYCOMB) {`
	`1839`	`+ if (version > 0 && version < Build.VERSION_CODES.GINGERBREAD) {`
`1840`	`1840`	`content.setBackgroundResource(R.drawable.notification_row_legacy_bg);`
`1841`	`1841`	`} else {`
`1842`	`1842`	`content.setBackgroundResource(R.drawable.notification_row_bg);`