android_frameworks_ex - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	am a27fb71f: (-s ours) am 939ce1b0: Restart loader on attachment cursor updates	Paul Westbrook	2012-10-29	0	-0/+0
\|\ \| \| \| \| \| \| \| \|	* commit 'a27fb71f92f323b5d693942d219f66b886fad6e7': Restart loader on attachment cursor updates
\| *	am 939ce1b0: Restart loader on attachment cursor updates	Paul Westbrook	2012-10-29	1	-1/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '939ce1b0bcd1ded7e1dc8c36eb89dcd4d891bd12': Restart loader on attachment cursor updates
\| \| *	Restart loader on attachment cursor updates	Paul Westbrook	2012-10-26	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cherry-pick of https://googleplex-android-review.googlesource.com/#/c/245483/ Bug: 7403076 Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
* \| \|	am f70a5e84: am 690abee6: Show old results	Paul Westbrook	2012-10-25	1	-5/+36
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'f70a5e84bcd944b46f1621144f50f83c7eb26215': Show old results
\| * \|	am 690abee6: Show old results	Paul Westbrook	2012-10-25	1	-5/+36
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '690abee69959184f0525e7d4ea2630926e66055f': Show old results
\| \| *	Show old results	Paul Westbrook	2012-10-25	1	-5/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep showing old recipient results when no local results are returned, if we are waiting for server results cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246005/ Bug: 7407129 Change-Id: If495ff6437da064206923dc95ee61b7a4f19c2f3
* \| \|	Allow PhotoViewActivity to choose inital photo by uri	Martin Hibdon	2012-10-16	2	-1/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that the correct photo will be displayed even if the contents of the cursor changes between the time the activity is launched and the cursor gets loaded. Change-Id: I5f00ebde072587929f01e34c8b4b84e5eb0e9bd3
* \| \|	am 0453ec9b: am b32dd40a: SMS text messaging omits numbers in parentheses	Tom Taylor	2012-10-16	1	-1/+11
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0453ec9b61f1c416c8a79e401f9d3358bef2c59f': SMS text messaging omits numbers in parentheses
\| * \|	am b32dd40a: SMS text messaging omits numbers in parentheses	Tom Taylor	2012-10-16	1	-1/+11
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b32dd40aaa11a850f2ed273dd55bf25cea5d7b9d': SMS text messaging omits numbers in parentheses
\| \| *	SMS text messaging omits numbers in parentheses	Tom Taylor	2012-10-16	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug 7355280 Very localized fix. Tweak the phone number matching pattern to handle a "1" before parens. Change-Id: I67d878145fbc0b0ac17197043ea84f68e52b8156
* \| \|	am 5788646d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release ↵	The Android Open Source Project	2012-10-15	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- do not merge * commit '5788646d57c764d16e38b46b0eff15358989be26':
\| \| \
\| \| \
\| *-. \	Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge	The Android Open Source Project	2012-10-15	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I312e1f2eefcdb6378d1dfbcdde2ed26d8a2da6b4
\| \| \| * \	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-10-14	0	-0/+0
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| \| *	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-10-12	0	-0/+0
\| \| \| \| \|\
\| \| * \| \| \	merge in jb-mr1-factory-release history after reset to jb-mr1-dev	The Android Automerger	2012-10-12	0	-0/+0
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| / \| \| \| \| \|/ \| \| \| \|/\|
* \| \| \| \|	am e209312c: (-s ours) am 14a4df6f: Load preview first	Paul Westbrook	2012-10-13	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e209312c5f2784bf746c24e7708b76b9f2e69b7f': Load preview first
\| * \| \| \|	am 14a4df6f: Load preview first	Paul Westbrook	2012-10-13	1	-14/+12
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	* commit '14a4df6f91f3563ab956ed1730bdbf4e6976e5cd': Load preview first
\| \| * \| \|	Load preview first	Paul Westbrook	2012-10-13	1	-14/+12
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the preview is available, load the it first, while waiting for the full size image to load Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/238893/ Bug: 7340082 Bug: 7298245 Change-Id: I64934001d832844a776f8d9c1f2abcece552f79c
* \| \| \|	am 777cea29: (-s ours) am da4cfeec: Set the scale type for the default image ↵	Paul Westbrook	2012-10-12	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	icon * commit '777cea29262e48549295c3c028098edc1f90eeeb': Set the scale type for the default image icon
\| * \| \|	am da4cfeec: Set the scale type for the default image icon	Paul Westbrook	2012-10-12	1	-0/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'da4cfeec8ee8863089da547a643393ab3520f5d8': Set the scale type for the default image icon
\| \| * \|	Set the scale type for the default image icon	Paul Westbrook	2012-10-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By setting the scale type to center, the default icon is not scaled up. cherry-pick of https://googleplex-android-review.googlesource.com/#/c/238674/ Bug: 7298245 Bug: 7340457 Change-Id: I66200a1c751ca80e878e55a7b9daa656a6cbe98d
* \| \| \|	Merge "Temporary fix for image viewer crash"	Adam Copp	2012-10-05	1	-0/+6
\|\ \ \ \
\| * \| \| \|	Temporary fix for image viewer crash	Adam Copp	2012-10-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug causing the app to crash when we can't open a stream to a url when we download an image. Bug: 7294701 Change-Id: Ifd0c62c3f5bb6a168e2e2932734fa448ffb9344c
* \| \| \| \|	am 4c9dbbf9: (-s ours) Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-10-04	0	-0/+0
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \|	* commit '4c9dbbf9378b70c4011817eb1f8696c43f05b4b0':
\| * \| \| \|	Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-10-04	0	-0/+0
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \|	Change-Id: I0075dec8bd1735d3db582cc242e8d8b7157813be
\| \| * \| \|	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-10-04	0	-0/+0
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	am 63414f62: am c16fb2a3: cherrypick: Make sure we check the most up to date ↵	mindyp	2012-10-03	1	-5/+5
\|\\| \| \| \| \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text for the token offsets. * commit '63414f62379b45a14eac7bc6bf9c264b4b4c2c3d': cherrypick: Make sure we check the most up to date text for the token offsets.
\| * \| \|	am c16fb2a3: cherrypick: Make sure we check the most up to date text for the ↵	mindyp	2012-10-03	1	-5/+5
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	token offsets. * commit 'c16fb2a3bcc168fb69a92f43aebf6cfa4bf3a007': cherrypick: Make sure we check the most up to date text for the token offsets.
\| \| * \|	cherrypick: Make sure we check the most up to date text for the token offsets.	mindyp	2012-10-03	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The issue here was that we were using the old version of the editable string (cached in var text) to look for the start/end of tokens, but the result of calling commitChip may have updated the text (added corrective rfc822 formatting, or a display name) Fixes b/7268603 [Manta] List of email addresses pasted into the To field is broken Change-Id: Iccc8dbf78a018c84fd818582d10ff2b02a787276
* \| \| \|	am c2ff4e6d: (-s ours) Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-10-02	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c2ff4e6dac63a30c7e0b99e00f577acef84f0534':
\| * \| \|	Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-10-02	0	-0/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \|	Change-Id: Ia2ad0f4540780e5a2c68f4b9773ffd1942228d93
\| \| * \|	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-10-02	0	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
* \| \| \|	am b2d148b8: am 0c6fe7e6: cherrypick: Fix crashes associated with new logic ↵	mindyp	2012-10-01	1	-4/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to replace entire address with name + address * commit 'b2d148b8624df5f56e976cad38e1812f5fa674be': cherrypick: Fix crashes associated with new logic to replace entire address with name + address
\| * \| \|	am 0c6fe7e6: cherrypick: Fix crashes associated with new logic to replace ↵	mindyp	2012-10-01	1	-4/+4
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	entire address with name + address * commit '0c6fe7e60e7550e56ad1982d0d5833b64eea6f97': cherrypick: Fix crashes associated with new logic to replace entire address with name + address
\| \| * \|	cherrypick: Fix crashes associated with new logic to replace entire address ↵	mindyp	2012-10-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with name + address Fixes b/7257614 crash when replying to a message Change-Id: I6dcda376073f941fba4b09a647bdb00a92e4ccce
* \| \| \|	am c930ef0a: (-s ours) Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-09-26	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c930ef0a3ed04ef8eed499e4146a1cb09c2443a4':
\| * \| \|	Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-09-26	0	-0/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \|	Change-Id: I30293e9406cfeb72eb1d83cdf39e4ec60f35744c
\| \| * \|	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-09-26	0	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-09-25	0	-0/+0
\| \| \| \|\
* \| \| \| \|	am e16e5a89: am 3817205e: am 215b1c80: The "original text" is just what we ↵	mindyp	2012-09-25	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are putting in the text view, which is displaytext * commit 'e16e5a89a0807299cf1464e225d10adb1d277318': The "original text" is just what we are putting in the text view, which is displaytext
\| * \| \| \|	am 3817205e: am 215b1c80: The "original text" is just what we are putting in ↵	mindyp	2012-09-25	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the text view, which is displaytext * commit '3817205ea94886f05f026b25c61e30288dd3fb8b': The "original text" is just what we are putting in the text view, which is displaytext
\| \| * \| \|	am 215b1c80: The "original text" is just what we are putting in the text ↵	mindyp	2012-09-25	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	view, which is displaytext * commit '215b1c80111ccc8d42256fa8f38f3d00e0171cf2': The "original text" is just what we are putting in the text view, which is displaytext
\| \| \| * \| \|	The "original text" is just what we are putting in the text view, which is ↵	mindyp	2012-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	displaytext Fixes b/7233276 Crash at clicking Email - ReplyAll on Manta Change-Id: Icd5e2c0c2afb625a6b181592b2da27a008266a33
* \| \| \| \| \|	resolved conflicts for merge of b3f0f056 to master	Paul Westbrook	2012-09-25	2	-3/+188
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I5def1804466ff971ed5bc5afd2a2d68e135d20a2
\| * \| \| \| \|	am 3a539a30: am 5211e468: Add Exif parser	Paul Westbrook	2012-09-25	2	-170/+343
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3a539a30189f03c60019a976bd4b9095eec15208': Add Exif parser
\| \| * \| \| \|	am 5211e468: Add Exif parser	Paul Westbrook	2012-09-25	2	-170/+343
\| \| \|\\| \| \| \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	* commit '5211e4682a26be787e60b1c56f56b113a2fac26c': Add Exif parser
\| \| \| * \|	Add Exif parser	Paul Westbrook	2012-09-25	2	-170/+343
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Class to parse exif headers of images to detect orientation Modify ImageUtils#decodeStream to parse the exif header and respect orientation Bug: 7087307 Change-Id: I93c3a69a50ae26d3fd4e96944439f87e9d511945
* \| \| \| \|	am 6c06fb23: am 65a0f024: am b6641931: Make sure when we reverse lookup a ↵	mindyp	2012-09-24	1	-2/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	recipient, we replace the underlying text string as well. * commit '6c06fb23e6c14643e1e0bd13eb4e9ead685c769e': Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
\| * \| \| \|	am 65a0f024: am b6641931: Make sure when we reverse lookup a recipient, we ↵	mindyp	2012-09-24	1	-2/+6
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replace the underlying text string as well. * commit '65a0f02472df7c28f356822993142f6fff3eacc4': Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
\| \| * \| \|	am b6641931: Make sure when we reverse lookup a recipient, we replace the ↵	mindyp	2012-09-24	1	-2/+6
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	underlying text string as well. * commit 'b6641931653e19766025820fb78c7142e597545e': Make sure when we reverse lookup a recipient, we replace the underlying text string as well.