From a268e5e7195cc584c26047ddccf91c9688d9f914 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Fri, 15 Jan 2021 18:22:00 -0800
Subject: Update toolbar usage

Use car-ui-lib's base layout style of
toolbar, the old one is deprecated.

Also in this cl: removing an unneccesary
<provider> tag from the manifest, and using
sdk_version: current instead of system_current
to completely unbundle calendar.

Fixes: 177703290
Test: atest CarCalendarUiTests CarCalendarUnitTests
Change-Id: I5690b23933cb074acde6d4bc08f4d656f5c7db91
---
 res/layout/calendar.xml | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/calendar.xml b/res/layout/calendar.xml
index 56de478..7fb0bb0 100644
--- a/res/layout/calendar.xml
+++ b/res/layout/calendar.xml
@@ -13,36 +13,23 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical">
-
-    <com.android.car.ui.toolbar.Toolbar
-        android:id="@+id/toolbar"
+    android:layout_width="match_parent">
+    <com.android.car.ui.recyclerview.CarUiRecyclerView
+        android:id="@+id/events"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:title="@string/app_name"
+        android:layout_height="match_parent"
         />
 
-    <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent">
-        <com.android.car.ui.recyclerview.CarUiRecyclerView
-            android:id="@+id/events"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            />
-
-        <TextView
-            android:id="@+id/no_events_text"
-            android:maxWidth="200dp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="@dimen/car_ui_list_item_start_inset"
-            android:gravity="center"
-            android:textAppearance="@style/NoEventsText"/>
-
-    </FrameLayout>
+    <TextView
+        android:id="@+id/no_events_text"
+        android:maxWidth="200dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/car_ui_list_item_start_inset"
+        android:gravity="center"
+        android:textAppearance="@style/NoEventsText"/>
 
-</LinearLayout>
+</FrameLayout>
-- 
cgit v1.2.3