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

Merge "Add rotary support to the nav bar and HUN." into rvc-dev am: 16899978f4 am: 1745f17a07

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

Change-Id: I6f2a923435548046c9bb209e61a968abf247e511
This commit is contained in:
Danny Epstein
2020-06-03 04:05:10 +00:00
committed by Automerger Merge Worker
parent b3e833aa58 1745f17a07
commit 2be47e68cb
12 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/CarSystemUI/res/drawable/nav_button_background.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/nav_bar_ripple_background_color">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="?android:colorAccent"/>
<corners android:radius="6dp"/>
</shape>
</item>
</ripple>

2
packages/CarSystemUI/res/layout/car_left_navigation_bar.xml
View File

@@ -79,7 +79,7 @@
android:gravity="bottom"
android:orientation="vertical">
<com.android.keyguard.AlphaOptimizedImageButton
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/note"
android:layout_height="wrap_content"
android:layout_width="match_parent"

4
packages/CarSystemUI/res/layout/car_navigation_button.xml
View File

@@ -27,7 +27,7 @@
android:animateLayoutChanges="true"
android:orientation="vertical">
<com.android.keyguard.AlphaOptimizedImageButton
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/car_nav_button_icon_image"
android:layout_height="@dimen/car_navigation_button_icon_height"
android:layout_width="match_parent"
@@ -40,7 +40,7 @@
android:clickable="false"
/>
<com.android.keyguard.AlphaOptimizedImageButton
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/car_nav_button_more_icon"
android:layout_height="wrap_content"
android:layout_width="match_parent"

2
packages/CarSystemUI/res/layout/car_right_navigation_bar.xml
View File

@@ -82,7 +82,7 @@
android:gravity="bottom"
android:orientation="vertical">
<com.android.keyguard.AlphaOptimizedImageButton
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/note"
android:layout_height="wrap_content"
android:layout_width="match_parent"

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

@@ -29,6 +29,15 @@
android:orientation="horizontal"
app:layout_constraintGuide_begin="@dimen/headsup_scrim_height"/>
<!-- Include a FocusParkingView at the beginning or end. The rotary controller "parks" the
focus here when the user navigates to another window. This is also used to prevent
wrap-around which is why it must be first or last in Tab order. -->
<com.android.car.ui.FocusParkingView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<View
android:id="@+id/scrim"
android:layout_width="match_parent"

2
packages/CarSystemUI/res/values/styles.xml
View File

@@ -44,6 +44,6 @@
<style name="NavigationBarButton">
<item name="android:layout_height">96dp</item>
<item name="android:layout_width">96dp</item>
<item name="android:background">@drawable/nav_button_background</item>
<item name="android:background">@*android:drawable/item_background_material</item>
</style>
</resources>