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

Commit c7ce0f2d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "aae_navbutton_refactor" 

* changes:
  Move attrs_car from SysUI to attrs in CarSystemUI
  Merge CarFacetButton and CarNavigationButton into a single class and add test coverage
parents d28a099f 54bef9dd

packages/CarSystemUI/res/layout/car_facet_button.xml

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 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.

*/

-->



<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/car_facet_button"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="center"

        android:animateLayoutChanges="true"

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/car_nav_button_icon"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:animateLayoutChanges="true"

            android:background="@android:color/transparent"

            android:scaleType="fitCenter">

        </com.android.keyguard.AlphaOptimizedImageButton>



        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/car_nav_button_more_icon"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:animateLayoutChanges="true"

            android:src="@drawable/car_ic_arrow"

            android:background="@android:color/transparent"

            android:scaleType="fitCenter">

        </com.android.keyguard.AlphaOptimizedImageButton>



    </LinearLayout>

</merge>

packages/CarSystemUI/res/layout/car_navigation_bar.xml

+10 −12
Original line number Diff line number Diff line
@@ -33,14 +33,14 @@ 
        android:paddingEnd="20dp"

        android:gravity="center">



        <com.android.systemui.navigationbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/home"

            style="@style/NavigationBarButton"

            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"

            systemui:icon="@drawable/car_ic_overview"

            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"

            systemui:selectedIcon="@drawable/car_ic_overview_selected"

            systemui:useMoreIcon="false"

            systemui:highlightWhenSelected="true"

        />



        <Space
@@ -48,14 +48,14 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.navigationbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/maps_nav"

            style="@style/NavigationBarButton"

            systemui:categories="android.intent.category.APP_MAPS"

            systemui:icon="@drawable/car_ic_navigation"

            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;launchFlags=0x14000000;end"

            systemui:selectedIcon="@drawable/car_ic_navigation_selected"

            systemui:useMoreIcon="false"

            systemui:highlightWhenSelected="true"

        />



        <Space
@@ -63,7 +63,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.navigationbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/music_nav"

            style="@style/NavigationBarButton"

            systemui:categories="android.intent.category.APP_MUSIC"
@@ -71,7 +71,7 @@ 
            systemui:intent="intent:#Intent;action=android.car.intent.action.MEDIA_TEMPLATE;launchFlags=0x10000000;end"

            systemui:packages="com.android.car.media"

            systemui:selectedIcon="@drawable/car_ic_music_selected"

            systemui:useMoreIcon="false"

            systemui:highlightWhenSelected="true"

        />



        <Space
@@ -79,14 +79,14 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.navigationbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/phone_nav"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/car_ic_phone"

            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"

            systemui:packages="com.android.car.dialer"

            systemui:selectedIcon="@drawable/car_ic_phone_selected"

            systemui:useMoreIcon="false"

            systemui:highlightWhenSelected="true"

        />



        <Space
@@ -94,14 +94,14 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.navigationbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/grid_nav"

            style="@style/NavigationBarButton"

            systemui:componentNames="com.android.car.carlauncher/.AppGridActivity"

            systemui:icon="@drawable/car_ic_apps"

            systemui:intent="intent:#Intent;component=com.android.car.carlauncher/.AppGridActivity;launchFlags=0x24000000;end"

            systemui:selectedIcon="@drawable/car_ic_apps_selected"

            systemui:useMoreIcon="false"

            systemui:highlightWhenSelected="true"

        />



        <Space
@@ -115,7 +115,6 @@ 
            systemui:icon="@drawable/car_ic_notification"

            systemui:longIntent="intent:#Intent;component=com.android.car.bugreport/.BugReportActivity;end"

            systemui:selectedIcon="@drawable/car_ic_notification_selected"

            systemui:useMoreIcon="false"

        />



        <Space
@@ -127,7 +126,6 @@ 
            android:id="@+id/assist"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/ic_mic_white"

            systemui:useMoreIcon="false"

        />



    </LinearLayout>

packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml

+3 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:paddingStart="@*android:dimen/car_padding_5"

        android:paddingEnd="@*android:dimen/car_padding_5">



        <com.android.systemui.navigationbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/home"

            android:layout_width="@*android:dimen/car_touch_target_size"

            android:layout_height="match_parent"
@@ -39,7 +39,8 @@ 
            systemui:icon="@drawable/car_ic_overview"

            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"

            systemui:selectedIcon="@drawable/car_ic_overview_selected"

            systemui:useMoreIcon="false"/>

            systemui:highlightWhenSelected="true"

        />

    </LinearLayout>

</com.android.systemui.navigationbar.car.CarNavigationBarView>

packages/CarSystemUI/res/layout/car_navigation_button.xml

+28 −6
Original line number Diff line number Diff line
@@ -18,12 +18,34 @@ 
-->



<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <com.android.keyguard.AlphaOptimizedImageButton

    <LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/car_nav_button_icon"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="center"

        android:animateLayoutChanges="true"

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/car_nav_button_icon_image"

            android:layout_height="wrap_content"

        android:layout_width="@dimen/car_navigation_button_width"

        android:layout_centerInParent="true"

            android:layout_width="match_parent"

            android:animateLayoutChanges="true"

            android:background="@android:color/transparent"

            android:scaleType="fitCenter">

        </com.android.keyguard.AlphaOptimizedImageButton>



        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/car_nav_button_more_icon"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:animateLayoutChanges="true"

            android:src="@drawable/car_ic_arrow"

            android:background="@android:color/transparent"

            android:scaleType="fitCenter">

        </com.android.keyguard.AlphaOptimizedImageButton>



    </LinearLayout>

</merge>

packages/CarSystemUI/res/values/attrs.xml

+69 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 
  -->



<resources>

    <attr name="icon" format="reference"/>

    <attr name="selectedIcon" format="reference"/>

    <attr name="intent" format="string"/>

    <attr name="longIntent" format="string"/>

    <attr name="selectedAlpha" format="float" />

    <attr name="unselectedAlpha" format="float" />



    <!-- Custom attributes to configure hvac values -->

    <declare-styleable name="AnimatedTemperatureView">
@@ -32,4 +38,67 @@ 
        <attr name="android:minEms"/>

        <attr name="android:textAppearance"/>

    </declare-styleable>



    <!-- Allow for custom attribs to be added to a nav button -->

    <declare-styleable name="CarNavigationButton">

        <!-- intent to start when button is click -->

        <attr name="intent" />

        <!-- intent to start when a long press has happened -->

        <attr name="longIntent" />

        <!-- start the intent as a broad cast instead of an activity if true-->

        <attr name="broadcast" format="boolean"/>

        <!-- Alpha value to used when in selected state.  Defaults 1f  -->

        <attr name="selectedAlpha" />

        <!-- Alpha value to used when in un-selected state.  Defaults 0.7f  -->

        <attr name="unselectedAlpha" />

        <!-- icon to be rendered when in selected state -->

        <attr name="selectedIcon" />

        <!-- icon to be rendered (drawable) -->

        <attr name="icon"/>

        <!-- categories that will be added as extras to the fired intents -->

        <attr name="categories" format="string"/>

        <!-- package names that will be added as extras to the fired intents -->

        <attr name="packages" format="string" />

        <!-- componentName names that will be used for detecting selected state -->

        <attr name="componentNames" format="string" />

        <!-- whether to highlight the button when selected. Defaults false -->

        <attr name="showMoreWhenSelected" format="boolean" />

        <!-- whether to highlight the button when selected. Defaults false -->

        <attr name="highlightWhenSelected" format="boolean" />

    </declare-styleable>



    <!-- Custom attributes to configure hvac values -->

    <declare-styleable name="TemperatureView">

        <attr name="hvacAreaId" format="integer"/>

        <attr name="hvacPropertyId" format="integer"/>

        <attr name="hvacTempFormat" format="string"/>

    </declare-styleable>



    <declare-styleable name="carVolumeItems"/>

    <declare-styleable name="carVolumeItems_item">

        <!-- Align with AudioAttributes.USAGE_* -->

        <attr name="usage">

            <enum name="unknown" value="0"/>

            <enum name="media" value="1"/>

            <enum name="voice_communication" value="2"/>

            <enum name="voice_communication_signalling" value="3"/>

            <enum name="alarm" value="4"/>

            <enum name="notification" value="5"/>

            <enum name="notification_ringtone" value="6"/>

            <enum name="notification_communication_request" value="7"/>

            <enum name="notification_communication_instant" value="8"/>

            <enum name="notification_communication_delayed" value="9"/>

            <enum name="notification_event" value="10"/>

            <enum name="assistance_accessibility" value="11"/>

            <enum name="assistance_navigation_guidance" value="12"/>

            <enum name="assistance_sonification" value="13"/>

            <enum name="game" value="14"/>

            <!-- hidden, do not use -->

            <!-- enum name="virtual_source" value="15"/ -->

            <enum name="assistant" value="16"/>

        </attr>



        <!-- Icon resource ids to render on UI -->

        <attr name="icon" />

    </declare-styleable>

</resources>