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

Commit 58c4c36f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make assistant button display the icon of the role holder application"... 

Merge "Make assistant button display the icon of the role holder application" into rvc-dev am: 0b1e87f8 am: 002a2702 am: ce6470c4 am: 185a6b93

Change-Id: I96254819ee92cf68450cf739e2ee0f52d20c878a
parents eb98a64a 185a6b93

packages/CarSystemUI/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
    <uses-permission android:name="android.car.permission.CAR_ENROLL_TRUST"/>

    <!-- This permission is required to get bluetooth broadcast. -->

    <uses-permission android:name="android.permission.BLUETOOTH" />

    <!-- These permissions are required to implement icons based on role holders. -->

    <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS"/>

    <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS"/>

    <!-- This permission is required to access app information from other users. -->

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>

    <!-- This permission is required to check the foreground user id. -->

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

</manifest>

packages/CarSystemUI/res/layout/car_navigation_bar.xml

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ 
            android:id="@+id/assist"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/ic_mic_white"

            systemui:useDefaultAppIconForRole="true"

        />



    </LinearLayout>

packages/CarSystemUI/res/layout/car_navigation_button.xml

+4 −1
Original line number Diff line number Diff line
@@ -29,12 +29,14 @@ 


        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/car_nav_button_icon_image"

            android:layout_height="wrap_content"

            android:layout_height="@dimen/car_navigation_button_icon_height"

            android:layout_width="match_parent"

            android:layout_gravity="center"

            android:animateLayoutChanges="true"

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

            android:scaleType="fitCenter"

            android:tintMode="src_in"

            android:tint="@color/car_nav_icon_fill_color"

            android:clickable="false"

        />
@@ -48,6 +50,7 @@ 
            android:background="@android:color/transparent"

            android:scaleType="fitCenter"

            android:clickable="false"

            android:visibility="gone"

        />



        <ImageView

packages/CarSystemUI/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ 
        <attr name="showMoreWhenSelected" format="boolean" />

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

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

        <!-- whether to show the icon of the app currently associated this button's role. Only

             relevant for buttons associated to specific roles (e.g.: AssistantButton).

             Defaults false -->

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

    </declare-styleable>



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

packages/CarSystemUI/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>

    <color name="car_user_switcher_add_user_background_color">#131313</color>

    <color name="car_user_switcher_add_user_add_sign_color">@*android:color/car_body1_light</color>

    <color name="car_nav_icon_fill_color">#8Fffffff</color>

    <color name="car_nav_icon_fill_color">#8F8F8F</color>

    <color name="car_nav_icon_fill_color_selected">#ffffff</color>

    <!-- colors for seekbar -->

    <color name="car_seekbar_track_background">#131315</color>