summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-15Merge "Keeping migration dialog up while migration in progress" into nyc-dev ↵Brandon Maxwell
am: a98b35c260 am: 724ee71dbb * commit '724ee71dbb1e7b1fcb8cd332663772c215eb7e63': Keeping migration dialog up while migration in progress
2016-03-15Merge "Keeping migration dialog up while migration in progress" into nyc-devBrandon Maxwell
am: a98b35c260 * commit 'a98b35c260a8527dd7a952fe0dd3342fce06b89a': Keeping migration dialog up while migration in progress
2016-03-15Merge "Keeping migration dialog up while migration in progress" into nyc-devBrandon Maxwell
2016-03-15Keeping migration dialog up while migration in progressBrandon Maxwell
+ This CL ensures that while the migration work is in progress, the MigrateDialogFragment remains visible, with its buttons greyed out. Bug: 26664600 Change-Id: Ied32d05fac46b700f14aee06d383fd2db2fa7913
2016-03-15Updating settings to use system blocked numbers ui am: 60d449f45fBrandon Maxwell
am: 24fdf0da09 * commit '24fdf0da0966a7a4108db7fc7e23f6c5a3b651a3': Updating settings to use system blocked numbers ui
2016-03-15Updating settings to use system blocked numbers uiBrandon Maxwell
am: 60d449f45f * commit '60d449f45f52c22d7f7e669760457b717352f8de': Updating settings to use system blocked numbers ui
2016-03-15Updating settings to use system blocked numbers uiBrandon Maxwell
+ After the user has migrated to the framework number blocking solution, the 'Call blocking' setting needs to take them to the system ui. The branching logic to determine which UI to open is added in this CL. Bug: 26664600 Change-Id: I2574f0665d3f0d3d92230e0210c69d1d10b60228
2016-03-15Fixing buildSarmad Hashmi
+ A merge was performed improperly which caused an import to be removed, but the code using the imported object wasn't. This resulted in build failures since the necessary class wasn't imported. + This change properly performs the merge of cdc14da9275c67d123b55e668f48f73c4b58d948. Change-Id: Ifb78cc75aff18a9c632c7c5e1a3121858383296a
2016-03-15Merge "Removing hardcoded database column name" into nyc-dev am: aae1559613Brandon Maxwell
am: 3cd1ce6c88 * commit '3cd1ce6c8801c338f45dad8688e2f742f910382d': Removing hardcoded database column name
2016-03-15Merge "Removing hardcoded database column name" into nyc-devBrandon Maxwell
am: aae1559613 * commit 'aae1559613cc24ad1d960b550c15af9f61675f38': Removing hardcoded database column name
2016-03-15Merge "Removing hardcoded database column name" into nyc-devBrandon Maxwell
2016-03-15Merge "Implemented blocked numbers migration" into nyc-dev am: 4cdae0926cBrandon Maxwell
am: 55c2efe5a5 * commit '55c2efe5a514447c697a678c52708b8eb7fc5406': Implemented blocked numbers migration
2016-03-15Merge "Implemented blocked numbers migration" into nyc-devBrandon Maxwell
am: 4cdae0926c * commit '4cdae0926cca41dd46dca6b6664b7e4495bfc988': Implemented blocked numbers migration
2016-03-15Merge "Implemented blocked numbers migration" into nyc-devBrandon Maxwell
2016-03-14Implemented blocked numbers migrationBrandon Maxwell
+ After upgrading to N, users need to be able to migrate their blocked number list from the Dialer solution to the framework solution. Prior to migrating, when a user attempts to block a number, a Dialog is shown prompting them to migrate their numbers. Users must migrate to continue adding numbers to their block list. Users that decide not to migrate will still have calls and voicemails blocked for numbers that are currently on their block list. + This CL implements the logic which copies users' blocked numbers lists to the framework solution. Bug: 26664600 Change-Id: I44dee1306b5daca6f558c81b2b58252b35013e09
2016-03-14Add GoogleDialer project to settings.gradle am: ccecfd296bTa-wei Yen
am: 075f29b197 * commit '075f29b197b94c41e629843667a84cd8749aff18': Add GoogleDialer project to settings.gradle
2016-03-14Add GoogleDialer project to settings.gradleTa-wei Yen
am: ccecfd296b * commit 'ccecfd296bab37ac3d8213fd316f465a3f63beac': Add GoogleDialer project to settings.gradle
2016-03-14Add GoogleDialer project to settings.gradleTa-wei Yen
This CL is for easier project setup in Android Studio. GoogleDialer is not buildable/testable with gradle yet. Change-Id: I2fb90129d1effb9d68687d9b9f063f2128728d7b
2016-03-14Merge "Potential fix for voicemail icon near dialer but no voicemail." into ↵Sarmad Hashmi
nyc-dev am: 1034966af6 am: 290a699617 * commit '290a699617772faab8cc0c48f322b52ad954462b': Potential fix for voicemail icon near dialer but no voicemail.
2016-03-14Merge "Potential fix for voicemail icon near dialer but no voicemail." into ↵Sarmad Hashmi
nyc-dev am: 1034966af6 * commit '1034966af68c4d3ea1c7c7ab4cedbaeb3bce5894': Potential fix for voicemail icon near dialer but no voicemail.
2016-03-14Merge "Potential fix for voicemail icon near dialer but no voicemail." into ↵Sarmad Hashmi
nyc-dev
2016-03-14Potential fix for voicemail icon near dialer but no voicemail.Sarmad Hashmi
+Only count voicemails that are unread and have not been marked for deletion. BUG=27548694 Change-Id: I8d6707087bd4a400eb073ac4c2c7e2689a065052
2016-03-14Adding block numbers migration dialog am: c6ed16091cBrandon Maxwell
am: fbbc38a5bb * commit 'fbbc38a5bb9aac10906c901987352ef2d7c74bf4': Adding block numbers migration dialog
2016-03-14Adding block numbers migration dialogBrandon Maxwell
am: c6ed16091c * commit 'c6ed16091cf15c3546d3bd1188e14b8aef935280': Adding block numbers migration dialog
2016-03-14Adding block numbers migration dialogBrandon Maxwell
+ When the user attempts to block a number and they haven't migrated to the framework blocking implementation, they should be shown a dialog that asks them to migrate. This CL introduces the Dialog that is shown and updates the Call log and Call details to open it. + As part one of the change, the Dialog is shown every time the user attempts to block or unblock a number (when the feature is enabled). A later CL will complete this migration step to ensure that the dialog is only shown until migration is finished. Bug: 26664600 Change-Id: Ia4c2d504f8d98679b90d232058eb5ee6ea9b38f1
2016-03-14Merge "Adding sharedPref for blocked number migration" into nyc-dev am: ↵Brandon Maxwell
9df658ca49 am: f561b05824 * commit 'f561b058245c3976f6efc9c420c3cc7cef8c358a': Adding sharedPref for blocked number migration
2016-03-14Merge "Hiding add number button in Blocked Management UI" into nyc-dev am: ↵Brandon Maxwell
6c5ea04920 am: 414cf94924 * commit '414cf94924769f8bc4ca72a8d198c7d278b1f958': Hiding add number button in Blocked Management UI
2016-03-14Merge "Adding sharedPref for blocked number migration" into nyc-devBrandon Maxwell
am: 9df658ca49 * commit '9df658ca49c4b4571fca91eef7920e6d974ecc85': Adding sharedPref for blocked number migration
2016-03-14Merge "Hiding add number button in Blocked Management UI" into nyc-devBrandon Maxwell
am: 6c5ea04920 * commit '6c5ea049202dc238d9d2c95b40d46c8007570664': Hiding add number button in Blocked Management UI
2016-03-14Merge "Add talkback for long press and remove contact from starred list." ↵Qi Wang
into nyc-dev am: 7934175406 am: 470dd5f28d * commit '470dd5f28d6c3c005ab839e5fc238e679865e278': Add talkback for long press and remove contact from starred list.
2016-03-14Merge changes from topic \'refactor-voicemail-archive\' into nyc-dev am: ↵Sarmad Hashmi
f2c14d722f am: 380994d3b0 * commit '380994d3b0e4a2ee2ca0054a48ea159678618521': Add share voicemail functionality. Refactor voicemail archive code.
2016-03-14Merge "Adding sharedPref for blocked number migration" into nyc-devBrandon Maxwell
2016-03-14Merge "Hiding add number button in Blocked Management UI" into nyc-devBrandon Maxwell
2016-03-14Merge "Add talkback for long press and remove contact from starred list." ↵Qi Wang
into nyc-dev am: 7934175406 * commit '793417540644dc079dcd9267f72b417ec91962d5': Add talkback for long press and remove contact from starred list.
2016-03-14Merge changes from topic \'refactor-voicemail-archive\' into nyc-devSarmad Hashmi
am: f2c14d722f * commit 'f2c14d722f14e88efdbe4fb052f6638d6da5d215': Add share voicemail functionality. Refactor voicemail archive code.
2016-03-14Merge "Add talkback for long press and remove contact from starred list." ↵Qi Wang
into nyc-dev
2016-03-14Merge changes from topic 'refactor-voicemail-archive' into nyc-devSarmad Hashmi
* changes: Add share voicemail functionality. Refactor voicemail archive code.
2016-03-14Import translations. DO NOT MERGE am: de52cc4d85 -s oursGeoff Mendal
am: 7137231612 -s ours * commit '7137231612fbb6ee96de3c363ca842cbd0f895a7': Import translations. DO NOT MERGE
2016-03-14Import translations. DO NOT MERGEGeoff Mendal
am: de52cc4d85 -s ours * commit 'de52cc4d85107b540717016f87eb9c266c87a955': Import translations. DO NOT MERGE
2016-03-14Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I7089db207c775a73eec346f1099c7865370dc710 Auto-generated-cl: translation import
2016-03-14Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I8b2b9c6f4ebba19b3dca20215e5d975fb3b5a2bd Auto-generated-cl: translation import
2016-03-13Add share voicemail functionality.Sarmad Hashmi
+Send intent to other applications with temporary file permission granted +Add voicemails folder to FileProvider paths +When creating file in VoicemailArchiveProvider, append extension to file name +Check voicemail content exists before archiving it +Refactor voicemail code +Add tests for checking file extension +Add tests for archiving and sharing vociemails +Archive tab should not archive on share button press BUG=22798485 Change-Id: Id8068aba92f7f1ca58532dca6c405cb2908841a3
2016-03-13Refactor voicemail archive code.Sarmad Hashmi
+Created new class for all AsyncTasks and listener interfaces. +Separated the archive code into separate methods +Added 7 tests BUG=22797391 Change-Id: I789125328bf079846e34c5fd57fd0d1c67dc6266
2016-03-12Adding sharedPref for blocked number migrationBrandon Maxwell
+ Users are shown a dialog when they're running on an SDK which supports the framework blocking solution, but they haven't yet migrated. In order to determine whether the user has migrated or not, a SharedPreference value is used. In a later CL which performs the migration, this value will be updated as the final step. Bug: 26664600 Change-Id: I5a12be643d0fb3b52ef408215779423bf0a2ddc7
2016-03-12Hiding add number button in Blocked Management UIBrandon Maxwell
+ When new filtering is possible, we should hide the add number button from the blocked numbers management UI. + Added method to FilteredNumberCompat to check if it's possible to use the new filtering implementation. This is needed because prior to migrating to new filtering, users need to be able to unblock numbers. Just checking the SDK version is not sufficient, we need to know if the user has migrated their numbers. Bug=26664600 Change-Id: I60433465074911f13a26736221ddacc9a8bbcf88
2016-03-11Merge "Query lookup uri with work lookup key directly is not allowed" into ↵Tony Mak
nyc-dev am: ebfbfa10d9 am: 769f26fe74 * commit '769f26fe7488415cb677d4980540bbd7dcfc3ac0': Query lookup uri with work lookup key directly is not allowed
2016-03-11Merge "Increase opacity of text on primary call info to 100%." into nyc-dev ↵Qi Wang
am: a03c1f480e am: 1ccbe7e93a * commit '1ccbe7e93a33397360ac82c31065ae3f9d3ec500': Increase opacity of text on primary call info to 100%.
2016-03-11Add share button to voicemail cards. am: 83f27f563cSarmad Hashmi
am: cf4e907022 * commit 'cf4e90702260cc04c42c202affac7da351454058': Add share button to voicemail cards.
2016-03-11Merge "Query lookup uri with work lookup key directly is not allowed" into ↵Tony Mak
nyc-dev am: ebfbfa10d9 * commit 'ebfbfa10d95ef21373cf7c112eac52413b11c525': Query lookup uri with work lookup key directly is not allowed
2016-03-11Merge "Increase opacity of text on primary call info to 100%." into nyc-devQi Wang
am: a03c1f480e * commit 'a03c1f480e61c1f3507e294095e21b73d23a5e58': Increase opacity of text on primary call info to 100%.
2016-03-11Add share button to voicemail cards.Sarmad Hashmi
am: 83f27f563c * commit '83f27f563c3e8ebc62d4cc5c4b6b36389eed7f47': Add share button to voicemail cards.
2016-03-11Removing hardcoded database column nameBrandon Maxwell
+ We were previously hardcoding the post_dial_digits column name. This code was written before we had src-N and src-pre-N folders. + This CL converts the hard coded column name to follow the pattern we have for new stuff in the SDK. + Additionally, this CL removes an unneeded method which checks the SDK version, instead using the CompatUtils class. Bug: 25021389 Change-Id: I017d47f7efd323254e616a64d7ac824c5cfb8902
2016-03-11Merge "Query lookup uri with work lookup key directly is not allowed" into ↵Tony Mak
nyc-dev
2016-03-11Merge "Increase opacity of text on primary call info to 100%." into nyc-devQi Wang
2016-03-11Add share button to voicemail cards.Sarmad Hashmi
+Add share icon and string +Added share button to voicemail_playback_layout.xml +Link to icon: https://icons.googleplex.com/#icon=ic_share BUG=22798485 Change-Id: Iab9051f4824a4fa0eed90049a762aaac032cf3bf
2016-03-11Add talkback for long press and remove contact from starred list.Qi Wang
The remove button will be announced when user hovers contact onto it or drop it. Bug: 25559343 Change-Id: I31f51f6d074d8b1721439e7a484e1e316cb006fe
2016-03-11Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5f6a422281 -s oursBill Yi
am: e91aca7d0d -s ours * commit 'e91aca7d0d189ebf6d1df01b503aa6f76e4d7673': Import translations. DO NOT MERGE
2016-03-11Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi
am: 5f6a422281 -s ours * commit '5f6a4222815abe478045d81d71f65c75ff2cbbbd': Import translations. DO NOT MERGE
2016-03-11Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi
2016-03-11Query lookup uri with work lookup key directly is not allowedTony Mak
Query lookup uri with work lookup key directly is not allowed, app crashes if doing so. And actually, all APIs do not support work lookup key except those explicitly say it does. This Cls changed two places: 1. Do not pass lookup uri with work lookup to NotificationManager to avoid NotificationManager using the uri to query. 2. Dialer perform query for alternative display name using lookup key. But if it is a work contact, do not do so. Bug: 27146678 Change-Id: Ie59c37ff43b6f953a96564c446d79d8812f5ada1
2016-03-10Import translations. DO NOT MERGEBill Yi
Change-Id: Ic399f376d9a008c08b5a7b795ed142592d22a4a0 Auto-generated-cl: translation import
2016-03-11Merge "Import translations. DO NOT MERGE"Bill Yi
2016-03-10Import translations. DO NOT MERGEBill Yi
Change-Id: I6efc38a6b9ec98e2acc0b2e7fd85b265bdd8e116 Auto-generated-cl: translation import
2016-03-10Increase opacity of text on primary call info to 100%.Qi Wang
Bug: 27274383 Change-Id: I155078c88e7240cd43b298de22ff8f8d1bbab60a
2016-03-11Removing unneed bluetooth code am: 5558f89b14Brandon Maxwell
am: 2f0019f9b6 * commit '2f0019f9b6aebf9e61f579ec34595e45180947ce': Removing unneed bluetooth code
2016-03-11Removing unneed bluetooth codeBrandon Maxwell
am: 5558f89b14 * commit '5558f89b14af81d38364afe9e51a56f8557fd282': Removing unneed bluetooth code
2016-03-10Removing unneed bluetooth codeBrandon Maxwell
+ By playing through AudioManager.STREAM_VOICE_CALL, routing audio to bluetooth is handled properly for us. + This change removes the code that was preparing to manually play the call waiting tone through bluetooth. + Small fix ups for javadoc Bug: 26932998 Change-Id: Ib5f872c72cdfa44ab0bc2ff5d7e41645aba813ff
2016-03-10Merge "Fixing missed call notifications for FBE" into nyc-dev am: bb293bfd56Brandon Maxwell
am: d34a408c71 * commit 'd34a408c71e8f791f74c5b19e5c8d5cb2a710522': Fixing missed call notifications for FBE
2016-03-10Merge "Fixing missed call notifications for FBE" into nyc-devBrandon Maxwell
am: bb293bfd56 * commit 'bb293bfd56125febe42ddef5cdcb630abf1b12c9': Fixing missed call notifications for FBE
2016-03-10Merge "Fixing missed call notifications for FBE" into nyc-devBrandon Maxwell
2016-03-10Fixing missed call notifications for FBEBrandon Maxwell
+ Our new components for creating missed call notifications are not marked as encryption aware so Telecom was always creating the missed call notification. + This CL marks the appropriate components as encryption aware so Telecom can check to see if we support putting up the notification. + Updated logic so missed call notifications only have 'callback' and 'message' actions when not locked. + Misc FBE cleanup + Since the call log is not available when on the File based encryption lock screen, dismissed notifications will not attempt to mark the calls as read; attempting do so causes exceptions. + Updated AOSP Dialer to ensure that we don't store data in device encrypted storage by default. This storage location is always available, regardless of whether we're in the FBE locked state or not. None of our preferences/databases need to be available in this state, so this change causes the Dialer to store data in credential encrypted storage by default. This storage location is only available when the device is unlocked. + Updated AOSP Dialer so it doesn't use device encrypted storage by default. This is because we currently don't want any of the preferences/databases stored by the Dialer to be available when FBE locked. + Updated AOSP Dialer so specific components must mark themselves as encryption aware, rather than having everything aware because the application is marked as such. Bug: 27455726 Change-Id: Ib5d28267116ec007bf9beb57862796235460ddf5
2016-03-09Import translations. DO NOT MERGE am: 26466e02b4 -s oursGeoff Mendal
am: c5d6b3eb82 -s ours * commit 'c5d6b3eb82f04b14e12e556adbc34ea42cd801fc': Import translations. DO NOT MERGE
2016-03-09Import translations. DO NOT MERGEGeoff Mendal
am: 26466e02b4 -s ours * commit '26466e02b466288e1fd11c31b1207d72e543b1e8': Import translations. DO NOT MERGE
2016-03-09Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Iffa5b94b865c555733ff88b6a486d9b5c6002e97 Auto-generated-cl: translation import
2016-03-09Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I67350c83ec4c41360cf1c9236c0780d4eeec9467 Auto-generated-cl: translation import
2016-03-09Merge "Add GET_ACCOUNTS_PRIVILEGED to AOSP Dialer." into nyc-dev am: e7b39d58e1Ta-wei Yen
am: 5d6b6fcc07 * commit '5d6b6fcc071ed908ea621d513919ab3fc524f997': Add GET_ACCOUNTS_PRIVILEGED to AOSP Dialer.
2016-03-09Merge "Add GET_ACCOUNTS_PRIVILEGED to AOSP Dialer." into nyc-devTa-wei Yen
am: e7b39d58e1 * commit 'e7b39d58e16e45c54103c7cda3665245b09f1e08': Add GET_ACCOUNTS_PRIVILEGED to AOSP Dialer.
2016-03-09Merge "Add GET_ACCOUNTS_PRIVILEGED to AOSP Dialer." into nyc-devTa-wei Yen
2016-03-08Merge "Add contact photo for missed call notifications" into nyc-dev am: ↵Ta-wei Yen
5d635baea2 am: e70be0ca00 * commit 'e70be0ca00a5ed4699f1a91759de2905e8bcefdc': Add contact photo for missed call notifications
2016-03-08Merge "Add contact photo for missed call notifications" into nyc-devTa-wei Yen
am: 5d635baea2 * commit '5d635baea2d0510c5edc9df26681d802bc91c443': Add contact photo for missed call notifications
2016-03-07Merge "Add contact photo for missed call notifications" into nyc-devTa-wei Yen
2016-03-07Add contact photo for missed call notificationsTa-wei Yen
+ ContactPhotoLoader to create the appropriate icon from a ContactInfo - NameLookupQuery in CallLogNotificationsHelper#getContactInfo To show a photo the name is not enough. Full query need to be made to retrieve the photoUri. + class Assert in util + Gradle directory setup for dialer tests (Note: this is just for project setup in Android Studio, tests are still not runnable in gradle) Bug:27276108 Change-Id: I0ed2147f2bb60454fe5a5ad6c25fe99727441880
2016-03-07Add GET_ACCOUNTS_PRIVILEGED to AOSP Dialer.Ta-wei Yen
Required for ContactsCommon Bug:27489943 Change-Id: If1adb0526fdbe9b390707978d3229562808bcca6
2016-03-07Merge "Remove SdkSelectionUtilsTest" into nyc-dev am: d72b50f5d5Ta-wei Yen
am: 8fa2c9a961 * commit '8fa2c9a9611511942a6c94c9590bde659dbb7ff8': Remove SdkSelectionUtilsTest
2016-03-07Merge "Disable voicemail archive by default." into nyc-dev am: 3696bc443fSarmad Hashmi
am: e924ab425b * commit 'e924ab425ba6e5afc2ae3754fb12317fdb6b2438': Disable voicemail archive by default.
2016-03-07Merge "Remove SdkSelectionUtilsTest" into nyc-devTa-wei Yen
am: d72b50f5d5 * commit 'd72b50f5d5d75309c21e7cc093222db5684aa433': Remove SdkSelectionUtilsTest
2016-03-07Merge "Disable voicemail archive by default." into nyc-devSarmad Hashmi
am: 3696bc443f * commit '3696bc443fcabf8e5fb8af6a99ed2f547dad050d': Disable voicemail archive by default.
2016-03-07Merge "Remove SdkSelectionUtilsTest" into nyc-devTa-wei Yen
2016-03-07Merge "Disable voicemail archive by default." into nyc-devSarmad Hashmi
2016-03-07Import translations. DO NOT MERGE am: 7a295b196d -s oursGeoff Mendal
am: 1d806d0ca7 -s ours * commit '1d806d0ca72320ea35db1cf3698ae4f3e47e30c3': Import translations. DO NOT MERGE
2016-03-07Import translations. DO NOT MERGEGeoff Mendal
am: 7a295b196d -s ours * commit '7a295b196d8db7836f71643c74b209640aecfe01': Import translations. DO NOT MERGE
2016-03-07Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I8ad6c48dbe5394ea53e866b9d258df0e98ea60bb Auto-generated-cl: translation import
2016-03-07Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ib64cdbd76124f864875f3f287e72c23c905b46d0 Auto-generated-cl: translation import
2016-03-05Merge "Fix truncated unread voicemail count in landscape multi-window mode." ↵Qi Wang
into nyc-dev am: 3719f95f24 am: f86dda50d8 * commit 'f86dda50d8595c9337d8cb62d9cf82c0a5dc6f0f': Fix truncated unread voicemail count in landscape multi-window mode.
2016-03-05Merge "Fix truncated unread voicemail count in landscape multi-window mode." ↵Qi Wang
into nyc-dev am: 3719f95f24 * commit '3719f95f2441c0d5408c6cbcbac8120a6d5b783b': Fix truncated unread voicemail count in landscape multi-window mode.
2016-03-05Merge "Fix truncated unread voicemail count in landscape multi-window mode." ↵Qi Wang
into nyc-dev
2016-03-04Remove SdkSelectionUtilsTestTa-wei Yen
N/pre-N test is removed in ag/879758, this test no longer make sense. Change-Id: Ic7b4d6e54e7bf3fe37aa14b310e47127dc73bb21
2016-03-04Disable voicemail archive by default.Sarmad Hashmi
+Archive-specific actions are not drawn unless the runtime flag is enabled +Disable archive button and menu item BUG=27375884 Change-Id: Ide7d0a162468279f614e09e01de99d782854a3e1
2016-03-04Merge "Fix layout so that all 4 buttons show on smaller screens." into ↵Sarmad Hashmi
nyc-dev am: 40026e882f am: 2ddba5b2e8 * commit '2ddba5b2e871fd0208f02eae30f9cca6bebc2f22': Fix layout so that all 4 buttons show on smaller screens.
2016-03-04Merge "Add files for voicemail archive tab." into nyc-dev am: ee8f5a3c0dSarmad Hashmi
am: af04b7b8d5 * commit 'af04b7b8d5bad8998f875ee0a28df36d5b6e97c5': Add files for voicemail archive tab.