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

Commit 67f5e514 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Move navigation bar to right-hand-side of seascape."

parents 3b92427e f86f898f

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


    <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be

         autodetected from the Configuration. -->

    <bool name="config_showNavigationBar">false</bool>

    <bool name="config_showNavigationBar">true</bool>



</resources>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+5 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import com.android.internal.statusbar.IStatusBarService; 
import com.android.systemui.R;



public class NavigationBarView extends LinearLayout {

    final static boolean NAVBAR_ALWAYS_AT_RIGHT = true;



    protected IStatusBarService mBarService;

    final Display mDisplay;

    View[] mRotatedViews = new View[4];
@@ -88,7 +90,9 @@ public class NavigationBarView extends LinearLayout { 


        mRotatedViews[Surface.ROTATION_90] = findViewById(R.id.rot90);

        

        mRotatedViews[Surface.ROTATION_270] = findViewById(R.id.rot270);

        mRotatedViews[Surface.ROTATION_270] = NAVBAR_ALWAYS_AT_RIGHT

                                                ? findViewById(R.id.rot90)

                                                : findViewById(R.id.rot270);

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −1
Original line number Diff line number Diff line
@@ -360,7 +360,9 @@ public class PhoneStatusBar extends StatusBar { 
                break;

            case Surface.ROTATION_270:

                // device has been turned 90deg clockwise

                lp.gravity = Gravity.LEFT | Gravity.FILL_VERTICAL;

                lp.gravity = (NavigationBarView.NAVBAR_ALWAYS_AT_RIGHT ? Gravity.RIGHT

                                                                       : Gravity.LEFT) 

                             | Gravity.FILL_VERTICAL;

                break;

            default:

                lp.gravity = Gravity.BOTTOM | Gravity.FILL_HORIZONTAL;