summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2014-11-0672-80/+5
| | | | | Change-Id: I30a7ba44ca220417cb32457dbe75139bfec8db36 Auto-generated-cl: translation import
* am b8abb8cf: am ff0faca2: am b7e654fa: Merge "Editor name fields" into ↵Brian Attwell2014-11-058-23/+52
|\ | | | | | | | | | | | | lmp-mr1-dev * commit 'b8abb8cf5dde2bf95ededbffafe45157e55477bb': Editor name fields
| * am ff0faca2: am b7e654fa: Merge "Editor name fields" into lmp-mr1-devBrian Attwell2014-11-058-23/+52
| |\ | | | | | | | | | | | | * commit 'ff0faca23e19ec165c2976aa703b9228ee04adb8': Editor name fields
| | * am b7e654fa: Merge "Editor name fields" into lmp-mr1-devBrian Attwell2014-11-058-23/+52
| | |\ | | | | | | | | | | | | | | | | * commit 'b7e654fae3cf0bd05605b0f5dd28d82f99e6d8fe': Editor name fields
| | | * Merge "Editor name fields" into lmp-mr1-devBrian Attwell2014-11-058-23/+52
| | | |\
| | | | * Editor name fieldsBrian Attwell2014-11-058-23/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mocks show all name fields collapsed into a single field. After deeper inspection, this proved to be poor UX. Instead we show the three name types inside a single name section. Screenshot: go/ba_screen_captures/contacts/b18004959_edit_screen_material/name_fields.png Bug: 18004959 Change-Id: Ic06abcd151a64746cce32832b27e8f47ec6b981d
* | | | | am 27a90824: am 25977558: am 3b101dcc: Merge "Fix edit contact background on ↵Walter Jang2014-11-042-0/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nexus 9" into lmp-mr1-dev * commit '27a9082457b9b23ddcc7bb8284df7c9f0282876b': Fix edit contact background on nexus 9
| * | | | am 25977558: am 3b101dcc: Merge "Fix edit contact background on nexus 9" ↵Walter Jang2014-11-042-0/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '2597755882573d9724eb12804e44a773b6af4df4': Fix edit contact background on nexus 9
| | * | | am 3b101dcc: Merge "Fix edit contact background on nexus 9" into lmp-mr1-devWalter Jang2014-11-042-0/+51
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '3b101dcc817ad052592fc6a8254351f8b712e1ce': Fix edit contact background on nexus 9
| | | * | Merge "Fix edit contact background on nexus 9" into lmp-mr1-devWalter Jang2014-11-042-0/+51
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fix edit contact background on nexus 9Walter Jang2014-11-042-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Screenshots: go/b18229858 Bug: 18229858 Change-Id: Ic7dca0743bd2e8a1d80f813d63c255fddc7c1bca
* | | | | am 935c5985: am 8e5ad829: am 043fba63: Material design of common edit screen ↵Brian Attwell2014-11-0424-724/+320
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fields * commit '935c59859ec70039031f4bee6d9bd678c9e56153': Material design of common edit screen fields
| * | | | am 8e5ad829: am 043fba63: Material design of common edit screen fieldsBrian Attwell2014-11-0424-724/+320
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '8e5ad829f3f44441946c22e54888a2bcb577fc3e': Material design of common edit screen fields
| | * | | am 043fba63: Material design of common edit screen fieldsBrian Attwell2014-11-0424-724/+320
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '043fba637b421dcd554c634f769f0e883fb5ff8b': Material design of common edit screen fields
| | | * | Material design of common edit screen fieldsBrian Attwell2014-11-0424-724/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The normal edit screen fields, such as phone number and location, have been updated to look like the new Material design mocks. I expect this to be the largest CL needed to finish b/18004959. Aspects of the Editor that haven't been touched in this CL - readonly editor - collapse nickname and phonetic name into StructuredNameEditorView. Then make sure the layout is correct - photo editor - Material insert/delete interpolators (maybe fast_out_slow_in) - account header Some complicated/weird parts of the CL: -KindSectionView no longer displays an "Add details" button. Instead it always shows an additional empty row for each mimeType. The logic that handles this is mostly inside #updateEmptyEditors(). A lot of code could be deleted from RawContactEditorView because of this. -LabeledEditorView's adapter displays TextView's inside Spinner. In order to make the TextViews look like EditTexts, I set the EditText's background (so the 9patch padding is used) and then later remove the background. -Instead of keeping an expansion_view_container in every single field, I only kept it where it was needed. As a result, I needed to add null checks into the TextFieldsEditorView base class. -I made an effort to reduce the depth of the view hierarchy and reduce the use of LinearLayout weights for performance reasons, when it was easy to do so Bug: 18004959 Change-Id: I5934ca189b66468834faf3bb995b172ae2f90bed
* | | | | am d7deaae1: am 01ac5bb9: am 8f9d84ff: Remove field when removing the only charBrian Attwell2014-11-045-2/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7deaae13c41bbe728bf40d5f08e8ae233458e0a': Remove field when removing the only char
| * | | | am 01ac5bb9: am 8f9d84ff: Remove field when removing the only charBrian Attwell2014-11-045-2/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '01ac5bb91fe9197817ec265ac2d28c151895f8f4': Remove field when removing the only char
| | * | | am 8f9d84ff: Remove field when removing the only charBrian Attwell2014-11-045-2/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '8f9d84fffbc32b50cf3133b2340b18d0510a6c6e': Remove field when removing the only char
| | | * | Remove field when removing the only charBrian Attwell2014-11-045-2/+16
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to make a simplifying assumption for b/18004959. After this, we can assume that updateEmptyEditors is never called with emptyEditors.size() > 1 and findFocus() == null. Bug: 18004959 Bug: 18194655 Change-Id: Idaf2c64bf3d359c1aa8938150a6cda3684542d42
* | | | am d7a2d40f: am 7bca417f: am 5d2e262a: Make it easier to delete a contactWalter Jang2014-11-047-0/+17
|\| | | | | | | | | | | | | | | | | | | * commit 'd7a2d40f5a5c0daf6c916d8e3987c1dafa09d10f': Make it easier to delete a contact
| * | | am 7bca417f: am 5d2e262a: Make it easier to delete a contactWalter Jang2014-11-047-0/+17
| |\| | | | | | | | | | | | | | | | | | * commit '7bca417f6778bf1bab63753cfe5db77b8b59e4ab': Make it easier to delete a contact
| | * | am 5d2e262a: Make it easier to delete a contactWalter Jang2014-11-047-0/+17
| | |\| | | | | | | | | | | | | | | | | * commit '5d2e262ab3658118a12fbf6d0edab76484368c24': Make it easier to delete a contact
| | | * Make it easier to delete a contactWalter Jang2014-11-037-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add delete menu item to quickcontact overflow menu * Promote delete menu item on edit contact activity from overflow menu to show as action Bug 18061876 Change-Id: I3f99e1cd00151b968a157ff818bf977c0be15eb2
* | | | am 6f8ee1e9: (-s ours) am 97ccc011: (-s ours) am da941913: (-s ours) Import ↵Geoff Mendal2014-11-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '6f8ee1e922a21eee94dd4ad8a02f11240443440d': Import translations. DO NOT MERGE
| * | | am 97ccc011: (-s ours) am da941913: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '97ccc0114c70962ccb88f78e1a692cab25ac8fb8': Import translations. DO NOT MERGE
| | * | am da941913: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'da9419137eedff0a6d289b8dfd2eeacb2e63d1db': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2014-11-0370-280/+140
| | | | | | | | | | | | | | | | | | | | Change-Id: I8778a3126c37e948db8fe20db4bb9975fb14115d Auto-generated-cl: translation import
* | | | am cf110007: (-s ours) am fa5c5d46: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'cf110007e6ccb66444493814cd8c0d6cebff232e': Import translations. DO NOT MERGE
| * | | am fa5c5d46: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'fa5c5d46923176084eb28ca9803e7ecb382924cd': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-11-0355-110/+114
| | | | | | | | | | | | | | | | | | | | Change-Id: I4e8301d7c652f9eb79f2d1743f57c2d1707d8c90 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0372-144/+148
| | | | | | | | | | | | | | | | | | | | Change-Id: I11c8197c922e1d13998b2d9d8543e183775b4f55 Auto-generated-cl: translation import
* | | | am 3a9c50a8: am 44a6e568: am 675bcfb0: Merge "Fix analytics in Contacts app" ↵Brian Attwell2014-10-3114-28/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '3a9c50a84252aee40a0dc67c7b416604a699b7d9': Fix analytics in Contacts app
| * | | am 44a6e568: am 675bcfb0: Merge "Fix analytics in Contacts app" into lmp-mr1-devBrian Attwell2014-10-3114-28/+22
| |\| | | | | | | | | | | | | | | | | | * commit '44a6e56833d6ab8420ad75b8498ea49cee76f697': Fix analytics in Contacts app
| | * | am 675bcfb0: Merge "Fix analytics in Contacts app" into lmp-mr1-devBrian Attwell2014-10-3114-28/+22
| | |\| | | | | | | | | | | | | | | | | * commit '675bcfb095029c9018662dee31adf1e189f37548': Fix analytics in Contacts app
| | | * Merge "Fix analytics in Contacts app" into lmp-mr1-devBrian Attwell2014-10-3114-28/+22
| | | |\
| | | | * Fix analytics in Contacts appBrian Attwell2014-10-3014-28/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies on old analytics code. Initialize analytics inside ContactsApplication. Improving analytics CL #3/4 Bug: 18039620 Change-Id: I115315519ad245ff199bcf532270f56b9a2d6b61
* | | | | am 30c95df9: am 3fd0e71b: am 0da93008: mutate() BitmapDrawable before ↵Brian Attwell2014-10-311-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly editing * commit '30c95df90228d2111ba4742485986088033e0ff6': mutate() BitmapDrawable before directly editing
| * | | | am 3fd0e71b: am 0da93008: mutate() BitmapDrawable before directly editingBrian Attwell2014-10-311-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '3fd0e71bf716dd0fe4e856fc4d6ddc88119062f4': mutate() BitmapDrawable before directly editing
| | * | | am 0da93008: mutate() BitmapDrawable before directly editingBrian Attwell2014-10-311-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '0da93008e49306e99a90b114b7f8a60c78774fc3': mutate() BitmapDrawable before directly editing
| | | * | mutate() BitmapDrawable before directly editingBrian Attwell2014-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpandingEntryCardView directly modifies BitmapDrawables instead of calling ImageView#setTint(). This was convenient, but had the side affect of preventing re-use of these BitmapDrawables with different tints. Now that we want to share the same BitmapDrawables inside the edit screen, we need to call mutate() on these drawables before editing them in order to avoid affecting the tint in the edit screen. Alternatively, we could change ExpandingEntryCardView to use ImageView#setTint() instead. But this is more work. Bug: 18004959 Change-Id: I5c0e33348cf538a69a10802a6205ad36fc548d54
* | | | | am e9141e83: (-s ours) am 553e03f6: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9141e83ec491bbcacce1390659e00099d8b35de': Import translations. DO NOT MERGE
| * | | | am 553e03f6: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '553e03f650040e820642ccfcb90012c48fd2eb95': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-833/+868
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80572d5b9593a5df1824741aca7f73a85edf158a Auto-generated-cl: translation import
* | | | | | am 3782fb40: am 1ba5ac20: am 368e2c6f: Merge "Apply TtsSpan to known phone ↵Walter Jang2014-10-316-12/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numbers in contact interactions" into lmp-mr1-dev * commit '3782fb40a2dddf700c35b6477039f00c07e1acd5': Apply TtsSpan to known phone numbers in contact interactions
| * | | | | am 1ba5ac20: am 368e2c6f: Merge "Apply TtsSpan to known phone numbers in ↵Walter Jang2014-10-316-12/+27
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | contact interactions" into lmp-mr1-dev * commit '1ba5ac202bc0c0eb1484792df1c6d548ab30afd6': Apply TtsSpan to known phone numbers in contact interactions
| | * | | | am 368e2c6f: Merge "Apply TtsSpan to known phone numbers in contact ↵Walter Jang2014-10-306-12/+27
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | interactions" into lmp-mr1-dev * commit '368e2c6f57f98289b668a4d9ffb8038e9e2059d6': Apply TtsSpan to known phone numbers in contact interactions
| | | * | | Merge "Apply TtsSpan to known phone numbers in contact interactions" into ↵Walter Jang2014-10-306-12/+27
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * | | Apply TtsSpan to known phone numbers in contact interactionsWalter Jang2014-10-296-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary content description in ContactInteraction must be made a Spannable so that the TtsSpan can be progated from the Loader (where the ContactInteraction is constructed) up to the ExpandingEntryCardView. Bug 17322140 Change-Id: If668f27cab20822f3c80aab606089e6b6f2a96c0
* | | | | | | am dcf4e680: am 65cad1ee: am 8ec657f9: Merge "New assets for the edit ↵Brian Attwell2014-10-3140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen" into lmp-mr1-dev * commit 'dcf4e6806bc39fc8e28b40140a1d360e5634c5a8': New assets for the edit screen
| * | | | | | am 65cad1ee: am 8ec657f9: Merge "New assets for the edit screen" into ↵Brian Attwell2014-10-3140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '65cad1ee004856f25cbe7047afcbc92e5229dc60': New assets for the edit screen