diff options
author | Justin Ho <justinho@google.com> | 2011-06-15 14:58:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-15 14:58:56 -0700 |
commit | 40fc6e0de578198c9cc5d9a493cb7db77bc938b8 (patch) | |
tree | 55c680523d373680dbc302c4e7966b48bf3e94f0 | |
parent | ec18268eb42641cd2a6ae9c8b26e35d67bb41021 (diff) | |
parent | c407ef22222f8f7e6f82abd081ecb65149336f99 (diff) | |
download | frameworks_base-40fc6e0de578198c9cc5d9a493cb7db77bc938b8.zip frameworks_base-40fc6e0de578198c9cc5d9a493cb7db77bc938b8.tar.gz frameworks_base-40fc6e0de578198c9cc5d9a493cb7db77bc938b8.tar.bz2 |
am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit 'c407ef22222f8f7e6f82abd081ecb65149336f99':
Updated art for compat mode dialog.
16 files changed, 40 insertions, 27 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/compat_mode_help_diagram.png b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_diagram.png Binary files differnew file mode 100644 index 0000000..944b1f0 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_diagram.png diff --git a/packages/SystemUI/res/drawable-hdpi/compat_mode_help_divider_bottom.9.png b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_divider_bottom.9.png Binary files differnew file mode 100644 index 0000000..2e11928 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_divider_bottom.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/compat_mode_help_divider_top.9.png b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_divider_top.9.png Binary files differnew file mode 100644 index 0000000..58a78b7 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_divider_top.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/compat_mode_help_icon.png b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_icon.png Binary files differnew file mode 100644 index 0000000..46bb891 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_icon.png diff --git a/packages/SystemUI/res/drawable-hdpi/compat_mode_help_top_divider.9.png b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_top_divider.9.png Binary files differnew file mode 100644 index 0000000..03a5639 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/compat_mode_help_top_divider.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/compat_mode_help_diagram.png b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_diagram.png Binary files differnew file mode 100644 index 0000000..518a5c1 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_diagram.png diff --git a/packages/SystemUI/res/drawable-mdpi/compat_mode_help_divider_bottom.9.png b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_divider_bottom.9.png Binary files differnew file mode 100644 index 0000000..3712abf --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_divider_bottom.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/compat_mode_help_divider_top.9.png b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_divider_top.9.png Binary files differnew file mode 100644 index 0000000..a4d08c8 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_divider_top.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/compat_mode_help_icon.png b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_icon.png Binary files differnew file mode 100644 index 0000000..233c4df --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/compat_mode_help_icon.png diff --git a/packages/SystemUI/res/drawable-nodpi/compat_mode_help_bg.png b/packages/SystemUI/res/drawable-nodpi/compat_mode_help_bg.png Binary files differindex d1d32a4..59a70ff 100644 --- a/packages/SystemUI/res/drawable-nodpi/compat_mode_help_bg.png +++ b/packages/SystemUI/res/drawable-nodpi/compat_mode_help_bg.png diff --git a/packages/SystemUI/res/drawable/compat_mode_help_bg.png b/packages/SystemUI/res/drawable/compat_mode_help_bg.png Binary files differnew file mode 100644 index 0000000..87d8c41 --- /dev/null +++ b/packages/SystemUI/res/drawable/compat_mode_help_bg.png diff --git a/packages/SystemUI/res/drawable/compat_mode_help_diagram.png b/packages/SystemUI/res/drawable/compat_mode_help_diagram.png Binary files differdeleted file mode 100644 index e212231..0000000 --- a/packages/SystemUI/res/drawable/compat_mode_help_diagram.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable/compat_mode_help_icon.png b/packages/SystemUI/res/drawable/compat_mode_help_icon.png Binary files differdeleted file mode 100644 index 03bbef9..0000000 --- a/packages/SystemUI/res/drawable/compat_mode_help_icon.png +++ /dev/null diff --git a/packages/SystemUI/res/layout-sw600dp/compat_mode_help.xml b/packages/SystemUI/res/layout-sw600dp/compat_mode_help.xml index df3c5a3..d29e495 100644 --- a/packages/SystemUI/res/layout-sw600dp/compat_mode_help.xml +++ b/packages/SystemUI/res/layout-sw600dp/compat_mode_help.xml @@ -27,51 +27,62 @@ android:id="@+id/header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="160dp" + android:layout_marginLeft="80dp" android:layout_marginTop="80dp" + android:layout_marginRight="80dp" android:textSize="60sp" android:maxLines="1" android:shadowRadius="8" android:shadowColor="#FF000000" android:text="@string/compat_mode_help_header" + android:background="@drawable/compat_mode_help_divider_top" /> <ImageView android:id="@+id/diagram" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="160dp" - android:layout_marginTop="80dp" android:layout_centerInParent="true" android:src="@drawable/compat_mode_help_diagram" /> - <TextView - android:id="@+id/explanation" + <RelativeLayout + android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="80dp" - android:layout_marginRight="240dp" + android:layout_height="190dp" + android:background="@drawable/compat_mode_help_divider_bottom" + android:layout_marginBottom="55dp" + android:layout_marginRight="80dp" android:layout_alignLeft="@id/header" android:layout_alignParentBottom="true" - android:shadowRadius="4" - android:shadowColor="#FF000000" - android:textSize="28sp" - android:text="@string/compat_mode_help_body" - /> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="80dp" - android:layout_alignBottom="@id/explanation" - android:layout_alignParentRight="true" - android:src="@drawable/compat_mode_help_icon" - /> + > + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:src="@drawable/compat_mode_help_icon" + /> + <TextView + android:id="@+id/explanation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/icon" + android:layout_marginRight="10dp" + android:shadowRadius="4" + android:shadowColor="#FF000000" + android:textSize="28sp" + android:text="@string/compat_mode_help_body" + /> + </RelativeLayout> <Button android:id="@+id/button" android:layout_width="208dp" android:layout_height="48dp" android:layout_alignLeft="@id/header" android:layout_alignParentBottom="true" - android:layout_marginBottom="10dp" + android:layout_marginBottom="20dp" android:textSize="28sp" android:text="@android:string/ok" /> 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 index c151565..a33741e 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_compat_mode_panel.xml @@ -31,13 +31,13 @@ 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" /> + <RadioButton android:id="@+id/compat_mode_on_radio" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/compat_mode_on" /> </RadioGroup> </com.android.systemui.statusbar.tablet.CompatModePanel> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 2e01e92..3349a6c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -81,6 +81,7 @@ public class TabletStatusBar extends StatusBar implements HeightReceiver.OnBarHeightChangedListener, InputMethodsPanel.OnHardKeyboardEnabledChangeListener { public static final boolean DEBUG = false; + public static final boolean DEBUG_COMPAT_HELP = false; public static final String TAG = "TabletStatusBar"; @@ -1011,7 +1012,8 @@ public class TabletStatusBar extends StatusBar implements mCompatModeButton.refresh(); if (mCompatModeButton.getVisibility() == View.VISIBLE) { - if (! Prefs.read(mContext).getBoolean(Prefs.SHOWN_COMPAT_MODE_HELP, false)) { + if (DEBUG_COMPAT_HELP + || ! Prefs.read(mContext).getBoolean(Prefs.SHOWN_COMPAT_MODE_HELP, false)) { showCompatibilityHelp(); } } else { |