diff options
Diffstat (limited to 'packages/SystemUI/res')
8 files changed, 43 insertions, 67 deletions
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 c6966f9..58355bd 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_item.xml @@ -44,20 +44,18 @@ android:layout_height="@dimen/status_bar_recents_thumbnail_height" android:visibility="invisible" /> - </FrameLayout> - <ImageView android:id="@+id/app_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@id/app_thumbnail" - android:layout_alignTop="@id/app_thumbnail" - android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" - android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" - android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" - android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" - android:adjustViewBounds="true" - android:visibility="invisible" - /> + <ImageView android:id="@+id/app_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" + android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" + android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" + android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" + android:adjustViewBounds="true" + android:visibility="invisible" + /> + </FrameLayout> <TextView android:id="@+id/app_label" android:layout_width="@dimen/status_bar_recents_app_label_width" 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 2fe22ff..3ee9e77 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml @@ -75,13 +75,4 @@ android:layout_height="match_parent" android:visibility="invisible" /> - <View android:id="@+id/recents_dismiss_button" - android:layout_width="80px" - android:layout_height="@*android:dimen/status_bar_height" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:background="@drawable/ic_sysbar_back_ime" - android:visibility="gone" - /> - </com.android.systemui.recent.RecentsPanelView> 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 586712f..8c82eb1 100644 --- a/packages/SystemUI/res/layout-port/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-port/status_bar_recent_item.xml @@ -42,20 +42,16 @@ android:layout_height="@dimen/status_bar_recents_thumbnail_height" android:visibility="invisible" /> + <ImageView android:id="@+id/app_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" + android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" + android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" + android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" + android:adjustViewBounds="true" + /> </FrameLayout> - - <ImageView android:id="@+id/app_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@id/app_thumbnail" - android:layout_alignTop="@id/app_thumbnail" - android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" - android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" - android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" - android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" - android:adjustViewBounds="true" - /> - <TextView android:id="@+id/app_label" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" 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 4d49077..d040544 100644 --- a/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_recent_panel.xml @@ -73,13 +73,4 @@ android:layout_height="match_parent" android:visibility="invisible" /> - <View android:id="@+id/recents_dismiss_button" - android:layout_width="80px" - android:layout_height="@*android:dimen/status_bar_height" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:background="@drawable/ic_sysbar_back_ime" - android:visibility="gone" - /> - </com.android.systemui.recent.RecentsPanelView> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar.xml b/packages/SystemUI/res/layout-sw600dp/status_bar.xml index 125c87e..b96c357 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar.xml @@ -73,7 +73,7 @@ android:layout_width="80dip" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_recent" - android:contentDescription="@string/accessibility_menu" + android:contentDescription="@string/accessibility_recent" systemui:glowBackground="@drawable/ic_sysbar_highlight" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" 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 cd8ccd5..e633671 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml @@ -37,20 +37,17 @@ android:layout_height="@dimen/status_bar_recents_thumbnail_height" android:visibility="invisible" /> + <ImageView android:id="@+id/app_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" + android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" + android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" + android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" + android:adjustViewBounds="true" + /> </FrameLayout> - <ImageView android:id="@+id/app_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@id/app_thumbnail" - android:layout_alignTop="@id/app_thumbnail" - android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" - android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" - android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" - android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" - android:adjustViewBounds="true" - /> - <TextView android:id="@+id/app_label" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" 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 4ef602e..5dd101e 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_recent_panel.xml @@ -79,6 +79,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:background="@drawable/ic_sysbar_back_ime" + android:contentDescription="@string/status_bar_accessibility_dismiss_recents" /> </com.android.systemui.recent.RecentsPanelView> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index b9e6d78..26200ec 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -42,9 +42,19 @@ <string name="status_bar_recent_inspect_item_title">App info</string> <!-- Message shown in the middle of the screen after clicking on the recent apps button - when there are no recent apps to show [CHAR LIMIT=45]--> + when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]--> <string name="status_bar_no_recent_apps">No recent apps</string> + <!-- Content description for the button to dismiss Recent Apps (only present on large + devices) --> + <string name="status_bar_accessibility_dismiss_recents">Dismiss recent apps</string> + + <!-- Message that is read when you enter recent apps in TalkBack --> + <plurals name="status_bar_accessibility_recent_apps"> + <item quantity="one">1 recent app</item> + <item quantity="other">%d recent apps</item> + </plurals> + <!-- The label in the bar at the top of the status bar when there are no notifications showing. [CHAR LIMIT=40]--> <string name="status_bar_no_notifications_title">No notifications</string> @@ -109,14 +119,6 @@ <!-- Separator for PLMN and SPN in network name. --> <string name="status_bar_network_name_separator" translatable="false">"\n"</string> - <!-- Recent Tasks dialog: title [CHAR LIMIT=30] --> - <string name="recent_tasks_title">Recent</string> - <!-- Recent Tasks dialog: message when there are no recent applications [CHAR LIMIT=NONE]--> - <string name="recent_tasks_empty">No recent applications.</string> - - <!-- Recent apps label. Shown as title on recent apps panel --> - <string name="recent_tasks_app_label">Apps</string> - <!-- Network connection string for Bluetooth Reverse Tethering --> <string name="bluetooth_tethered">Bluetooth tethered</string> <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] --> @@ -187,7 +189,7 @@ <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_menu">Menu</string> <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_recent">Recent applications</string> + <string name="accessibility_recent">Recent apps</string> <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_ime_switch_button">Switch input method button.</string> |