summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-01-24 23:06:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-24 23:06:02 -0800
commit6dfbe59d1f751e04d89eb7904538045b51890339 (patch)
treef881c4084e170301e95d6eb1e2a5ab913bd8cef5 /packages
parent4ea2d2994ac5c7aa346356dba57819dd9285a998 (diff)
parenta7207b110d6065747e2b4cbc65d66b24c34c1c9b (diff)
downloadframeworks_base-6dfbe59d1f751e04d89eb7904538045b51890339.zip
frameworks_base-6dfbe59d1f751e04d89eb7904538045b51890339.tar.gz
frameworks_base-6dfbe59d1f751e04d89eb7904538045b51890339.tar.bz2
am a7207b11: am 5113382e: Tweak layouts of IME switch button
* commit 'a7207b110d6065747e2b4cbc65d66b24c34c1c9b': Tweak layouts of IME switch button
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/layout-xlarge/status_bar_input_methods_item.xml3
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java7
2 files changed, 3 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_input_methods_item.xml b/packages/SystemUI/res/layout-xlarge/status_bar_input_methods_item.xml
index 3028a42..3fef7e0 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_input_methods_item.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_input_methods_item.xml
@@ -47,12 +47,11 @@
android:id="@+id/item_radio"
android:layout_width="30dip"
android:layout_height="wrap_content"
- android:layout_marginRight="11dip"
android:focusable="false"
android:clickable="false" />
<ImageView
android:id="@+id/item_icon"
- android:layout_width="wrap_content"
+ android:layout_width="@android:dimen/app_icon_size"
android:layout_height="wrap_content"
android:scaleType="fitCenter" />
<LinearLayout
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 e26b8ea..9549930 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -81,7 +81,7 @@ public class TabletStatusBar extends StatusBar implements
public static final int MAX_NOTIFICATION_ICONS = 5;
// IME switcher icon is big and occupy width of two icons
- public static final int MAX_NOTIFICATION_ICONS_IME_BUTTON_VISIBLE = MAX_NOTIFICATION_ICONS - 2;
+ public static final int MAX_NOTIFICATION_ICONS_IME_BUTTON_VISIBLE = MAX_NOTIFICATION_ICONS - 1;
public static final int MSG_OPEN_NOTIFICATION_PANEL = 1000;
public static final int MSG_CLOSE_NOTIFICATION_PANEL = 1001;
@@ -860,11 +860,8 @@ public class TabletStatusBar extends StatusBar implements
if (DEBUG) {
Slog.d(TAG, (visible?"showing":"hiding") + " the IME button");
}
- int oldVisibility = mInputMethodSwitchButton.getVisibility();
mInputMethodSwitchButton.setIMEButtonVisible(token, visible);
- if (oldVisibility != mInputMethodSwitchButton.getVisibility()) {
- updateNotificationIcons();
- }
+ updateNotificationIcons();
mInputMethodsPanel.setImeToken(token);
mBackButton.setImageResource(
visible ? R.drawable.ic_sysbar_back_ime : R.drawable.ic_sysbar_back);