diff options
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/drawable/recents_thumbnail_bg_selector.xml | 27 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/recents_thumbnail_layers.xml | 19 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/recents_thumbnail_overlay.xml | 19 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-land/status_bar_recent_item.xml | 5 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-land/status_bar_recent_panel.xml | 1 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-port/status_bar_recent_item.xml | 4 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-port/status_bar_recent_panel.xml | 1 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml | 4 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml | 1 | ||||
-rw-r--r-- | packages/SystemUI/res/menu/recent_popup_menu.xml (renamed from packages/SystemUI/res/drawable/recents_thumbnail_bg_holo.xml) | 8 | ||||
-rw-r--r-- | packages/SystemUI/res/values/strings.xml | 8 |
11 files changed, 59 insertions, 38 deletions
diff --git a/packages/SystemUI/res/drawable/recents_thumbnail_bg_selector.xml b/packages/SystemUI/res/drawable/recents_thumbnail_bg_selector.xml deleted file mode 100644 index 0e58e12..0000000 --- a/packages/SystemUI/res/drawable/recents_thumbnail_bg_selector.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android" - android:exitFadeDuration="@android:integer/config_mediumAnimTime"> - - <item android:state_window_focused="false" android:drawable="@android:color/transparent" /> - - <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> - <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/recents_thumbnail_bg_holo" /> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/recents_thumbnail_bg_holo" /> - <item android:state_focused="true" android:drawable="@drawable/recents_thumbnail_bg_holo" /> -</selector> - diff --git a/packages/SystemUI/res/drawable/recents_thumbnail_layers.xml b/packages/SystemUI/res/drawable/recents_thumbnail_layers.xml new file mode 100644 index 0000000..6cae2c4 --- /dev/null +++ b/packages/SystemUI/res/drawable/recents_thumbnail_layers.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/recents_thumbnail_bg" android:id="@+id/base_layer"/> + <item android:drawable="@drawable/recents_thumbnail_overlay" android:id="@+id/overlay_layer"/> +</layer-list>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/recents_thumbnail_overlay.xml b/packages/SystemUI/res/drawable/recents_thumbnail_overlay.xml new file mode 100644 index 0000000..200bac4 --- /dev/null +++ b/packages/SystemUI/res/drawable/recents_thumbnail_overlay.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_pressed="true" /> + <item android:drawable="@*android:color/transparent"/> +</selector> diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_item.xml b/packages/SystemUI/res/layout-land/status_bar_recent_item.xml index be4f1d7..8c29042 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_item.xml @@ -24,14 +24,15 @@ android:layout_height="wrap_content" android:layout_width="@dimen/status_bar_recents_thumbnail_view_width"> - <ImageView android:id="@+id/app_thumbnail" + <FrameLayout android:id="@+id/app_thumbnail" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" android:scaleType="center" - android:background="@drawable/recents_thumbnail_bg_selector" + android:clickable="true" + android:background="@drawable/recents_thumbnail_layers" /> <ImageView android:id="@+id/app_icon" diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml index efdd9ac..20ef7cf 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml @@ -51,7 +51,6 @@ android:fadingEdge="horizontal" android:scrollbars="none" android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length" - android:listSelector="@drawable/recents_thumbnail_bg_selector" android:layout_gravity="bottom|left" android:orientation="horizontal" android:clipToPadding="false" diff --git a/packages/SystemUI/res/layout-port/status_bar_recent_item.xml b/packages/SystemUI/res/layout-port/status_bar_recent_item.xml index 76965c9..c705a69 100644 --- a/packages/SystemUI/res/layout-port/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-port/status_bar_recent_item.xml @@ -24,13 +24,15 @@ android:layout_height="wrap_content" android:layout_width="@dimen/status_bar_recents_thumbnail_view_width"> - <ImageView android:id="@+id/app_thumbnail" + <FrameLayout android:id="@+id/app_thumbnail" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" + android:clickable="true" android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" android:scaleType="center" + android:background="@drawable/recents_thumbnail_layers" /> <ImageView android:id="@+id/app_icon" diff --git a/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml index 28ef239..c680b8e 100644 --- a/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml @@ -48,7 +48,6 @@ android:fadingEdge="vertical" android:scrollbars="none" android:fadingEdgeLength="@*android:dimen/status_bar_height" - android:listSelector="@drawable/recents_thumbnail_bg_selector" android:layout_gravity="bottom|left" android:clipToPadding="false" android:clipChildren="false"> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml index 9687866..386ce30 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml @@ -24,13 +24,15 @@ android:layout_height="wrap_content" android:layout_width="@dimen/status_bar_recents_thumbnail_view_width"> - <ImageView android:id="@+id/app_thumbnail" + <FrameLayout android:id="@+id/app_thumbnail" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" android:scaleType="center" + android:clickable="true" + android:background="@drawable/recents_thumbnail_layers" /> <ImageView android:id="@+id/app_icon" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml index 75fdc67..2c9a152 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml @@ -56,7 +56,6 @@ android:scrollbars="none" android:fadingEdgeLength="20dip" android:layout_gravity="bottom|left" - android:listSelector="@drawable/recents_thumbnail_bg_selector" android:clipToPadding="false" android:clipChildren="false"> diff --git a/packages/SystemUI/res/drawable/recents_thumbnail_bg_holo.xml b/packages/SystemUI/res/menu/recent_popup_menu.xml index f9bba2a..eecfb9a 100644 --- a/packages/SystemUI/res/drawable/recents_thumbnail_bg_holo.xml +++ b/packages/SystemUI/res/menu/recent_popup_menu.xml @@ -17,7 +17,7 @@ ** limitations under the License. */ --> -<transition xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/recents_thumbnail_bg_press"/> - <item android:drawable="@drawable/recents_thumbnail_bg_press"/> -</transition> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/recent_remove_item" android:title="@string/status_bar_recent_remove_item_title" /> + <item android:id="@+id/recent_inspect_item" android:title="@string/status_bar_recent_inspect_item_title" /> +</menu> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 882455e..01cf2dc 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -35,6 +35,14 @@ shown again. [CHAR LIMIT=25] --> <string name="status_bar_please_disturb_button">Show notifications</string> + <!-- Title shown in recents popup for removing an application from the list --> + <string name="status_bar_recent_remove_item_title">Remove</string> + + <!-- Title shown in recents popup for inspecting an application's properties --> + <string name="status_bar_recent_inspect_item_title">Inspect</string> + + + <!-- The label in the bar at the top of the status bar when there are no notifications showing. [CHAR LIMIT=40]--> |