commit 0d1875f80448d0dd22eef6199a28f0f19c391fcd
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 01 10:17:53 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 01 10:17:53 2019 +0000
tree 49d3fa30da85f030f2c8a2330f7103d0919eb098
parent ee50181163bfc0e281206c8ae3493e129502fed2
parent 4856bfc4b592fd69fdf9c8f2273457ca9416a4b0

Merge "Add toolbar to preference fragments" into pi-car-dev

car-ui-lib/res/layout/car_ui_preference_fragment.xml

diff --git a/car-ui-lib/res/layout/car_ui_preference_fragment.xml b/car-ui-lib/res/layout/car_ui_preference_fragment.xml
index b70bfa5..766196d 100644
--- a/car-ui-lib/res/layout/car_ui_preference_fragment.xml
+++ b/car-ui-lib/res/layout/car_ui_preference_fragment.xml
@@ -15,10 +15,18 @@
     limitations under the License.
 -->
 
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.car.ui.toolbar.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar"
+        app:state="subpage"/>
 
     <FrameLayout
         android:id="@android:id/list_container"
@@ -31,4 +39,4 @@
             android:scrollbars="none"/>
     </FrameLayout>
 
-</FrameLayout>
+</LinearLayout>