OSDN Git Service
Mangesh Ghiware [Thu, 19 Sep 2013 04:28:59 +0000 (21:28 -0700)]
am
9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
* commit '
9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63':
Make Up button in filmstrip go to Gallery.
Mangesh Ghiware [Thu, 19 Sep 2013 04:27:58 +0000 (04:27 +0000)]
Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 19 Sep 2013 02:34:01 +0000 (19:34 -0700)]
am
b2d70d5b: Fix various message issues
* commit '
b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b':
Fix various message issues
Mangesh Ghiware [Thu, 19 Sep 2013 01:25:26 +0000 (18:25 -0700)]
Make Up button in filmstrip go to Gallery.
Bug:
10748904
Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
Sascha Haeberling [Thu, 19 Sep 2013 00:08:29 +0000 (17:08 -0700)]
Fix various message issues
Bug:
10568697
Bug:
10589224
Bug:
10561095
Bug:
10589353
Bug:
10570925
Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf
Sascha Haeberling [Wed, 18 Sep 2013 22:05:50 +0000 (15:05 -0700)]
am
638e6f06: Clean up ApiHelper and remove unused code paths.
* commit '
638e6f06c877d90b907f66ea9c22b3c6b73c7384':
Clean up ApiHelper and remove unused code paths.
Sascha Haeberling [Wed, 18 Sep 2013 21:28:51 +0000 (14:28 -0700)]
Clean up ApiHelper and remove unused code paths.
Bug:
10821545
As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.
Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
Sascha Haeberling [Wed, 18 Sep 2013 17:41:19 +0000 (10:41 -0700)]
am
4ed20592: Adding Hideybar support for K and up.
* commit '
4ed20592482d2ab2f3f48ee72d5b1c06bf009034':
Adding Hideybar support for K and up.
Sascha Haeberling [Fri, 13 Sep 2013 18:58:33 +0000 (11:58 -0700)]
Adding Hideybar support for K and up.
Bug:
10723047
Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
ztenghui [Wed, 18 Sep 2013 00:04:47 +0000 (17:04 -0700)]
am
e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
* commit '
e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc':
Delete the captured video if cancel in review.
ztenghui [Wed, 18 Sep 2013 00:02:45 +0000 (00:02 +0000)]
Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
ztenghui [Tue, 17 Sep 2013 23:51:15 +0000 (16:51 -0700)]
Delete the captured video if cancel in review.
In capture intent case, video get inserted all the time before review.
So if cancelled in review mode, the captured video should be deleted.
bug:
8897671
Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
Sascha Haeberling [Tue, 17 Sep 2013 23:07:20 +0000 (16:07 -0700)]
am
15125661: Fall back to Photo module if stores index is illegal.
* commit '
15125661ad968cf4d40989a9bc88d11189beb0b3':
Fall back to Photo module if stores index is illegal.
Sascha Haeberling [Tue, 17 Sep 2013 22:44:22 +0000 (15:44 -0700)]
Fall back to Photo module if stores index is illegal.
Bug:
10805249
Change-Id: Iace590af34cf646abf7af74b498520d686c04511
Sascha Haeberling [Tue, 17 Sep 2013 23:01:12 +0000 (16:01 -0700)]
am
483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad
* commit '
483d25a21058094303b94e44cc67cbd8fecd4bf8':
Don't crash the app if camera is not available.
Sascha Haeberling [Tue, 17 Sep 2013 22:58:47 +0000 (22:58 +0000)]
Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:53:06 +0000 (15:53 -0700)]
am
4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
* commit '
4ee4d99cfc519847bd8f84aca9ece5d2b6519536':
Adding a simple done handler interface.
Sascha Haeberling [Tue, 17 Sep 2013 22:51:43 +0000 (22:51 +0000)]
Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:36:13 +0000 (15:36 -0700)]
Don't crash the app if camera is not available.
Bug:
10747001
Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
Doris Liu [Tue, 17 Sep 2013 22:20:46 +0000 (15:20 -0700)]
am
9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
* commit '
9c0492a606ca48dbc3e56b03051ea9242d952e3e':
Fix camera controls rotation for secure camera
Doris Liu [Tue, 17 Sep 2013 22:19:06 +0000 (22:19 +0000)]
Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
Doris Liu [Tue, 17 Sep 2013 22:07:31 +0000 (15:07 -0700)]
Fix camera controls rotation for secure camera
Bug:
8878379
Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49
Angus Kong [Tue, 17 Sep 2013 21:53:38 +0000 (14:53 -0700)]
am
c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
* commit '
c2497d0a7213a3c105ec312f12b0f8b00347d5e5':
Show dialog when camera device is not connected.
Angus Kong [Tue, 17 Sep 2013 21:51:50 +0000 (21:51 +0000)]
Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
Angus Kong [Mon, 16 Sep 2013 21:25:35 +0000 (14:25 -0700)]
Show dialog when camera device is not connected.
bug:
10726516
Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
ztenghui [Tue, 17 Sep 2013 20:55:16 +0000 (13:55 -0700)]
am
828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
* commit '
828c9190aafc9b57126f5a4868e5cee922cf9f2c':
Use a new Intent to work around issues in framework
ztenghui [Tue, 17 Sep 2013 20:53:32 +0000 (20:53 +0000)]
Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
ztenghui [Tue, 17 Sep 2013 18:33:02 +0000 (11:33 -0700)]
Use a new Intent to work around issues in framework
Framework didn't update the action provider if reusing the intent object.
The work around is creating new intents here.
bug:
10713267
Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c
Baligh Uddin [Tue, 17 Sep 2013 04:21:26 +0000 (21:21 -0700)]
am
53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
53304d6953ff8f09a51c1128b7a0f3921e45b651':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Sep 2013 04:18:23 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Tue, 17 Sep 2013 04:17:42 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Doris Liu [Tue, 17 Sep 2013 01:48:59 +0000 (18:48 -0700)]
am
2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
* commit '
2065e606b68f7e8532317f076c7f688a2093186d':
Fix zoom for images with orientation tag
Doris Liu [Tue, 17 Sep 2013 01:47:01 +0000 (01:47 +0000)]
Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
Doris Liu [Mon, 16 Sep 2013 20:38:24 +0000 (13:38 -0700)]
Fix zoom for images with orientation tag
Bug:
10780042
Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
Angus Kong [Tue, 17 Sep 2013 01:34:52 +0000 (18:34 -0700)]
am
5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
* commit '
5bee41c6d727c730c7b10fba886862284a489257':
Set correct alpha for views in filmstrip.
Angus Kong [Tue, 17 Sep 2013 01:33:24 +0000 (01:33 +0000)]
Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 01:04:44 +0000 (18:04 -0700)]
am
3d91d906: Add HQ and HD strings.
* commit '
3d91d906fa288923b0d307f8333af89699303528':
Add HQ and HD strings.
Sascha Haeberling [Mon, 16 Sep 2013 22:41:58 +0000 (15:41 -0700)]
Add HQ and HD strings.
Bug:
10785988
Change-Id: Idc76e1888cb91d3ec6b56657f38f7422a2df7e43
Angus Kong [Sat, 14 Sep 2013 01:09:18 +0000 (18:09 -0700)]
Set correct alpha for views in filmstrip.
bug:
10713813
Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
Sascha Haeberling [Mon, 16 Sep 2013 21:07:11 +0000 (14:07 -0700)]
Adding a simple done handler interface.
Bug:
10747001
Needed by http://ag/360619
Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918
Doris Liu [Mon, 16 Sep 2013 20:24:40 +0000 (13:24 -0700)]
am
d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
* commit '
d688c0c31d4287c03b664f6fca5c6498a1e4bd7d':
Fix flicker when zooming images smaller than screen
Sascha Haeberling [Mon, 16 Sep 2013 20:24:40 +0000 (13:24 -0700)]
am
c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere.
* commit '
c29156954bcbf0218a78c308c3ba8f25e00aeecc':
Avoid expensive O(n) main-thread operation when adding Photo Sphere.
Doris Liu [Mon, 16 Sep 2013 20:22:55 +0000 (20:22 +0000)]
Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 16 Sep 2013 18:04:25 +0000 (11:04 -0700)]
Avoid expensive O(n) main-thread operation when adding Photo Sphere.
Bug:
10747001
Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
Baligh Uddin [Mon, 16 Sep 2013 19:59:09 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab05e7410b6829ad7934d71024fee3e1e2d77f8f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Sep 2013 19:48:25 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib51b9e17820f90dcc176c4f8196d60bca3b0d0a5
Auto-generated-cl: translation import
Doris Liu [Mon, 16 Sep 2013 19:21:21 +0000 (12:21 -0700)]
Fix flicker when zooming images smaller than screen
Bug:
10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
Baligh Uddin [Sat, 14 Sep 2013 20:45:24 +0000 (13:45 -0700)]
am
d095b79d: (-s ours) Import translations. DO NOT MERGE
* commit '
d095b79d083440e20d683ddb05ff8477159ee38f':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 07:47:58 +0000 (00:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I66cd67cee8d92b6c594ad9f19d217a1a4cceae44
Auto-generated-cl: translation import
Baligh Uddin [Sat, 14 Sep 2013 07:38:11 +0000 (00:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb32a9036f201b08701bfeea02cbf38552b1f24e
Auto-generated-cl: translation import
Angus Kong [Fri, 13 Sep 2013 23:43:54 +0000 (16:43 -0700)]
am
44974d4b: Don\'t show menu/indicators in wide-angle mode.
* commit '
44974d4b8014ec1f3c8ef1b9d77aae990bbba821':
Don't show menu/indicators in wide-angle mode.
Angus Kong [Fri, 13 Sep 2013 21:55:31 +0000 (14:55 -0700)]
Don't show menu/indicators in wide-angle mode.
bug:
10674078
Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
Sascha Haeberling [Fri, 13 Sep 2013 21:28:15 +0000 (14:28 -0700)]
am
7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
* commit '
7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25':
Fix potential deadlock while rendering the preview.
Sascha Haeberling [Fri, 13 Sep 2013 21:26:37 +0000 (21:26 +0000)]
Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
Angus Kong [Fri, 13 Sep 2013 21:19:08 +0000 (14:19 -0700)]
am
a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
* commit '
a29e0bfcafa292adba7fff2daf0f754627e47137':
Always leave full-screen when swip from camera.
Angus Kong [Fri, 13 Sep 2013 21:16:34 +0000 (21:16 +0000)]
Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 13 Sep 2013 20:42:29 +0000 (13:42 -0700)]
Fix potential deadlock while rendering the preview.
Bug:
10748013
Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
Angus Kong [Fri, 13 Sep 2013 17:13:47 +0000 (10:13 -0700)]
am
539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
* commit '
539b9eec067c012d17f482975cf8053e04a11759':
Avoid flickering after swipe to delete.
Angus Kong [Fri, 13 Sep 2013 17:11:57 +0000 (17:11 +0000)]
Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
ztenghui [Fri, 13 Sep 2013 16:33:35 +0000 (09:33 -0700)]
am
a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
* commit '
a7035394b246b238c19230c92672dbda2ab1f88c':
Fix crash due to a hole in setDataSource.
ztenghui [Fri, 13 Sep 2013 16:31:08 +0000 (16:31 +0000)]
Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 13 Sep 2013 01:39:06 +0000 (18:39 -0700)]
am
1e689c25: Fix DeadLock in TinyPlanet.
* commit '
1e689c254960f0ced0d19d91067cc5ef703dec64':
Fix DeadLock in TinyPlanet.
Sascha Haeberling [Fri, 13 Sep 2013 01:34:25 +0000 (18:34 -0700)]
Fix DeadLock in TinyPlanet.
Bug:
10393598
Now that we acquire the lock inside doInBackground, we need to make
sure to run the AsyncTasks in parallel.
Change-Id: If253f375d56c352c30076f00cf923dfa521f2db4
Angus Kong [Thu, 12 Sep 2013 21:49:48 +0000 (14:49 -0700)]
Avoid flickering after swipe to delete.
bug:
10624385
Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46
Sascha Haeberling [Fri, 13 Sep 2013 01:13:53 +0000 (18:13 -0700)]
am
a5a08d76: Bring back tiny planet to the Camera filmstrip
* commit '
a5a08d7642a1fdf961b057cc90e76c4c93103c15':
Bring back tiny planet to the Camera filmstrip
Sascha Haeberling [Thu, 12 Sep 2013 03:30:52 +0000 (20:30 -0700)]
Bring back tiny planet to the Camera filmstrip
Bug:
10393598
The native code and XmpUtil are mostly 1:1 copies from Gallery2.
The UI is new and should work on all form factors.
Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
Doris Liu [Fri, 13 Sep 2013 00:43:33 +0000 (17:43 -0700)]
am
742cd5b1: Keep undo bar around until there is user interaciton
* commit '
742cd5b18e1899bee1d430b61891238c0f3502b6':
Keep undo bar around until there is user interaciton
ztenghui [Thu, 12 Sep 2013 23:20:19 +0000 (16:20 -0700)]
Fix crash due to a hole in setDataSource.
setDataSource() somehow throws a RuntimeException instead of
IllegalArgumentException when seeing unsupported video file.
bug:
10732664
Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
Doris Liu [Thu, 12 Sep 2013 23:17:43 +0000 (16:17 -0700)]
Keep undo bar around until there is user interaciton
Bug:
10678578
Bug:
10674009
Also removed the use of withEndAction() call because it was
introduced in API 16, whereas we need to be compatible with
API 14+
Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
Angus Kong [Thu, 12 Sep 2013 00:48:48 +0000 (17:48 -0700)]
Always leave full-screen when swip from camera.
bug:
10714779
Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
ztenghui [Thu, 12 Sep 2013 22:18:40 +0000 (15:18 -0700)]
am
a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad
* commit '
a29a0ad0fa7667177025a26d3043cb601ae17a6c':
When current data is preview, don't show the action bar.
ztenghui [Thu, 12 Sep 2013 22:16:39 +0000 (22:16 +0000)]
Merge "When current data is preview, don't show the action bar." into gb-ub-photos-carlsbad
ztenghui [Thu, 12 Sep 2013 21:56:56 +0000 (14:56 -0700)]
When current data is preview, don't show the action bar.
bug:
10678458
Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
Baligh Uddin [Thu, 12 Sep 2013 16:14:58 +0000 (09:14 -0700)]
am
d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
d1b0801a2e7f80c5ac047dded1edd0d3806f1e86':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Sep 2013 03:16:50 +0000 (03:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 12 Sep 2013 03:16:38 +0000 (03:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Doris Liu [Thu, 12 Sep 2013 01:00:58 +0000 (18:00 -0700)]
am
36e56fba: Show captured image rather than frozen preview for capture intent
* commit '
36e56fba281292255a01ee00b4bee067fa09ab59':
Show captured image rather than frozen preview for capture intent
Doris Liu [Thu, 12 Sep 2013 00:38:08 +0000 (17:38 -0700)]
Show captured image rather than frozen preview for capture intent
Bug:
10570887
Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
ztenghui [Thu, 12 Sep 2013 00:27:42 +0000 (17:27 -0700)]
am
7b265a6b: Fix the flash mode transition in video mode
* commit '
7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e':
Fix the flash mode transition in video mode
ztenghui [Mon, 9 Sep 2013 21:58:44 +0000 (14:58 -0700)]
Fix the flash mode transition in video mode
onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.
bug:
10610967
Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
Baligh Uddin [Wed, 11 Sep 2013 23:09:51 +0000 (16:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69256509cf492a69765c6b9896aa2751aa114619
Auto-generated-cl: translation import
Baligh Uddin [Wed, 11 Sep 2013 23:08:38 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3a2de300eaa51a628613b653410bc6582545c83
Auto-generated-cl: translation import
Angus Kong [Tue, 10 Sep 2013 23:56:38 +0000 (16:56 -0700)]
am
20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
* commit '
20703f72e087a01e6a589c2875819cf817581a51':
Flinging back should stop at the first photo first.
Angus Kong [Tue, 10 Sep 2013 23:53:24 +0000 (23:53 +0000)]
Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
Doris Liu [Tue, 10 Sep 2013 23:48:32 +0000 (16:48 -0700)]
am
e1d5ba4f: Hide zoom view when going to full screen
* commit '
e1d5ba4fc5470043e8645984e3018b712f5dfcff':
Hide zoom view when going to full screen
Angus Kong [Tue, 10 Sep 2013 22:42:46 +0000 (15:42 -0700)]
Flinging back should stop at the first photo first.
bug:
10634016
Change-Id: I44e715268b913902a444c977c136d1e0381b3833
Doris Liu [Tue, 10 Sep 2013 19:44:20 +0000 (12:44 -0700)]
Hide zoom view when going to full screen
Bug:
10654903
Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
Baligh Uddin [Tue, 10 Sep 2013 15:06:44 +0000 (15:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 10 Sep 2013 14:51:04 +0000 (07:51 -0700)]
am
44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
44c028746ab84c9f12e4f4db14aeda87c51d9835':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 10 Sep 2013 14:49:26 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Angus Kong [Tue, 10 Sep 2013 05:15:57 +0000 (22:15 -0700)]
am
6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
* commit '
6aae9177ac432df82971facab214b365e92b4a04':
Fix images being off-center in filmstrip.
Angus Kong [Tue, 10 Sep 2013 05:14:02 +0000 (05:14 +0000)]
Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
Angus Kong [Tue, 10 Sep 2013 00:15:01 +0000 (17:15 -0700)]
Fix images being off-center in filmstrip.
bug:
10609827
bug:
10650966
Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
Doris Liu [Tue, 10 Sep 2013 01:25:18 +0000 (18:25 -0700)]
am
e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
* commit '
e074fcbdb7d7bb20dde8173b969cbbafb53b92a9':
Hide zoom view when back is pressed
Doris Liu [Tue, 10 Sep 2013 01:24:25 +0000 (01:24 +0000)]
Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 10 Sep 2013 01:10:11 +0000 (18:10 -0700)]
am
f8b877c2: Update indicators at the right time to show the correct state.
* commit '
f8b877c2dd4fed2c962c51d619e2548923888525':
Update indicators at the right time to show the correct state.
Doris Liu [Tue, 10 Sep 2013 00:26:14 +0000 (17:26 -0700)]
Hide zoom view when back is pressed
Bug:
10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
Sascha Haeberling [Tue, 10 Sep 2013 00:32:48 +0000 (17:32 -0700)]
Update indicators at the right time to show the correct state.
Bug:
10620907
Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5
Sascha Haeberling [Mon, 9 Sep 2013 23:01:29 +0000 (16:01 -0700)]
am
b7639c64: Make sure we switch to preview view when resuming.
* commit '
b7639c641f2ed5d0c60546349c3aa9e90c026878':
Make sure we switch to preview view when resuming.
Sascha Haeberling [Mon, 9 Sep 2013 21:42:43 +0000 (14:42 -0700)]
Make sure we switch to preview view when resuming.
Bug:
10640328
But we need to make sure to not always switch in onResume, as
some activities stared from us (like playing a video or editing)
require the UI flow to stay in filmstrip.
Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
OSDN Git Service
