commit 0d2c20b5533c8fb324c27b1aec36ebcbe287b374
author Xin Li <delphij@google.com> Tue Mar 08 00:19:12 2022 +0000
committer Xin Li <delphij@google.com> Tue Mar 08 00:19:12 2022 +0000
tree a99bb8c3da8d21884178c058ffd80ddbb053de2b
parent 8a39031f535b2365f6b852e013af44863f5f5684
parent 1d9343452b0e15da9c4d727bcd1c5934bda4de50

Merge Android 12L

Bug: 222710654
Merged-In: Icf2fc4009ea09a16967d96bf163ed295c1da94c3
Change-Id: I5a50d6b21bab6ec0a6813cbf3035f17e8756cf41

src/com/android/htmlviewer/CarHTMLViewerActivity.java

diff --git a/src/com/android/htmlviewer/CarHTMLViewerActivity.java b/src/com/android/htmlviewer/CarHTMLViewerActivity.java
index de31bff..465fca5 100644
--- a/src/com/android/htmlviewer/CarHTMLViewerActivity.java
+++ b/src/com/android/htmlviewer/CarHTMLViewerActivity.java
@@ -19,7 +19,7 @@
 import android.webkit.WebView;
 
 import com.android.car.ui.core.CarUi;
-import com.android.car.ui.toolbar.Toolbar;
+import com.android.car.ui.toolbar.NavButtonMode;
 import com.android.car.ui.toolbar.ToolbarController;
 
 /**
@@ -34,7 +34,7 @@
         WebView webView = requireViewById(R.id.webview);
         webView.setDefaultFocusHighlightEnabled(false);
         mToolbar = CarUi.requireToolbar(this);
-        mToolbar.setState(Toolbar.State.SUBPAGE);
+        mToolbar.setNavButtonMode(NavButtonMode.BACK);
     }
 
     @Override