Merge changes I59b5f641,If438f1b7

* changes:
  Search, Dialpad, BottomBar and Toolbar now persist state through rotation.
  Descrease bubble bottom text scaling factor.

1 files changed, 9 insertions, 0 deletions

diff --git a/java/com/android/dialer/main/impl/BottomNavBar.java b/java/com/android/dialer/main/impl/BottomNavBar.java
index 9aaa988e8..66a57becd 100644
--- a/java/com/android/dialer/main/impl/BottomNavBar.java
+++ b/java/com/android/dialer/main/impl/BottomNavBar.java
@@ -48,6 +48,7 @@ final class BottomNavBar extends LinearLayout {
   private BottomNavItem contacts;
   private BottomNavItem voicemail;
   private OnBottomNavTabSelectedListener listener;
+  private @TabIndex int selectedTab;
 
   public BottomNavBar(Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
@@ -68,21 +69,25 @@ final class BottomNavBar extends LinearLayout {
 
     speedDial.setOnClickListener(
         v -> {
+          selectedTab = TabIndex.SPEED_DIAL;
           setSelected(speedDial);
           listener.onSpeedDialSelected();
         });
     callLog.setOnClickListener(
         v -> {
+          selectedTab = TabIndex.HISTORY;
           setSelected(callLog);
           listener.onCallLogSelected();
         });
     contacts.setOnClickListener(
         v -> {
+          selectedTab = TabIndex.CONTACTS;
           setSelected(contacts);
           listener.onContactsSelected();
         });
     voicemail.setOnClickListener(
         v -> {
+          selectedTab = TabIndex.VOICEMAIL;
           setSelected(voicemail);
           listener.onVoicemailSelected();
         });
@@ -118,6 +123,10 @@ final class BottomNavBar extends LinearLayout {
     this.listener = listener;
   }
 
+  public int getSelectedTab() {
+    return selectedTab;
+  }
+
   /** Listener for bottom nav tab's on click events. */
   public interface OnBottomNavTabSelectedListener {