summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/main/impl/bottomnav/res
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-02-24 11:37:28 -0800
committerCopybara-Service <copybara-piper@google.com>2018-02-24 11:38:19 -0800
commit35ecd12f1617f36d8d22fecdabf9c63cbf92599d (patch)
tree716006ff47663e8741ab609b4cfc153df8348183 /java/com/android/dialer/main/impl/bottomnav/res
parenta39e732c6326f6265a213024bbb6899aea04f10a (diff)
Cancel Old SpeedDial contact loaders when they are reset.
This prevents to many loaders running at the same time and crashing the application for using too many threads at once. Also made a few UI changes: - Change Android nav bar color to #FFF - Move badges down 2dp - Limit badges to 9+ (instead of 99+, added flag to configure this) - search bar no longer has rounded corners when expanded Bug: 72525324 Test: MainActivityOldPeerTest PiperOrigin-RevId: 186894920 Change-Id: I36fc5d8794440b707184d54de427db5910ec5b8e
Diffstat (limited to 'java/com/android/dialer/main/impl/bottomnav/res')
-rw-r--r--java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml2
-rw-r--r--java/com/android/dialer/main/impl/bottomnav/res/values/strings.xml6
2 files changed, 7 insertions, 1 deletions
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
index 5dddd3de5..d319b2ed9 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
@@ -32,7 +32,7 @@
android:id="@+id/bottom_nav_item_image"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginTop="7dp"/>
+ android:layout_marginTop="4dp"/>
<TextView
android:id="@+id/notification_badge"
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/values/strings.xml b/java/com/android/dialer/main/impl/bottomnav/res/values/strings.xml
index ca5db1f49..6d3886959 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/values/strings.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/values/strings.xml
@@ -23,4 +23,10 @@
<string name="tab_title_voicemail">Voicemail</string>
<!-- Tab text to show users their contacts [CHAR LIMIT=10] -->
<string name="tab_title_contacts">Contacts</string>
+
+ <!-- Notification badge indicating that there are more than 9 notifications for the user [CHAR LIMIT=3] -->
+ <string name="bottom_nav_count_9_plus">9+</string>
+
+ <!-- Notification badge indicating that there are more than 9 notifications for the user [CHAR LIMIT=3] -->
+ <string name="bottom_nav_count_99_plus">99+</string>
</resources> \ No newline at end of file