Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up FocusParkingViews

Browse Source 
Put FocusParkingView first rather than last and update comment to
indicate that the FocusParkingView must be first. Use start rather
than left to position FocusParkingView first.

Bug: 131421840
Bug: 154540419
Test: manual

Change-Id: I89b9977e1be4722c1e922e360332aa9d631b9540
This commit is contained in:
Danny Epstein
2020-07-01 13:55:01 -07:00
parent 81d4133de9
commit 3ea519db54
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/CarSystemUI/res/layout/headsup_container_bottom.xml
View File

@@ -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

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

@@ -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);