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

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

Merge "Adding new Style of decor windows for Car use case. This allows for... 

Merge "Adding new Style of decor windows for Car use case. This allows for left, right or bottom navigation bars that can be configured with xml files"
parents c5123419 078235b1

packages/SystemUI/res/drawable/car_ic_hvac.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<!--

    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.

-->

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

    android:width="37dp"

    android:height="31dp"

    android:viewportWidth="37"

    android:viewportHeight="31">



    <group

            android:translateX="-4.000000"

            android:translateY="-6.000000">

        <group

                android:translateX="5.000000"

                android:translateY="5.000000">

            <path

                android:fillType="evenOdd"

                android:strokeColor="#FAFAFA"

                android:strokeWidth="3.5"

                android:pathData="M0.320769938,6.07518051 C6.46754647,1.46509811 12.4222362,1.46509811

18.1848392,6.07518051 C23.9474422,10.6852629 29.3258717,10.4931761

34.3201276,5.49892021" />

            <path

                android:fillType="evenOdd"

                android:strokeColor="#FAFAFA"

                android:strokeWidth="3.5"

                android:pathData="M0.320769938,17.0751805 C6.46754647,12.4650981 12.4222362,12.4650981

18.1848392,17.0751805 C23.9474422,21.6852629 29.3258717,21.4931761

34.3201276,16.4989202" />

            <path

                android:fillType="evenOdd"

                android:strokeColor="#FAFAFA"

                android:strokeWidth="3.5"

                android:pathData="M0.320769938,28.0751805 C6.46754647,23.4650981 12.4222362,23.4650981

18.1848392,28.0751805 C23.9474422,32.6852629 29.3258717,32.4931761

34.3201276,27.4989202" />

        </group>

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/car_ic_notification.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

    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.

-->

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

    android:width="56dp"

    android:height="56dp"

    android:viewportWidth="48"

    android:viewportHeight="48">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M24 44c2.21 0 4-1.79 4-4h-8c0 2.21 1.79 4 4

4zm12-12V22c0-6.15-3.27-11.28-9-12.64V8c0-1.66-1.34-3-3-3s-3 1.34-3 3v1.36c-5.73

1.36-9 6.49-9 12.64v10l-4 4v2h32v-2l-4-4zm-4 2H16V22c0-4.97 3.03-9 8-9s8 4.03 8

9v12z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/car_ic_overview.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 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="56dp"

    android:height="56dp"

    android:viewportWidth="48"

    android:viewportHeight="48">



    <path

        android:pathData="M0 0h48v48H0z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm0 36c-8.82

0-16-7.18-16-16S15.18 8 24 8s16 7.18 16 16-7.18 16-16 16z" />

</vector>

packages/SystemUI/res/layout/car_facet_button.xml

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

<!--

**

** Copyright 2017, 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:background="@android:color/transparent"

            android:scaleType="fitCenter">

        </com.android.keyguard.AlphaOptimizedImageButton>



    </LinearLayout>

</merge>

packages/SystemUI/res/layout/car_left_navigation_bar.xml

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

<!--

**

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

*/

-->



<com.android.systemui.statusbar.car.CarNavigationBarView

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

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

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:orientation="vertical"

    android:background="@drawable/system_bar_background">



    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:id="@+id/nav_buttons"

        android:orientation="vertical"

        android:gravity="top"

        android:paddingTop="30dp"

        android:layout_weight="1"

        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.statusbar.car.CarNavigationButton

            android:id="@+id/home"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

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

            android:src="@drawable/car_ic_overview"

            android:background="?android:attr/selectableItemBackground"

            android:paddingTop="30dp"

            android:paddingBottom="30dp"

        />



        <com.android.systemui.statusbar.car.CarNavigationButton

            android:id="@+id/hvac"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            systemui:intent="intent:#Intent;action=android.car.intent.action.SHOW_HVAC_CONTROLS;end"

            systemui:broadcast="true"

            android:src="@drawable/car_ic_hvac"

            android:background="?android:attr/selectableItemBackground"

            android:paddingTop="30dp"

            android:paddingBottom="30dp"

        />

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="bottom"

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/notifications"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:src="@drawable/car_ic_notification"

            android:background="?android:attr/selectableItemBackground"

            android:paddingTop="20dp"

            android:paddingBottom="20dp"

            android:alpha="0.7"

        />



        <com.android.systemui.statusbar.policy.Clock

            android:id="@+id/clock"

            android:textAppearance="@style/TextAppearance.StatusBar.Clock"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:singleLine="true"

            android:paddingStart="@dimen/status_bar_clock_starting_padding"

            android:paddingEnd="@dimen/status_bar_clock_end_padding"

            android:gravity="center_horizontal"

            android:paddingBottom="20dp"

        />



        <Space

            android:layout_height="10dp"

            android:layout_width="match_parent"/>



    </LinearLayout>



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