<feed xmlns='http://www.w3.org/2005/Atom'>
<title>android_frameworks_ex/photoviewer, branch stable/cm-13.0-ZNH0E</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/'/>
<entry>
<title>Merge branch 'goog/jb-ub-mail-ur8' into master</title>
<updated>2013-02-15T18:49:18+00:00</updated>
<author>
<name>Paul Westbrook</name>
<email>pwestbro@google.com</email>
</author>
<published>2013-02-15T18:49:18+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=1a76449a643ab1e544da54514cf09f6f17f4d075'/>
<id>1a76449a643ab1e544da54514cf09f6f17f4d075</id>
<content type='text'>
Conflicts:
	photoviewer/AndroidManifest.xml
	photoviewer/res/values/dimen.xml
	photoviewer/src/com/android/ex/photo/Intents.java
	photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
	photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
	photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
	photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
	photoviewer/src/com/android/ex/photo/util/ImageUtils.java
	photoviewer/src/com/android/ex/photo/views/PhotoView.java

Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	photoviewer/AndroidManifest.xml
	photoviewer/res/values/dimen.xml
	photoviewer/src/com/android/ex/photo/Intents.java
	photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
	photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
	photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
	photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
	photoviewer/src/com/android/ex/photo/util/ImageUtils.java
	photoviewer/src/com/android/ex/photo/views/PhotoView.java

Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
</pre>
</div>
</content>
</entry>
<entry>
<title>Delete framework/ex's photo viewer</title>
<updated>2012-12-19T23:05:57+00:00</updated>
<author>
<name>Paul Westbrook</name>
<email>pwestbro@google.com</email>
</author>
<published>2012-12-19T23:05:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=9fdfd2d5863f4fe8570db3e03df4fec98c20b655'/>
<id>9fdfd2d5863f4fe8570db3e03df4fec98c20b655</id>
<content type='text'>
Bug: 7389288
Change-Id: I3139681fcd24c796115386e70a9fc3220fca8d87
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Bug: 7389288
Change-Id: I3139681fcd24c796115386e70a9fc3220fca8d87
</pre>
</div>
</content>
</entry>
<entry>
<title>am e9c8a53c: am 7d7b83bc: Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev</title>
<updated>2012-12-15T01:51:32+00:00</updated>
<author>
<name>Mindy Pereira</name>
<email>mindyp@google.com</email>
</author>
<published>2012-12-15T01:51:32+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=0d9a747070daed3ba994b0390c043acfab46506e'/>
<id>0d9a747070daed3ba994b0390c043acfab46506e</id>
<content type='text'>
* commit 'e9c8a53c11e7092344f49e965150037ca8581dbe':
  Fix problem where part of wrong photo shows
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* commit 'e9c8a53c11e7092344f49e965150037ca8581dbe':
  Fix problem where part of wrong photo shows
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix problem where part of wrong photo shows</title>
<updated>2012-12-15T00:46:34+00:00</updated>
<author>
<name>Paul Westbrook</name>
<email>pwestbro@google.com</email>
</author>
<published>2012-12-15T00:35:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=8f7bdab470c48a5e53c9a8a54ae9eb7f59827a32'/>
<id>8f7bdab470c48a5e53c9a8a54ae9eb7f59827a32</id>
<content type='text'>
Fix a problem when swiping through a few image attachments
where, when reaching the end, part of the N-1 photo is shown while
the blue glow is being shown on the right side

Bug: 7745114

Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/260544/

Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix a problem when swiping through a few image attachments
where, when reaching the end, part of the N-1 photo is shown while
the blue glow is being shown on the right side

Bug: 7745114

Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/260544/

Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix problem where part of wrong photo shows</title>
<updated>2012-12-15T00:35:35+00:00</updated>
<author>
<name>Paul Westbrook</name>
<email>pwestbro@google.com</email>
</author>
<published>2012-12-15T00:35:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=30106ab658e054bfb96cadfe4e3decf800a3f304'/>
<id>30106ab658e054bfb96cadfe4e3decf800a3f304</id>
<content type='text'>
Fix a problem when swiping through a few image attachments
where, when reaching the end, part of the N-1 photo is shown while
the blue glow is being shown on the right side

Bug: 7745114
Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix a problem when swiping through a few image attachments
where, when reaching the end, part of the N-1 photo is shown while
the blue glow is being shown on the right side

Bug: 7745114
Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
</pre>
</div>
</content>
</entry>
<entry>
<title>resolved conflicts for merge of 28ed566a to master</title>
<updated>2012-10-30T00:00:02+00:00</updated>
<author>
<name>Mark Wei</name>
<email>markwei@google.com</email>
</author>
<published>2012-10-29T23:51:28+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=9dd5598ae90b252377fef14106436a73a868d29e'/>
<id>9dd5598ae90b252377fef14106436a73a868d29e</id>
<content type='text'>
Change-Id: I7b97bf6ddb01e8bbc059708889a4dc30efe6c8e9
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I7b97bf6ddb01e8bbc059708889a4dc30efe6c8e9
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix for panorama icon not always showing up in photo viewer.</title>
<updated>2012-10-27T05:47:10+00:00</updated>
<author>
<name>Mark Wei</name>
<email>markwei@google.com</email>
</author>
<published>2012-10-25T21:12:23+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=5f0470b259c56dd5df171948d6efd4219a3a17f8'/>
<id>5f0470b259c56dd5df171948d6efd4219a3a17f8</id>
<content type='text'>
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246161/
Bug: 7392422
Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246161/
Bug: 7392422
Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
</pre>
</div>
</content>
</entry>
<entry>
<title>Restart loader on attachment cursor updates</title>
<updated>2012-10-27T05:39:00+00:00</updated>
<author>
<name>Paul Westbrook</name>
<email>pwestbro@google.com</email>
</author>
<published>2012-10-24T15:22:18+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=939ce1b0bcd1ded7e1dc8c36eb89dcd4d891bd12'/>
<id>939ce1b0bcd1ded7e1dc8c36eb89dcd4d891bd12</id>
<content type='text'>
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/245483/
Bug: 7403076
Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/245483/
Bug: 7403076
Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix for panorama icon not always showing up in photo viewer.</title>
<updated>2012-10-25T21:12:23+00:00</updated>
<author>
<name>Mark Wei</name>
<email>markwei@google.com</email>
</author>
<published>2012-10-25T21:12:23+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=a1bdcf1af2c39a0d8b0d0fb8f32ea43a70aed17f'/>
<id>a1bdcf1af2c39a0d8b0d0fb8f32ea43a70aed17f</id>
<content type='text'>
Bug: 7392422
Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Bug: 7392422
Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
</pre>
</div>
</content>
</entry>
<entry>
<title>Restart loader on attachment cursor updates</title>
<updated>2012-10-24T21:02:56+00:00</updated>
<author>
<name>Paul Westbrook</name>
<email>pwestbro@google.com</email>
</author>
<published>2012-10-24T15:22:18+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/LineageOS/android_frameworks_ex/commit/?id=b1b8fc2577d8ce9493608056cef6a725437a5ef2'/>
<id>b1b8fc2577d8ce9493608056cef6a725437a5ef2</id>
<content type='text'>
Bug: 7403076
Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Bug: 7403076
Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
</pre>
</div>
</content>
</entry>
</feed>
