Merge "[SetupWizardLib] Add getNavigationBar" into ub-setupwizard-alatar

This commit is contained in:
Maurice Lam 2015-03-23 19:10:15 +00:00 committed by Android (Google) Code Review
commit 2a0078763f
2 changed files with 22 additions and 0 deletions

View file

@ -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) {

View file

@ -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);