summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | resolved conflicts for merge of ffc0111f to masterJin Cao2014-12-153-157/+97
|\| | | | | | | | | | | | | | | Change-Id: I92bcf75bdb01503aa652890859c589441d0a1a0f
| * | | Clean up chipsJin Cao2014-12-153-155/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't reset selection when we manually change selection due to selecting a chip. We need this selection index to make backspace properly delete the correct chip. - Remove selected chips code because we now use the popup for selected indicator. - Fix accessibility SDK (didn't crash previously because with SDK < 16 mIsAccessibilityOn is always false anyway). - Clean up various warnings throughout RecipientEditTextView. b/18682890 Change-Id: Ided53c0ea29532262c1f592798381ed9bc704fc0
* | | | am 654c967e: Prevent infinite posting of RunnablesScott Kennedy2014-12-121-6/+24
|\| | | | | | | | | | | | | | | | | | | * commit '654c967e9560ccb40a465a78e3296980f530ed55': Prevent infinite posting of Runnables
| * | | Prevent infinite posting of RunnablesScott Kennedy2014-12-121-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If shrink() is called when the View's width is 0, and it's GONE, its width will never be greater than 0, so it just keeps posting the Runnable forever. Bug: 18613863 Change-Id: I1b2fa598826b6fa47996597c835533de3a4af220
* | | | am cb11fced: Adding customized chip color supportKaikai Wang2014-12-092-9/+33
|\| | | | | | | | | | | | | | | | | | | * commit 'cb11fced23f3a08ad68ea61719d7f0fdeb0f7279': Adding customized chip color support
| * | | Adding customized chip color supportKaikai Wang2014-12-092-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding customized chip color attributes to selected and unselected states, so that chip consumers can use their own colors for the chips to better serve their UX requirements. Without specifying these colors, the chips UI will keep the current default color scheme Bug: 18293881 Change-Id: I269c478df312ea634f90bd1c97a7a08c3d14d9d7
* | | | am 494bec8d: Override setDropDownAnchor in RecipientEditTextView to update ↵Kevin Lin2014-12-021-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | its cached anchor view if clients use setDropDownAnchor instead of declaring the anchor in the xml file. * commit '494bec8daac55c76707e140c71fb8783fb3a9323': Override setDropDownAnchor in RecipientEditTextView to update its cached anchor view if clients use setDropDownAnchor instead of declaring the anchor in the xml file.
| * | | Override setDropDownAnchor in RecipientEditTextView to update its cached ↵Kevin Lin2014-12-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | anchor view if clients use setDropDownAnchor instead of declaring the anchor in the xml file. Change-Id: Ibd3127768c903be3645b02584bfe49090cf2520e
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7307736b4b3d7bd36d3bb852123b5afc662f8cf7 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I199015df2925cf57b93783a81e4e184464a3733c Auto-generated-cl: translation import
* | | | am 18eefa52: Merge "Auto dismiss popups when touches happen outside the ↵Jin Cao2014-11-101-2/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | popup window" into ub-chips-cranbrook * commit '18eefa523611ccd2165e6d79621f50ed038bb45d': Auto dismiss popups when touches happen outside the popup window
| * | | Merge "Auto dismiss popups when touches happen outside the popup window" ↵Jin Cao2014-11-101-2/+13
| |\ \ \ | | | | | | | | | | | | | | | into ub-chips-cranbrook
| | * | | Auto dismiss popups when touches happen outside the popup windowJin Cao2014-11-101-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18218445 Change-Id: I9f5d0b2bfbc023c1f77967cf14de45e769bdd543
* | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I648526f03a3df15a126117770f91038d9e95ca89 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-11-071-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7376098844ef5ed6fc869c52e1ee47d33780ee6c Auto-generated-cl: translation import
* | | | | | am 662ccbe4: Merge "Make clearSelectedChip public" into ub-chips-cranbrookJin Cao2014-11-071-1/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '662ccbe4c86f59c734d6e523760806bbd6d4fbcc': Make clearSelectedChip public
| * | | | | Merge "Make clearSelectedChip public" into ub-chips-cranbrookJin Cao2014-11-071-1/+5
| |\ \ \ \ \
| | * | | | | Make clearSelectedChip publicJin Cao2014-11-061-1/+5
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | b/18218445 Change-Id: I56ba4367ce45cc4ce0ec934825fe021d60775c5e
* | | | | | am 732fe3e7: Take vertical offset into account for dropdown heightJin Cao2014-11-061-1/+2
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | * commit '732fe3e7a78c23c17dab039b9b6540199a6352b7': Take vertical offset into account for dropdown height
| * | | | Take vertical offset into account for dropdown heightJin Cao2014-11-061-1/+2
| |/ / / | | | | | | | | | | | | Change-Id: Ie3d5110d27a1868f5afedd336416fca346e5a31c
* | | | am d525772a: Change alternates dropdown to use minHeightJin Cao2014-11-051-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'd525772ac3de152c946c2b7486ff759b8a45f9f2': Change alternates dropdown to use minHeight
| * | | Change alternates dropdown to use minHeightJin Cao2014-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to use minHeight and wrap_content to take large texts into account. b/18218875 Change-Id: Ib0e0350207e1aebc405f1d72f26a017bb9c4627e
* | | | am 191db274: (-s ours) am 43f14897: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '191db274eefd726da7c7bbe96ba86b92b6a6a4e1': Import translations. DO NOT MERGE
| * | | am 43f14897: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '43f14897cf4577ee319d4a53c0410fe2755735f4': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3073-74/+74
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf01dcc4381b221298da736be942aca50e78369f Auto-generated-cl: translation import
* | | | | am bae3fba5: Switching to LOLLIPOP version code after L\'s SDK changeKaikai Wang2014-10-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'bae3fba541f49eac5a397a9cef309391d9a37fe5': Switching to LOLLIPOP version code after L's SDK change
| * | | | Switching to LOLLIPOP version code after L's SDK changeKaikai Wang2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I61450e20822315aeace9b8009c6622b0b7bed728
* | | | | am 2d06b856: Use instead of for number formattingJin Cao2014-10-2281-81/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2d06b8561ccce78066ee45208cdeeed9ef7fd8ee': Use $d instead of $s for number formatting
| * | | | Use $d instead of $s for number formattingJin Cao2014-10-2281-81/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure that the numbers are properly translated. b/18011726 Change-Id: Id01bd690ac87875b17cfa4222e00b764aef9fba1
* | | | | am 211ddc7f: (-s ours) am a38f80f1: (-s ours) am 966b3500: (-s ours) Import ↵Baligh Uddin2014-10-220-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '211ddc7f4d2f4d0df6fa295fe8b82018e7860d5f':
| * | | | am a38f80f1: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-210-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | * commit 'a38f80f184b0604bff81232c2559784cc64e0aea':
| | * | | am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '966b35006b2865b50bb7cc880cc5eb9f26c27a36': Import translations. DO NOT MERGE
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30ee69f2eacd382e2fcd494feb2638382b468b44 Auto-generated-cl: translation import
* | | | | | am 8356b818: (-s ours) am 43e9ff21: (-s ours) am 2b498330: (-s ours) am ↵Baligh Uddin2014-10-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE * commit '8356b8189cf5d429c60a3f13ff52f1e8f70ff1dd': Import translations. DO NOT MERGE
| * | | | | am 43e9ff21: (-s ours) am 2b498330: (-s ours) am 19fac962: (-s ours) am ↵Baligh Uddin2014-10-190-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | 966b3500: (-s ours) Import translations. DO NOT MERGE * commit '43e9ff21f6b14f208691f2bcafce566ac3202a7b': Import translations. DO NOT MERGE
| | * | | am 2b498330: (-s ours) am 19fac962: (-s ours) am 966b3500: (-s ours) Import ↵Baligh Uddin2014-10-190-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '2b49833077e63d0e38afa4d703ccd27b6a3cc600': Import translations. DO NOT MERGE
| | | * | | am 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19fac962d0b00b061152605365440322c7232c71': Import translations. DO NOT MERGE
| | | * | | am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |/| | | | | | |/ / | | | | | | | | | | | | | | | * commit '966b35006b2865b50bb7cc880cc5eb9f26c27a36': Import translations. DO NOT MERGE
| | | * / Import translations. DO NOT MERGEstaging/cm-12.0-cafBaligh Uddin2014-10-192-2/+2
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I9ab4ea81572597b8d4be42c0ed83bfc498c7d6eb Auto-generated-cl: translation import
* | | | fix buildNick Kralevich2014-10-181-1/+1
| | | | | | | | | | | | | | | | Change-Id: I3ded33c09e1b393d1a62cc6738474704e0d3141e
* | | | am 0437e862: Close directoryCursor. b/17949234Andrew Sapperstein2014-10-181-4/+11
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '0437e862005912a1e5bf054769f23ed9cc69f811': Close directoryCursor. b/17949234
| * | | Close directoryCursor. b/17949234Andrew Sapperstein2014-10-181-4/+11
| | | | | | | | | | | | | | | | | | | | Fixes b/18039002. Change-Id: I88c23adb63ba64ca9f638086ad1c29a7fb839868
* | | | am 50fcac9f: (-s ours) am e7ebf99c: (-s ours) Add an <application> tag to ↵Scott Kennedy2014-10-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | the manifest DO NOT MERGE * commit '50fcac9f8629f6b02408c787e46ff4119698cc01': Add an <application> tag to the manifest DO NOT MERGE
| * | | am e7ebf99c: (-s ours) Add an <application> tag to the manifest DO NOT MERGEScott Kennedy2014-10-170-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'e7ebf99c82143a9cb17161dbb71614545cae3976': Add an <application> tag to the manifest DO NOT MERGE
| | * | | Add an <application> tag to the manifest DO NOT MERGEScott Kennedy2014-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some testing infrastructure requires this. Change-Id: I989168fb4015927fb8a79095222b72bd59e0d7f2
* | | | | am 0ecd6946: Add an <application> tag to the manifestScott Kennedy2014-10-141-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0ecd6946ebc47caa7132ce91cd5f1236d45b3f54': Add an <application> tag to the manifest
| * | | | Add an <application> tag to the manifestScott Kennedy2014-10-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some testing infrastructure requires this. Change-Id: I44fe160b0a69160c083bda78c5450d55678e10bb
* | | | | am f6ddb754: Don\'t rely on action bar heightJin Cao2014-10-131-22/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6ddb7541feb5e415f9750fb403814dbbc9068be': Don't rely on action bar height
| * | | | Don't rely on action bar heightJin Cao2014-10-131-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When computing the scroll offset to scroll the edittext's bottom line into view (to maximize the space for the dropdown), don't rely on the statis status bar + action bar height calculation because action bar's height changes depending on platform version and orientation. Instead, use the scroll view's location in window as the "top" of the visible display frame. b/17824127 Change-Id: I35fd04201a11e5ba47de84eb4a1c5d309e08c203