Snap for 6844436 from 8f243ec22dd885c3c904364f4a33412fe8d9a66c to simpleperf-releasesimpleperf-release

Change-Id: Ib4c8cd29298e511041300d5aa6e7e03a0a268526

3 files changed, 11 insertions, 9 deletions

diff --git a/res/layout/link_viewer_activity.xml b/res/layout/link_viewer_activity.xml
index 1647123..21b943f 100644
--- a/res/layout/link_viewer_activity.xml
+++ b/res/layout/link_viewer_activity.xml
@@ -21,19 +21,12 @@
     android:layout_height="match_parent"
     android:background="@android:color/black">
 
-    <com.android.car.ui.toolbar.Toolbar
-        android:id="@+id/car_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:title="@string/app_name"
-        app:state="subpage"/>
-
     <TextView
         style="?android:attr/textAppearanceLarge"
         android:id="@+id/url_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/car_toolbar"
+        android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:maxLines="1"
         android:ellipsize="end" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c8c2c56..1fdd264 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,5 +15,5 @@
 -->
 <resources>
     <!-- The theme for the LinkViewerActivity. -->
-    <style name="AppTheme" parent="Theme.CarUi"/>
+    <style name="AppTheme" parent="Theme.CarUi.WithToolbar"/>
 </resources>
diff --git a/src/com/android/car/linkviewer/LinkViewerActivity.java b/src/com/android/car/linkviewer/LinkViewerActivity.java
index 7bd43c0..4990af6 100644
--- a/src/com/android/car/linkviewer/LinkViewerActivity.java
+++ b/src/com/android/car/linkviewer/LinkViewerActivity.java
@@ -17,6 +17,9 @@
 
 package com.android.car.linkviewer;
 
+import static com.android.car.ui.core.CarUi.requireToolbar;
+import static com.android.car.ui.toolbar.Toolbar.State.SUBPAGE;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -27,6 +30,8 @@ import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.car.ui.toolbar.ToolbarController;
+
 import com.google.zxing.WriterException;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.google.zxing.qrcode.encoder.ByteMatrix;
@@ -48,6 +53,10 @@ public class LinkViewerActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        ToolbarController toolbar = requireToolbar(this);
+        toolbar.setTitle(R.string.app_name);
+        toolbar.setState(SUBPAGE);
+
         String url = getUrlFromIntent(getIntent());
         if (url == null) {
             finish();