From 8223fa0da7ea4c49d7bed2322edf38a989d125b8 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
Fixes: 197356281
Test: atest CarCalendarUiTests CarCalendarUnitTests
Change-Id: I5690b23933cb074acde6d4bc08f4d656f5c7db91
(cherry picked from commit a268e5e7195cc584c26047ddccf91c9688d9f914)
(cherry picked from commit b4f0b2a7fa82193bd5989897b1ded7af1b22abf8)
---
 Android.bp                                         |  7 ++--
 AndroidManifest.xml                                | 15 +-------
 res/layout/calendar.xml                            | 41 ++++++++--------------
 .../android/car/calendar/CarCalendarActivity.java  |  5 +++
 4 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/Android.bp b/Android.bp
index a5d91b7..ccddad5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,15 +21,16 @@ android_app {
     name: "CarCalendarApp",
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
-    sdk_version: "system_current",
-    min_sdk_version: "29",
+    sdk_version: "current",
+    target_sdk_version: "29",
+    min_sdk_version: "28",
     optimize: {
         enabled: false,
     },
     dex_preopt: {
         enabled: false,
     },
-    libs: ["android.car-system-stubs"],
+    libs: ["android.car-stubs"],
     static_libs: [
         "car-ui-lib",
         "androidx.lifecycle_lifecycle-extensions",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4921dae..56ce764 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,10 +18,6 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.android.car.calendar">
 
-    <uses-sdk
-            android:minSdkVersion="28"
-            android:targetSdkVersion="29"/>
-
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
@@ -29,7 +25,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_calendar_sync"
         android:label="@string/app_name"
-        android:theme="@style/Theme.CarUi"
+        android:theme="@style/Theme.CarUi.WithToolbar"
         android:supportsRtl="true">
 
         <activity android:name=".CarCalendarActivity"
@@ -41,15 +37,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
-        <!-- Work around b/113294940.  -->
-        <provider
-            android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
-            tools:replace="android:authorities"
-            android:authorities="${applicationId}.lifecycle-tests"
-            android:exported="false"
-            android:multiprocess="true" />
-
     </application>
 
 </manifest>
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>
diff --git a/src/com/android/car/calendar/CarCalendarActivity.java b/src/com/android/car/calendar/CarCalendarActivity.java
index 945482a..94e0db6 100644
--- a/src/com/android/car/calendar/CarCalendarActivity.java
+++ b/src/com/android/car/calendar/CarCalendarActivity.java
@@ -33,6 +33,8 @@ import androidx.lifecycle.ViewModelProvider;
 import com.android.car.calendar.common.CalendarFormatter;
 import com.android.car.calendar.common.Dialer;
 import com.android.car.calendar.common.Navigator;
+import com.android.car.ui.core.CarUi;
+import com.android.car.ui.toolbar.ToolbarController;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -56,6 +58,9 @@ public class CarCalendarActivity extends FragmentActivity {
         super.onCreate(savedInstanceState);
         maybeEnableStrictMode();
 
+        ToolbarController toolbar = CarUi.requireToolbar(this);
+        toolbar.setTitle(R.string.app_name);
+
         // Tests can set fake dependencies before onCreate.
         if (mDependencies == null) {
             mDependencies = new Dependencies(
-- 
cgit v1.2.3