Migrate clock away from SystemBarButton
Element is no longer clickable (as part of the deprecation of quick
settings) so it doesn't need to be a button anymore.
Bug: 204888557
Bug: 196424229
Test: manual
Change-Id: I739037ecee4ef7420fd156a1c57ec99fc6036192
diff --git a/res/layout/car_top_system_bar.xml b/res/layout/car_top_system_bar.xml
index a462b1f..5c1e642 100644
--- a/res/layout/car_top_system_bar.xml
+++ b/res/layout/car_top_system_bar.xml
@@ -39,11 +39,10 @@
android:gravity="center_vertical"
/>
- <com.android.systemui.car.systembar.CarSystemBarButton
+ <FrameLayout
android:id="@+id/clock_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:background="@drawable/system_bar_pill_rotary_background"
android:paddingStart="@dimen/car_padding_2"
android:paddingEnd="@dimen/car_padding_2"
android:layout_centerInParent="true">
@@ -57,7 +56,7 @@
android:textAppearance="@style/TextAppearance.SystemBar.Clock"
systemui:amPmStyle="normal"
/>
- </com.android.systemui.car.systembar.CarSystemBarButton>
+ </FrameLayout>
<include layout="@layout/mic_privacy_chip"
android:layout_width="@dimen/privacy_chip_width"
diff --git a/res/layout/car_top_system_bar_unprovisioned.xml b/res/layout/car_top_system_bar_unprovisioned.xml
index b6b0362..1123034 100644
--- a/res/layout/car_top_system_bar_unprovisioned.xml
+++ b/res/layout/car_top_system_bar_unprovisioned.xml
@@ -49,7 +49,7 @@
/>
</FrameLayout>
- <com.android.systemui.car.systembar.CarSystemBarButton
+ <FrameLayout
android:id="@+id/clock_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -63,7 +63,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.SystemBar.Clock"
systemui:amPmStyle="normal"/>
- </com.android.systemui.car.systembar.CarSystemBarButton>
+ </FrameLayout>
<include layout="@layout/mic_privacy_chip"
android:layout_width="@dimen/privacy_chip_width"
diff --git a/samples/sample1/rro/res/layout/car_right_system_bar.xml b/samples/sample1/rro/res/layout/car_right_system_bar.xml
index 2538334..24a5f02 100644
--- a/samples/sample1/rro/res/layout/car_right_system_bar.xml
+++ b/samples/sample1/rro/res/layout/car_right_system_bar.xml
@@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="110dp"
android:background="@drawable/system_bar_background_3">
- <com.android.systemui.car.systembar.CarSystemBarButton
+ <FrameLayout
android:id="@+id/clock_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -45,7 +45,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
/>
- </com.android.systemui.car.systembar.CarSystemBarButton>
+ </FrameLayout>
</RelativeLayout>
<View
android:layout_width="match_parent"
