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

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

Merge "Move things to com.android.systemui.car" into rvc-dev

parents b67e70aa 51a86330

packages/CarSystemUI/res/layout/car_top_navigation_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
                systemui:intent="intent:#Intent;action=android.car.intent.action.TOGGLE_HVAC_CONTROLS;end"

            />



            <com.android.systemui.statusbar.hvac.AnimatedTemperatureView

            <com.android.systemui.car.hvac.AnimatedTemperatureView

                android:id="@+id/lefttext"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"
@@ -127,7 +127,7 @@ 
                systemui:intent="intent:#Intent;action=android.car.intent.action.TOGGLE_HVAC_CONTROLS;end"

            />



            <com.android.systemui.statusbar.hvac.AnimatedTemperatureView

            <com.android.systemui.car.hvac.AnimatedTemperatureView

                android:id="@+id/righttext"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
          systemui:intent="intent:#Intent;action=android.car.intent.action.TOGGLE_HVAC_CONTROLS;end"

          />



      <com.android.systemui.statusbar.hvac.AnimatedTemperatureView

      <com.android.systemui.car.hvac.AnimatedTemperatureView

          android:id="@+id/lefttext"

          android:layout_width="wrap_content"

          android:layout_height="match_parent"
@@ -123,7 +123,7 @@ 
          systemui:intent="intent:#Intent;action=android.car.intent.action.TOGGLE_HVAC_CONTROLS;end"

          />



      <com.android.systemui.statusbar.hvac.AnimatedTemperatureView

      <com.android.systemui.car.hvac.AnimatedTemperatureView

          android:id="@+id/righttext"

          android:layout_width="wrap_content"

          android:layout_height="match_parent"

packages/CarSystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
        <item>com.android.systemui.theme.ThemeOverlayController</item>

        <item>com.android.systemui.navigationbar.car.CarNavigationBar</item>

        <item>com.android.systemui.toast.ToastUI</item>

        <item>com.android.systemui.voicerecognition.car.ConnectedDeviceVoiceRecognitionNotifier</item>

        <item>com.android.systemui.car.voicerecognition.ConnectedDeviceVoiceRecognitionNotifier</item>

        <item>com.android.systemui.window.SystemUIOverlayWindowManager</item>

    </string-array>

</resources>

packages/CarSystemUI/src/com/android/systemui/CarSystemUIBinder.java

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui; 
import com.android.systemui.biometrics.AuthController;

import com.android.systemui.bubbles.dagger.BubbleModule;

import com.android.systemui.car.notification.CarNotificationModule;

import com.android.systemui.car.voicerecognition.ConnectedDeviceVoiceRecognitionNotifier;

import com.android.systemui.globalactions.GlobalActionsComponent;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.dagger.KeyguardModule;
@@ -38,7 +39,6 @@ import com.android.systemui.statusbar.tv.TvStatusBar; 
import com.android.systemui.theme.ThemeOverlayController;

import com.android.systemui.toast.ToastUI;

import com.android.systemui.util.leak.GarbageMonitor;

import com.android.systemui.voicerecognition.car.ConnectedDeviceVoiceRecognitionNotifier;

import com.android.systemui.volume.VolumeUI;

import com.android.systemui.window.OverlayWindowModule;

import com.android.systemui.window.SystemUIOverlayWindowManager;

packages/CarSystemUI/src/com/android/systemui/statusbar/hvac/AnimatedTemperatureView.java→packages/CarSystemUI/src/com/android/systemui/car/hvac/AnimatedTemperatureView.java

+3 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018 The Android Open Source Project

 * 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.
@@ -11,10 +11,10 @@ 
 * 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

 * limitations under the License.

 */



package com.android.systemui.statusbar.hvac;

package com.android.systemui.car.hvac;



import android.animation.ObjectAnimator;

import android.annotation.SuppressLint;
@@ -35,7 +35,6 @@ import android.widget.TextSwitcher; 
import android.widget.TextView;



import com.android.systemui.R;

import com.android.systemui.navigationbar.car.hvac.TemperatureView;



/**

 * Simple text display of HVAC properties, It is designed to show mTemperature and is configured in