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

Commit 3a533679 authored by Julia Kawano's avatar Julia Kawano
Browse files

Add qs icon and fix status icon UI 

- Adding settings icon (gear) to status icons
- Modify spacing between each status icon
- Modify size of network connectivity icon to be the same as system
icons

Bug: 168939484
Test: Manual - built on flame_car
Change-Id: Icfd05e4bdd011561789c8b2851709f476cb7751e
parent 1f7549e4

packages/CarSystemUI/res/drawable/car_ic_settings_icon.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<!--

  ~ Copyright (C) 2020 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.

  -->



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

    android:width="@*android:dimen/status_bar_system_icon_size"

    android:height="@*android:dimen/status_bar_system_icon_size"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="@color/system_bar_icon_color"

      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4C9.75,2 9.54,2.18 9.51,2.42L9.13,5.07C8.52,5.32 7.96,5.66 7.44,6.05l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46C2.21,8.95 2.27,9.22 2.46,9.37l2.11,1.65C4.53,11.34 4.5,11.67 4.5,12s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65C9.54,21.82 9.75,22 10,22h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64L19.43,12.98zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5S13.93,15.5 12,15.5z"/>

</vector>

packages/CarSystemUI/res/drawable/car_ic_user_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
    android:viewportHeight="24">

  <path

      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"

      android:fillColor="@color/system_bar_user_icon_color"/>

      android:fillColor="@color/system_bar_icon_color"/>

</vector>
 
 No newline at end of file

packages/CarSystemUI/res/layout/car_top_navigation_bar.xml

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
            android:layout_height="match_parent"

            android:layout_alignParentStart="true"

            android:layout_marginTop="@dimen/car_padding_2"

            android:layout_marginStart="@dimen/car_padding_2"

            android:layout_centerVertical="true"

            android:gravity="center_vertical"

        >
@@ -44,7 +45,6 @@ 
                android:layout_height="match_parent"

                android:background="@drawable/system_bar_background_pill"

                android:layout_weight="1"

                android:layout_marginStart="@dimen/car_padding_2"

                android:gravity="center_vertical"

                systemui:intent="intent:#Intent;component=com.android.car.settings/.common.CarSettingActivities$QuickSettingActivity;launchFlags=0x24000000;end">
@@ -53,6 +53,8 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:layout_marginStart="@dimen/car_padding_2"

                    android:layout_marginEnd="@dimen/car_padding_2"

                    android:gravity="center_vertical"

                />

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

packages/CarSystemUI/res/layout/system_icons.xml

+10 −2
Original line number Diff line number Diff line
@@ -20,16 +20,24 @@ 
    android:id="@+id/system_icons"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center_vertical">

    android:gravity="center_vertical"

    android:orientation="horizontal">



    <com.android.systemui.statusbar.phone.StatusIconContainer

        android:id="@+id/statusIcons"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:padding="10dp"

        android:scaleType="fitCenter"

        android:gravity="center_vertical"

        android:orientation="horizontal"

    />



    <ImageView

        android:id="@+id/settingsIcon"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_marginStart="@dimen/car_padding_2"

        android:src="@drawable/car_ic_settings_icon"

    />

</LinearLayout>
 
 No newline at end of file

packages/CarSystemUI/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


    <!-- colors for status bar -->

    <color name="system_bar_background_pill_color">#282A2D</color>

    <color name="system_bar_user_icon_color">#FFFFFF</color>

    <color name="system_bar_icon_color">#FFFFFF</color>

    <color name="system_bar_text_color">#FFFFFF</color>

    <color name="status_bar_background_color">#33000000</color>

    <drawable name="system_bar_background">@color/status_bar_background_color</drawable>