From 7e5f0f0ea3b3075258cac9d26f90fd97c1a71dca Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Mon, 23 Mar 2015 11:32:27 -0700 Subject: [SetupWizardLib] Add getNavigationBar Add getNavigationBar method to SetupWizardLayout Change-Id: I49eeb5cfee2917d5b4e3f552f9c3b68747dcd79a --- .../com/android/setupwizardlib/SetupWizardLayout.java | 6 ++++++ .../setupwizardlib/test/SetupWizardLayoutTests.java | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) 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); -- cgit v1.2.3