More app bar support in GlifLayout

- Add app:suwStickyHeader attribute to GlifLayout to specify a
  custom app bar layout, which can be a Toolbar.
- Create indirection attribute ?attr/suwGlifIconStyle to allow apps
  to override the GLIF icon style.

Test: ./gradlew test
Bug: 68826871
Change-Id: I6384db970582c56431b6085bb172f6ca28099f9d

2 files changed, 4 insertions, 4 deletions

diff --git a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
index 75b1c7a..b681dee 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
@@ -107,10 +107,10 @@ public class GlifRecyclerLayout extends GlifLayout {
     }
 
     @Override
-    public View findManagedViewById(int id) {
+    public <T extends View> T findManagedViewById(int id) {
         final View header = mRecyclerMixin.getHeader();
         if (header != null) {
-            final View view = header.findViewById(id);
+            final T view = header.findViewById(id);
             if (view != null) {
                 return view;
             }
diff --git a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
index 5ff825d..c5b5afc 100644
--- a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
@@ -127,10 +127,10 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout {
     }
 
     @Override
-    public View findManagedViewById(int id) {
+    public <T extends View> T findManagedViewById(int id) {
         final View header = mRecyclerMixin.getHeader();
         if (header != null) {
-            final View view = header.findViewById(id);
+            final T view = header.findViewById(id);
             if (view != null) {
                 return view;
             }