commit 90c45bbccd1dadfa164f9d6a73b4083c55468bcd
author Roberto Perez <robertoalexis@google.com> Mon Oct 21 17:30:48 2019 -0700
committer Roberto Perez <robertoalexis@google.com> Wed Oct 23 16:40:39 2019 -0700
tree ba2d58c2ac0cbb0aa493f14ae4e9fe295492ceeb
parent 1c34a147de374885fc5c487f8ac69e1576a165a8

Show logo even if navigation icon is displayed.

Bug: 142731385
Test: make RunCarUiRoboTests & manual on device
Change-Id: Ifceda18e30242e2302d27769060e02f02bdf9834

car-ui-lib/tests/robotests/src/com/android/car/ui/toolbar/ToolbarTest.java

diff --git a/car-ui-lib/tests/robotests/src/com/android/car/ui/toolbar/ToolbarTest.java b/car-ui-lib/tests/robotests/src/com/android/car/ui/toolbar/ToolbarTest.java
index 59e4f2b..98f74b5 100644
--- a/car-ui-lib/tests/robotests/src/com/android/car/ui/toolbar/ToolbarTest.java
+++ b/car-ui-lib/tests/robotests/src/com/android/car/ui/toolbar/ToolbarTest.java
@@ -103,46 +103,39 @@
     }
 
     @Test
-    public void setCustomView_shouldInflateViewIntoToolbar() {
-        mToolbar.setCustomView(R.layout.test_custom_view);
-
-        View v = mToolbar.findViewById(R.id.text_box_1);
-
-        assertThat(v).isNotNull();
-        assertThat(mToolbar.getState()).isEquivalentAccordingToCompareTo(
-                Toolbar.State.SUBPAGE_CUSTOM);
-    }
-
-    @Test
     public void showLogo_whenSet_andStateIsHome() {
         mToolbar.setState(Toolbar.State.HOME);
         mToolbar.setLogo(R.drawable.test_ic_launcher);
 
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_logo).isShown()).isTrue();
+        assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_title_logo).isShown()).isFalse();
     }
 
     @Test
-    public void hideLogo_whenSet_andStateIsNotHome() {
+    public void showTitleLogo_whenSet_andStateIsNotHome() {
         mToolbar.setState(Toolbar.State.SUBPAGE);
         mToolbar.setLogo(R.drawable.test_ic_launcher);
 
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_logo).isShown()).isFalse();
+        assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_title_logo).isShown()).isTrue();
     }
 
     @Test
-    public void hideLogo_whenNotSet_andStateIsHome() {
+    public void hideLogo_andTitleLogo_whenNotSet_andStateIsHome() {
         mToolbar.setState(Toolbar.State.HOME);
         mToolbar.setLogo(0);
 
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_logo).isShown()).isFalse();
+        assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_title_logo).isShown()).isFalse();
     }
 
     @Test
-    public void hideLogo_whenNotSet_andStateIsNotHome() {
+    public void hideLogo_andTitleLogo_whenNotSet_andStateIsNotHome() {
         mToolbar.setState(Toolbar.State.SUBPAGE);
         mToolbar.setLogo(0);
 
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_logo).isShown()).isFalse();
+        assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_title_logo).isShown()).isFalse();
     }
 
     @Test