diff options
author | Joe Onorato <joeo@android.com> | 2010-06-07 10:24:36 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-06-09 14:33:30 -0700 |
commit | 7a0f36bd93ad8a5b8cb3e1fe56dbdb43a0ad3a57 (patch) | |
tree | 04a00561e8e2ec8b8c883d6fb31b3a6b0570ba51 /packages | |
parent | 9e875fcb55dad6795e823207693c5ca877941d3e (diff) | |
download | frameworks_base-7a0f36bd93ad8a5b8cb3e1fe56dbdb43a0ad3a57.zip frameworks_base-7a0f36bd93ad8a5b8cb3e1fe56dbdb43a0ad3a57.tar.gz frameworks_base-7a0f36bd93ad8a5b8cb3e1fe56dbdb43a0ad3a57.tar.bz2 |
Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Then, now that StatusBarManagerService is the only thing in that package,
move it up to the regular services package. (I've been waiting for 4 years
to delete that package!)
Change-Id: If5faf44641319fd19e486d1f4e5bc1c6dfcff3ad
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/status_bar_item_background_focus.9.png | bin | 1657 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/status_bar_item_background_normal.9.png | bin | 197 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/status_bar_item_background_pressed.9.png | bin | 1531 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/status_bar_item_background_focus.9.png | bin | 11006 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/status_bar_item_background_normal.9.png | bin | 186 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/status_bar_item_background_pressed.9.png | bin | 11006 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/layout/status_bar_latest_event.xml | 24 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java | 5 |
8 files changed, 26 insertions, 3 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_focus.9.png b/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_focus.9.png Binary files differdeleted file mode 100644 index 0876bc6..0000000 --- a/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_focus.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_normal.9.png b/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_normal.9.png Binary files differdeleted file mode 100644 index c01c018..0000000 --- a/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_pressed.9.png Binary files differdeleted file mode 100644 index 343e4ca..0000000 --- a/packages/SystemUI/res/drawable-hdpi/status_bar_item_background_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_focus.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_focus.9.png Binary files differdeleted file mode 100644 index c3e2415..0000000 --- a/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_focus.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_normal.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_normal.9.png Binary files differdeleted file mode 100644 index b8e399d..0000000 --- a/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_pressed.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_pressed.9.png Binary files differdeleted file mode 100644 index 02b4e9a..0000000 --- a/packages/SystemUI/res/drawable-mdpi/status_bar_item_background_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/layout/status_bar_latest_event.xml b/packages/SystemUI/res/layout/status_bar_latest_event.xml new file mode 100644 index 0000000..88d9739 --- /dev/null +++ b/packages/SystemUI/res/layout/status_bar_latest_event.xml @@ -0,0 +1,24 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="65sp" + android:orientation="vertical" + > + + <com.android.systemui.statusbar.LatestItemView android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="64sp" + android:background="@android:drawable/status_bar_item_background" + android:focusable="true" + android:clickable="true" + android:paddingRight="6sp" + > + </com.android.systemui.statusbar.LatestItemView> + + <View + android:layout_width="match_parent" + android:layout_height="1sp" + android:background="@android:drawable/divider_horizontal_bright" + /> + +</LinearLayout> + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java index ca589cd..ae97400 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java @@ -434,11 +434,10 @@ public class PhoneStatusBarService extends StatusBarService { // create the row view LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View row = inflater.inflate(com.android.internal.R.layout.status_bar_latest_event, - parent, false); + View row = inflater.inflate(R.layout.status_bar_latest_event, parent, false); // bind the click event to the content area - ViewGroup content = (ViewGroup)row.findViewById(com.android.internal.R.id.content); + ViewGroup content = (ViewGroup)row.findViewById(R.id.content); content.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS); content.setOnFocusChangeListener(mFocusChangeListener); PendingIntent contentIntent = n.contentIntent; |