am 2a007876: Merge "[SetupWizardLib] Add getNavigationBar" into ub-setupwizard-alatar

* commit '2a0078763fab06c1ab9c783b67a5346ee28d86c5':
  [SetupWizardLib] Add getNavigationBar

2 files changed, 22 insertions, 0 deletions

diff --git a/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java b/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
index 2a1000d..0ba5e6d 100644
--- a/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
+++ b/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
@@ -34,6 +34,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.android.setupwizardlib.view.Illustration;
+import com.android.setupwizardlib.view.NavigationBar;
 
 public class SetupWizardLayout extends FrameLayout {
 
@@ -159,6 +160,11 @@ public class SetupWizardLayout extends FrameLayout {
         return R.id.suw_layout_content;
     }
 
+    public NavigationBar getNavigationBar() {
+        final View view = findViewById(R.id.suw_layout_navigation_bar);
+        return view instanceof NavigationBar ? (NavigationBar) view : null;
+    }
+
     public void setHeaderText(int title) {
         final TextView titleView = (TextView) findViewById(R.id.suw_layout_title);
         if (titleView != null) {
diff --git a/library/test/src/com/android/setupwizardlib/test/SetupWizardLayoutTests.java b/library/test/src/com/android/setupwizardlib/test/SetupWizardLayoutTests.java
index ddaa391..f5cd287 100644
--- a/library/test/src/com/android/setupwizardlib/test/SetupWizardLayoutTests.java
+++ b/library/test/src/com/android/setupwizardlib/test/SetupWizardLayoutTests.java
@@ -102,6 +102,22 @@ public class SetupWizardLayoutTests extends InstrumentationTestCase {
         layout.setLayoutBackground(new ColorDrawable(Color.RED));
     }
 
+    @SmallTest
+    public void testGetNavigationBar() {
+        final SetupWizardLayout layout = new SetupWizardLayout(mContext);
+        final NavigationBar navigationBar = layout.getNavigationBar();
+        assertEquals("Navigation bar should have ID = @id/suw_layout_navigation_bar",
+                R.id.suw_layout_navigation_bar, navigationBar.getId());
+    }
+
+    @SmallTest
+    public void testGetNavigationBarNull() {
+        // test_template does not have navigation bar so getNavigationBar() should return null.
+        final SetupWizardLayout layout = new SetupWizardLayout(mContext, R.layout.test_template);
+        final NavigationBar navigationBar = layout.getNavigationBar();
+        assertNull("getNavigationBar() in test_template should return null", navigationBar);
+    }
+
     private void assertDefaultTemplateInflated(SetupWizardLayout layout) {
         View decorView = layout.findViewById(R.id.suw_layout_decor);
         View navbar = layout.findViewById(R.id.suw_layout_navigation_bar);