diff options
Diffstat (limited to 'packages/SystemUI/res')
18 files changed, 64 insertions, 11 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_ime_default.png Binary files differdeleted file mode 100644 index eb6eb0c..0000000 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_ime_default.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_ime_pressed.png Binary files differdeleted file mode 100644 index 11f66f5..0000000 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_ime_pressed.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png Binary files differdeleted file mode 100644 index f907de7..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_pressed.png Binary files differdeleted file mode 100644 index 36f8853..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_pressed.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png Binary files differnew file mode 100644 index 0000000..1a9d88c --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_pressed.png Binary files differnew file mode 100644 index 0000000..a6d7507 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png Binary files differindex e2584e3..1e1324a 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png Binary files differindex 58b8510..e4e13c5 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png Binary files differnew file mode 100644 index 0000000..33edce0 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_pressed.png Binary files differnew file mode 100644 index 0000000..8bab6cf --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_pressed.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png Binary files differindex 2795c34..89d486f 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png Binary files differindex bbed6a6..b134436 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png diff --git a/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml b/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml index 977e002..97d0348 100644 --- a/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml +++ b/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml @@ -16,6 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_zoom_pressed" /> + <item android:state_selected="true" android:drawable="@drawable/ic_sysbar_zoom_pressed" /> <item android:drawable="@drawable/ic_sysbar_zoom_default" /> </selector> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar.xml b/packages/SystemUI/res/layout-sw600dp/status_bar.xml index 707a8cb..d9f3f23 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar.xml @@ -75,13 +75,6 @@ systemui:keyCode="82" android:visibility="invisible" /> - <com.android.systemui.statusbar.policy.CompatModeButton - android:id="@+id/compat_button" - android:layout_width="80dip" - android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_zoom" - android:visibility="invisible" - /> </LinearLayout> <!-- fake space bar zone --> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml new file mode 100644 index 0000000..c151565 --- /dev/null +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 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. +*/ +--> + +<com.android.systemui.statusbar.tablet.CompatModePanel + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="@dimen/panel_float" + android:paddingRight="20dp" + > + <RadioGroup android:id="@+id/compat_mode_radio_group" + android:background="@*android:drawable/dialog_full_holo_dark" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:orientation="vertical" + android:padding="10dp" + > + <RadioButton android:id="@+id/compat_mode_on_radio" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/compat_mode_on" /> + <RadioButton android:id="@+id/compat_mode_off_radio" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/compat_mode_off" /> + </RadioGroup> +</com.android.systemui.statusbar.tablet.CompatModePanel> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml index f53b29e..fecfe7f 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml @@ -27,7 +27,7 @@ > <LinearLayout - android:id="@+id/notificationAndImeArea" + android:id="@+id/feedbackIconArea" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="horizontal" @@ -41,7 +41,16 @@ android:src="@drawable/ic_sysbar_ime_default" android:visibility="gone" /> - + + <com.android.systemui.statusbar.policy.CompatModeButton + android:id="@+id/compatModeButton" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginLeft="8dip" + android:src="@drawable/ic_sysbar_zoom" + android:visibility="gone" + /> + <com.android.systemui.statusbar.tablet.NotificationIconArea android:id="@+id/notificationIcons" android:layout_width="wrap_content" @@ -144,4 +153,3 @@ </LinearLayout> </LinearLayout> </LinearLayout> - diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index dec8b67..944e0ee 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -26,5 +26,6 @@ <dimen name="notification_panel_width">512dp</dimen> <!-- The minimum height of the notification panel window --> <dimen name="notification_panel_min_height">770dp</dimen> + <!-- Bottom margin (from display edge) for status bar panels --> + <dimen name="panel_float">56dp</dimen> </resources> - diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 446827b..973a4b2 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -143,4 +143,11 @@ <!-- Checkbox label for USB accessory dialogs. [CHAR LIMIT=50] --> <string name="always_use_accessory">Use by default for this USB accessory</string> + <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running + on a phone). [CHAR LIMIT=25] --> + <string name="compat_mode_on">Zoom to fill screen</string> + + <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets). + [CHAR LIMIT=25] --> + <string name="compat_mode_off">Stretch to fill screen</string> </resources> |
