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

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

Merge "Add an option to display HVAC temp values in sysui" into pi-dev

parents a210ef26 38b46f82

packages/SystemUI/Android.mk

+2 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    SystemUI-tags \

    SystemUI-tags \

    SystemUI-proto

    SystemUI-proto





LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_JAVA_LIBRARIES := telephony-common \

    android.car





LOCAL_PACKAGE_NAME := SystemUI

LOCAL_PACKAGE_NAME := SystemUI

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_PRIVATE_PLATFORM_APIS := true

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -205,6 +205,9 @@ 
    <!-- Listen app op changes -->

    <!-- Listen app op changes -->

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

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





    <!-- to read and change hvac values in a car -->

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



    <application

    <application

        android:name=".SystemUIApplication"

        android:name=".SystemUIApplication"

        android:persistent="true"

        android:persistent="true"

packages/SystemUI/res/layout/car_facet_button.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:animateLayoutChanges="true"

            android:animateLayoutChanges="true"

            android:src="@drawable/car_ic_arrow"

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

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

            android:scaleType="fitCenter">

            android:scaleType="fitCenter">

        </com.android.keyguard.AlphaOptimizedImageButton>

        </com.android.keyguard.AlphaOptimizedImageButton>

packages/SystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml

0 → 100644
+62 −0
Original line number Original line 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.

*/

-->



<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.TOGGLE_HVAC_CONTROLS;end"

            systemui:broadcast="true"

            android:src="@drawable/car_ic_hvac"

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

            android:paddingTop="30dp"

            android:paddingBottom="30dp"

        />

    </LinearLayout>

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

packages/SystemUI/res/layout/car_navigation_bar_unprovisioned.xml

0 → 100644
+61 −0
Original line number Original line 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.

*/

-->



<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:background="@drawable/system_bar_background">



    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:orientation="horizontal"

        android:id="@+id/nav_buttons"

        android:gravity="left"

        android:paddingLeft="30dp"

        android:layout_weight="1"

        android:animateLayoutChanges="true">



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

            android:id="@+id/home"

            android:layout_height="match_parent"

            android:layout_width="wrap_content"

            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:paddingLeft="30dp"

            android:paddingRight="30dp"

        />



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

            android:id="@+id/hvac"

            android:layout_height="match_parent"

            android:layout_width="wrap_content"

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

            systemui:broadcast="true"

            android:src="@drawable/car_ic_hvac"

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

            android:paddingLeft="30dp"

            android:paddingRight="30dp"

        />

    </LinearLayout>

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