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

Commit 18a9a6cb authored by Julia Kawano's avatar Julia Kawano Committed by Julia Kawano
Browse files

Set HVAC temp asynchronously 

The submitted patch of ag/162598687 (patch 6) did not include the final
changes made the to HVAC controller and the XML fixes (patch 5). Adding
those changes that should have been included, namely async setting the
hvac temperature and making the adjustable temperature button values
overlayable.

Bug: 162598687
Test: atest AdjustableTemperatureViewTest
Test: atest HvacControllerTest
Test: atest TemperatureTextViewTest
Change-Id: Ieaaf4b1e8ea892ac2c16f4aec028c357277e8ae7
parent cc74d783

packages/CarSystemUI/res/drawable/hvac_decrease_button.xml

+6 −6
Original line number Diff line number Diff line
@@ -27,20 +27,20 @@ 
                    android:width="@dimen/system_bar_icon_drawing_size"

                    android:height="@dimen/system_bar_icon_drawing_size"/>

                <solid

                    android:color="#3C4043"/>

                    android:color="@color/hvac_temperature_adjust_button_color"/>

            </shape>

        </aapt:attr>

    </item>

    <item android:gravity="center"

          android:width="48dp"

          android:height="48dp">

          android:width="@dimen/system_bar_icon_drawing_size"

          android:height="@dimen/system_bar_icon_drawing_size">

        <aapt:attr name="android:drawable">

            <vector android:width="48dp"

                    android:height="48dp"

            <vector android:width="@dimen/system_bar_icon_drawing_size"

                    android:height="@dimen/system_bar_icon_drawing_size"

                    android:viewportWidth="24.0"

                    android:viewportHeight="24.0">

                <path

                    android:fillColor="#8AB4F8"

                    android:fillColor="@color/hvac_temperature_decrease_arrow_color"

                    android:pathData="M14,7l-5,5 5,5V7z"/>

            </vector>

        </aapt:attr>

packages/CarSystemUI/res/drawable/hvac_increase_button.xml

+6 −6
Original line number Diff line number Diff line
@@ -27,20 +27,20 @@ 
                    android:width="@dimen/system_bar_icon_drawing_size"

                    android:height="@dimen/system_bar_icon_drawing_size"/>

                <solid

                    android:color="#3C4043"/>

                    android:color="@color/hvac_temperature_adjust_button_color"/>

            </shape>

        </aapt:attr>

    </item>

    <item android:gravity="center"

          android:width="48dp"

          android:height="48dp">

          android:width="@dimen/system_bar_icon_drawing_size"

          android:height="@dimen/system_bar_icon_drawing_size">

        <aapt:attr name="android:drawable">

            <vector android:width="48dp"

                    android:height="48dp"

            <vector android:width="@dimen/system_bar_icon_drawing_size"

                    android:height="@dimen/system_bar_icon_drawing_size"

                    android:viewportWidth="24.0"

                    android:viewportHeight="24.0">

                <path

                    android:fillColor="#F28B82"

                    android:fillColor="@color/hvac_temperature_increase_arrow_color"

                    android:pathData="M10,17l5,-5 -5,-5v10z"/>

            </vector>

        </aapt:attr>

packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml

+0 −4
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ 
          android:textAppearance="@style/TextAppearance.CarStatus"

          systemui:hvacAreaId="49"

          systemui:hvacPivotOffset="60dp"

          systemui:hvacPropertyId="358614275"

          systemui:hvacTempFormat="%.0f\u00B0"

          />

    </FrameLayout>
@@ -130,8 +128,6 @@ 
          android:textAppearance="@style/TextAppearance.CarStatus"

          systemui:hvacAreaId="68"

          systemui:hvacPivotOffset="60dp"

          systemui:hvacPropertyId="358614275"

          systemui:hvacTempFormat="%.0f\u00B0"

          />

    </FrameLayout>

  </RelativeLayout>

packages/CarSystemUI/res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ 
    <color name="status_bar_background_color">#33000000</color>

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



    <!-- colors for hvac temperature view -->

    <color name="hvac_temperature_adjust_button_color">#3C4043</color>

    <color name="hvac_temperature_decrease_arrow_color">#8AB4F8</color>

    <color name="hvac_temperature_increase_arrow_color">#F28B82</color>



    <!-- The background color of the notification shade -->

    <color name="notification_shade_background_color">#D6000000</color>

packages/CarSystemUI/res/values/dimens.xml

+8 −2
Original line number Diff line number Diff line
@@ -48,8 +48,14 @@ 


    <dimen name="system_bar_user_icon_padding">16dp</dimen>

    <dimen name="system_bar_user_icon_drawing_size">36dp</dimen>

    <!-- Padding on either side of the group of all system bar buttons -->

    <dimen name="system_bar_button_group_padding">64dp</dimen>

    <dimen name="system_bar_icon_drawing_size">44dp</dimen>

    <dimen name="system_bar_button_size">76dp</dimen>

    <!-- Margin between the system bar buttons -->

    <dimen name="system_bar_button_margin">32dp</dimen>

    <!-- Padding between the system bar button and the icon within it -->

    <dimen name="system_bar_button_padding">16dp</dimen>



    <!-- The amount by which to scale up the status bar icons. -->

    <item name="status_bar_icon_scale_factor" format="float" type="dimen">1.75</item>
@@ -61,8 +67,8 @@ 
    <dimen name="hvac_temperature_text_padding">8dp</dimen>

    <dimen name="hvac_temperature_button_size">76dp</dimen>

    <!--These values represent MIN and MAX for hvac-->

    <item name="hvac_min_value_celsius" format="float" type="dimen">0</item>

    <item name="hvac_max_value_celsius" format="float" type="dimen">126</item>

    <item name="hvac_min_value_celsius" format="float" type="dimen">10</item>

    <item name="hvac_max_value_celsius" format="float" type="dimen">35</item>



    <!-- Largest size an avatar might need to be drawn in the user picker, status bar, or

         quick settings header -->