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

Commit f4fe7fc5 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing issue with hotseat being on the wrong side of the screen in... 

Merge "Fixing issue with hotseat being on the wrong side of the screen in RTL." into ub-launcher3-burnaby
parents 5dd1487d f8c6f885

res/layout-land/launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
            android:id="@+id/hotseat"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="end" />

            android:layout_gravity="right" />



        <include

            android:id="@+id/search_drop_target_bar"

src/com/android/launcher3/DeviceProfile.java

+5 −3
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ public class DeviceProfile { 
        View searchBar = launcher.getSearchBar();

        lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();

        if (hasVerticalBarLayout) {

            // Vertical search bar space

            // Vertical search bar space -- The search bar is fixed in the layout to be on the left

            //                              of the screen regardless of RTL

            lp.gravity = Gravity.LEFT;

            lp.width = searchBarSpaceHeightPx;
@@ -438,8 +439,9 @@ public class DeviceProfile { 
        View hotseat = launcher.findViewById(R.id.hotseat);

        lp = (FrameLayout.LayoutParams) hotseat.getLayoutParams();

        if (hasVerticalBarLayout) {

            // Vertical hotseat

            lp.gravity = Gravity.END;

            // Vertical hotseat -- The hotseat is fixed in the layout to be on the right of the

            //                     screen regardless of RTL

            lp.gravity = Gravity.RIGHT;

            lp.width = hotseatBarHeightPx;

            lp.height = LayoutParams.MATCH_PARENT;

            hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx);