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

Commit 540434e8 authored by Danny Epstein's avatar Danny Epstein Committed by Automerger Merge Worker
Browse files

Clean up FocusParkingViews am: 3ea519db 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040150

Change-Id: Ie03dbe2ec81f9419f1f0bbf5860781bf31fc91f2
parents 40baa236 3ea519db

packages/CarSystemUI/res/layout/headsup_container_bottom.xml

+3 −4
Original line number Original line Diff line number Diff line
@@ -29,13 +29,12 @@ 
        android:orientation="horizontal"

        android:orientation="horizontal"

        app:layout_constraintGuide_begin="@dimen/headsup_scrim_height"/>

        app:layout_constraintGuide_begin="@dimen/headsup_scrim_height"/>





    <!-- Include a FocusParkingView at the beginning or end. The rotary controller "parks" the

    <!-- Include a FocusParkingView at the beginning. The rotary controller "parks" the focus here

         focus here when the user navigates to another window. This is also used to prevent

         when the user navigates to another window. This is also used to prevent wrap-around. -->

         wrap-around which is why it must be first or last in Tab order. -->

    <com.android.car.ui.FocusParkingView

    <com.android.car.ui.FocusParkingView

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"/>

        app:layout_constraintTop_toTopOf="parent"/>





    <View

    <View

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/NavigationBarViewFactory.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -148,10 +148,9 @@ public class NavigationBarViewFactory { 
        CarNavigationBarView view = (CarNavigationBarView) View.inflate(mContext, barLayout,

        CarNavigationBarView view = (CarNavigationBarView) View.inflate(mContext, barLayout,

                /* root= */ null);

                /* root= */ null);





        // Include a FocusParkingView at the end. The rotary controller "parks" the focus here when

        // Include a FocusParkingView at the beginning. The rotary controller "parks" the focus here

        // the user navigates to another window. This is also used to prevent wrap-around which is

        // when the user navigates to another window. This is also used to prevent wrap-around.

        // why it must be first or last in Tab order.

        view.addView(new FocusParkingView(mContext), 0);

        view.addView(new FocusParkingView(mContext));





        mCachedViewMap.put(type, view);

        mCachedViewMap.put(type, view);

        return mCachedViewMap.get(type);

        return mCachedViewMap.get(type);