Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / opt / chips / f30a42800318f6790d55421f8f6980eb38db4d3c
  1. f30a428 Merge from ur8 by mindyp · 12 years ago
  2. a9c1d25 am 4bd6592a: am 18bc55d1: Merge remote-tracking branch \'goog/jb-ub-mail\' into gmailmerge by Paul Westbrook · 12 years ago
  3. 58ff57f Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmerge by Paul Westbrook · 12 years ago
  4. 1aac240 am 160a0ef8: am f5ac3286: SMS text messaging omits numbers in parentheses by Tom Taylor · 12 years ago
  5. 4491a06 SMS text messaging omits numbers in parentheses by Tom Taylor · 12 years ago
  6. cb76b4d Reduce time until first revision of a chip is drawn. by mindyp · 12 years ago
  7. 4f82d88 dont replace the text in the text field when editing a fake or generated entry by mindyp · 12 years ago
  8. 8eb212f am e3c6084b: (-s ours) am a34f7115: Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  9. fd3e06e am 3a47ffb4: (-s ours) am 6297b872: Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  10. f802459 am a6292fc0: am 519f7918: am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec by mindyp · 12 years ago
  11. b7a2a7b Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  12. 8e5503b am edca3dd4: am d00c91b9: am 06208d07: cherrypick: Reset maxlines when the user expands text by mindyp · 12 years ago
  13. d92ca77 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  14. 4f936ec Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  15. c439f7d merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  16. b2e6b51 am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec by mindyp · 12 years ago
  17. 6b1141f am 06208d07: cherrypick: Reset maxlines when the user expands text by mindyp · 12 years ago
  18. 5e60c2b Merge changes to chips from unbundled branch: update behavior to match new ux spec by mindyp · 12 years ago
  19. 0d93ca4 Make sure that we take the existng temporary contact, where available. by mindyp · 12 years ago
  20. 9f4d30a Make sure that the last "fake entry" chip is correctly committed by mindyp · 12 years ago
  21. 0d7c89b Update chips to follow new ux spec for replacement by mindyp · 12 years ago
  22. 374ccb2 cherrypick: Reset maxlines when the user expands text by mindyp · 12 years ago
  23. 3d78920 Reset maxlines when the user expands text by mindyp · 12 years ago
  24. e38a6c1 am f4ec2c66: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  25. 65f20d4 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  26. a60c759 Show old results by Paul Westbrook · 12 years ago
  27. 63306ed am f70a5e84: am 690abee6: Show old results by Paul Westbrook · 12 years ago
  28. d2f9bd4 Show old results by Paul Westbrook · 12 years ago
  29. 37726c0 Show old results by Paul Westbrook · 12 years ago
  30. 65a6512 am 0453ec9b: am b32dd40a: SMS text messaging omits numbers in parentheses by Tom Taylor · 12 years ago
  31. 0120ebc SMS text messaging omits numbers in parentheses by Tom Taylor · 12 years ago
  32. 3ea42c9 am 63414f62: am c16fb2a3: cherrypick: Make sure we check the most up to date text for the token offsets. by mindyp · 12 years ago
  33. b5afbc7 cherrypick: Make sure we check the most up to date text for the token offsets. by mindyp · 12 years ago
  34. f214812 Make sure we check the most up to date text for the token offsets. by mindyp · 12 years ago
  35. 240655a am b2d148b8: am 0c6fe7e6: cherrypick: Fix crashes associated with new logic to replace entire address with name + address by mindyp · 12 years ago
  36. 73cb50b Add comments to the recipientedittextview replace code. by mindyp · 12 years ago
  37. a0e1c66 cherrypick: Fix crashes associated with new logic to replace entire address with name + address by mindyp · 12 years ago
  38. 2587536 Fix crashes associated with new logic to replace entire address with name + address by mindyp · 12 years ago
  39. baa59e8 am e16e5a89: am 3817205e: am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext by mindyp · 12 years ago
  40. 527d35c am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext by mindyp · 12 years ago
  41. a310e9b The "original text" is just what we are putting in the text view, which is displaytext by mindyp · 12 years ago
  42. e79d4af am 6c06fb23: am 65a0f024: am b6641931: Make sure when we reverse lookup a recipient, we replace the underlying text string as well. by mindyp · 12 years ago
  43. cd4f642 am b6641931: Make sure when we reverse lookup a recipient, we replace the underlying text string as well. by mindyp · 12 years ago
  44. fa8f1e4 Make sure when we reverse lookup a recipient, we replace the underlying text string as well. by mindyp · 12 years ago
  45. 03c0713 am 5193e0d5: am 7ef1f6e9: am 6c668476: We add the separator ourselves later if it wasnt specified in append. by mindyp · 12 years ago
  46. 267f269 am 75d7b96a: am 168c2840: am 3aa118e7: Be extra careful with commas in recipient chips by mindyp · 12 years ago
  47. ad7d892 am 6c668476: We add the separator ourselves later if it wasnt specified in append. by mindyp · 12 years ago
  48. 20d7af7 We add the separator ourselves later if it wasnt specified in append. by mindyp · 12 years ago
  49. bf12c1e am 3aa118e7: Be extra careful with commas in recipient chips by mindyp · 12 years ago
  50. abb864d Be extra careful with commas in recipient chips by mindyp · 12 years ago
  51. cf9e553 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  52. 1d8435c am 26e3f68a: Deal with commas within quoted text by mindyp · 12 years ago
  53. 0124468 Deal with commas within quoted text by mindyp · 12 years ago
  54. eeccb46 Merge commit 'a9721f38' into manualmerge by Mindy Pereira · 12 years ago
  55. 4e7d20f Merge change from jb-dev to master by Mindy Pereira · 12 years ago
  56. 4792af7 am c1938921: (-s ours) Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  57. 5f890e5 Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  58. 34f044f Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  59. 0182ebc am fe383816: (-s ours) Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  60. 374b7c4 Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  61. 52ef255 Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  62. 4567276 am 70b2d5b8: (-s ours) Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  63. b834b3f Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  64. e24af11 Import translations. DO NOT MERGE by Ying Wang · 12 years ago
  65. c703e7b am 030a01d3: Change # more to +# by Mindy Pereira · 12 years ago
  66. 2833056 Change # more to +# by Mindy Pereira · 12 years ago
  67. 1b73341 am 53a30410: Reconcile with jb-release by The Android Open Source Project · 12 years ago
  68. 5ccaf32 Reconcile with jb-release by The Android Open Source Project · 12 years ago
  69. 3b97ecf am 1a71f76d: Check for null adapter. by Mindy Pereira · 12 years ago
  70. ca52271 Check for null adapter. by Mindy Pereira · 12 years ago
  71. ba9cb66 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  72. b15287a am d38f00f9: am ea9eeb87: Area code truncated for the phone number in messaging app by Tom Taylor · 12 years ago
  73. 7c567ff am ea9eeb87: Area code truncated for the phone number in messaging app by Tom Taylor · 12 years ago
  74. 1bdbef8 Area code truncated for the phone number in messaging app by Tom Taylor · 12 years ago
  75. 863aebd am 2e85fe67: am ba14c7b0: Don\'t scroll when we are clearing text. by Mindy Pereira · 12 years ago
  76. a1b7046 am ba14c7b0: Don\'t scroll when we are clearing text. by Mindy Pereira · 12 years ago
  77. db108e1 Don't scroll when we are clearing text. by Mindy Pereira · 12 years ago
  78. 755a125 Add missing AOSP license by Daisuke Miyakawa · 12 years ago
  79. 4590564 am 4f14d40c: Reconcile with jb-release by The Android Open Source Project · 12 years ago
  80. 5a0a215 Reconcile with jb-release by The Android Open Source Project · 12 years ago
  81. 92bf65f merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  82. 7e06f6e am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error. by Mindy Pereira · 12 years ago
  83. 5befaf9 am 87a5af3e: Break out of infinite loop once we detect an error. by Mindy Pereira · 12 years ago
  84. c52ea8e Break out of infinite loop once we detect an error. by Mindy Pereira · 12 years ago
  85. b8e2960 am e9792f85: Reconcile with jb-release by The Android Open Source Project · 12 years ago
  86. 18dba4d Reconcile with jb-release by The Android Open Source Project · 12 years ago
  87. ff880f7 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  88. e62721e am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  89. b6bca58 am 8c2158e5: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  90. 003662c Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  91. e675cf8 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  92. 11bf302 am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev by Mindy Pereira · 12 years ago
  93. b305426 am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev by Mindy Pereira · 12 years ago
  94. 3032097 Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev by Mindy Pereira · 12 years ago
  95. c0e3599 Rather than change the text, just remove the waiting for entries row. by Mindy Pereira · 12 years ago
  96. b257676 am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev by Mindy Pereira · 12 years ago
  97. 5b3a9ff am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev by Mindy Pereira · 12 years ago
  98. 412e9ac Merge "The mysterious blank item was just a mis-used layout" into jb-dev by Mindy Pereira · 12 years ago
  99. cf11061 The mysterious blank item was just a mis-used layout by Mindy Pereira · 12 years ago
  100. 44318dc am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev by Mindy Pereira · 12 years ago