Migrate LinkViewer app to use baselayout
Bug: 151230736
Test: Manual
Change-Id: I72fb657855f3e8335506b2b521252d5b5ea3f803
diff --git a/res/layout/link_viewer_activity.xml b/res/layout/link_viewer_activity.xml
index 581abf7..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:car_ui_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.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 @@
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();