Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf7c971 authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Move IME button to right side by new desing spec"

parents 0252a7eb 9b40747a

packages/SystemUI/res/layout-xlarge/status_bar.xml

+8 −16
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ 
            android:layout_alignParentRight="true"

            android:orientation="horizontal"

            >

            <com.android.systemui.statusbar.tablet.InputMethodButton

                android:id="@+id/imeSwitchButton"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginLeft="8dip"

                android:src="@drawable/ic_sysbar_ime_default"

                android:visibility="invisible"

                />

            <com.android.systemui.statusbar.tablet.NotificationIconArea

                android:id="@+id/notificationIcons"

                android:layout_width="wrap_content"
@@ -191,22 +199,6 @@ 
                    android:visibility="gone"

                    />

            </com.android.systemui.statusbar.tablet.ShirtPocket>

            <com.android.systemui.statusbar.tablet.InputMethodButton

                android:id="@+id/imeSwitchButton"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginLeft="8dip"

                android:src="@drawable/ic_sysbar_ime_default"

                android:visibility="invisible"

                />

            <com.android.systemui.statusbar.tablet.InputMethodButton

                android:id="@+id/imeShortcutButton"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginLeft="8dip"

                android:src="@drawable/ic_sysbar_ime_default"

                android:visibility="invisible"

                />

        </LinearLayout>



        <!-- lights out mode: "shadow" views -->

packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ public class InputMethodButton extends ImageView { 
    private static final boolean DEBUG = false;



    private static final int ID_IME_SWITCH_BUTTON = R.id.imeSwitchButton;

    private static final int ID_IME_SHORTCUT_BUTTON = R.id.imeShortcutButton;

    // IME shortcut button is disabled.

    private static final int ID_IME_SHORTCUT_BUTTON = 0;



    // other services we wish to talk to

    private final InputMethodManager mImm;

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+0 −3
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ public class TabletStatusBar extends StatusBar { 
    View mRecentButton;



    InputMethodButton mInputMethodSwitchButton;

    InputMethodButton mInputMethodShortcutButton;



    NotificationPanel mNotificationPanel;

    NotificationPeekPanel mNotificationPeekWindow;
@@ -304,7 +303,6 @@ public class TabletStatusBar extends StatusBar { 


        // The bar contents buttons

        mInputMethodSwitchButton = (InputMethodButton) sb.findViewById(R.id.imeSwitchButton);

        mInputMethodShortcutButton = (InputMethodButton) sb.findViewById(R.id.imeShortcutButton);



        // "shadows" of the status bar features, for lights-out mode

        mBackShadow = sb.findViewById(R.id.back_shadow);
@@ -698,7 +696,6 @@ public class TabletStatusBar extends StatusBar { 
            Slog.d(TAG, (visible?"showing":"hiding") + " the IME button");

        }

        mInputMethodSwitchButton.setIMEButtonVisible(token, visible);

        mInputMethodShortcutButton.setIMEButtonVisible(token, visible);

        mBackButton.setImageResource(

                visible ? R.drawable.ic_sysbar_back_ime : R.drawable.ic_sysbar_back);

    }