OSDN Git Service
nicolasroard [Thu, 14 Feb 2013 01:30:09 +0000 (17:30 -0800)]
am
31ebfb40: Merge "Fix sync representations" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
31ebfb400aa73c51980ef78e4c26fcc1a39fdd4d':
Fix sync representations
nicolasroard [Thu, 14 Feb 2013 01:28:53 +0000 (01:28 +0000)]
Merge "Fix sync representations" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 23:51:25 +0000 (15:51 -0800)]
Fix sync representations
Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
Ruben Brunk [Wed, 13 Feb 2013 23:25:13 +0000 (15:25 -0800)]
am
92decf25: Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit '
92decf254d7feb277d68fb94a4e4f90ba2c2dbeb':
Fix proguard and makefile targets for tests.
Ruben Brunk [Wed, 13 Feb 2013 23:24:17 +0000 (23:24 +0000)]
Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
John Hoford [Wed, 13 Feb 2013 22:32:38 +0000 (14:32 -0800)]
am
ecdda817: fix draw to support rotation/crop
# Via John Hoford
* commit '
ecdda817f112286ac6bab2ac4bf508e7dd8609ac':
fix draw to support rotation/crop
Ruben Brunk [Wed, 13 Feb 2013 21:36:21 +0000 (13:36 -0800)]
Fix proguard and makefile targets for tests.
Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861
John Hoford [Wed, 13 Feb 2013 19:40:52 +0000 (11:40 -0800)]
fix draw to support rotation/crop
Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
Bobby Georgescu [Wed, 13 Feb 2013 19:47:55 +0000 (11:47 -0800)]
am
add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '
add77dfcee665d309e5eb20e344e1d10e7c4070e':
Importer: Full-screen viewing, UI refinement, refactoring
Bobby Georgescu [Wed, 13 Feb 2013 19:46:39 +0000 (19:46 +0000)]
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:32:44 +0000 (11:32 -0800)]
am
cd627a70: Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
cd627a7010f6907204f7bcb5d13111ba02ee30fe':
Pass the ImagePreset to ImageFilter
nicolasroard [Wed, 13 Feb 2013 19:31:16 +0000 (19:31 +0000)]
Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:23:56 +0000 (11:23 -0800)]
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
Baligh Uddin [Wed, 13 Feb 2013 19:21:23 +0000 (11:21 -0800)]
am
e956f5d5: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '
e956f5d5e84c8ea3b75bba218bc173f03c6a1739':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Feb 2013 17:56:27 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I83bb60752d8f060ab32413ee3a670228db5a8055
Auto-generated-cl: translation import
Baligh Uddin [Wed, 13 Feb 2013 17:56:05 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I73eaf3450a743ae918e3391efcceb4acd355b85d
Auto-generated-cl: translation import
nicolasroard [Wed, 13 Feb 2013 03:41:08 +0000 (19:41 -0800)]
am
f7cfa85f: Fix curves slowness
# Via nicolasroard
* commit '
f7cfa85f7dc2bb29affefff9374f3a4029b8a057':
Fix curves slowness
nicolasroard [Wed, 13 Feb 2013 03:40:08 +0000 (19:40 -0800)]
Fix curves slowness
Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
Bobby Georgescu [Fri, 1 Feb 2013 20:57:14 +0000 (12:57 -0800)]
Importer: Full-screen viewing, UI refinement, refactoring
Bug:
7990333
Bug:
8151814
Bug:
8037411
This CL adds or changes the following things:
- Full-screen image viewing and UI for switching modes
- Moved general functionality from MtpThumbnailTileView
to MtpImageView to allow for reuse in full-screen image
use-case
- MtpBitmapCache moved from ui to data package
- Orientation now respected when set in image metadata
- Miscellaneous UI consistency issues fixed
- Miscellaneous instability issues fixed
Change-Id: I5f188b763617b693e32fedc03273d711d604922a
nicolasroard [Wed, 13 Feb 2013 01:14:29 +0000 (17:14 -0800)]
am
c8aa8ac1: Clean up red eye correction
# Via nicolasroard
* commit '
c8aa8ac19118f1c1be1bda63d4d72589aed49da4':
Clean up red eye correction
nicolasroard [Wed, 13 Feb 2013 00:32:43 +0000 (16:32 -0800)]
Clean up red eye correction
Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
John Hoford [Wed, 13 Feb 2013 01:07:19 +0000 (17:07 -0800)]
am
4b1e6fbd: fix ranges for various filters
# Via John Hoford
* commit '
4b1e6fbdf437b7a25fb3eb18a2ed43c9ab4eccc8':
fix ranges for various filters
John Hoford [Wed, 13 Feb 2013 00:59:13 +0000 (16:59 -0800)]
fix ranges for various filters
Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
Angus Kong [Wed, 13 Feb 2013 00:59:09 +0000 (16:59 -0800)]
am
a241341d: Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Angus Kong (1)
* commit '
a241341de88c982bc619d25f0455561075d177e8':
Wait for the previous MosaicPreviewRenderer to end
Angus Kong [Wed, 13 Feb 2013 00:58:18 +0000 (00:58 +0000)]
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:12:51 +0000 (16:12 -0800)]
am
4d25bee7: Merge "Turn back on the state panel" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
4d25bee70415aabd3fa8439a75d02e14323e187d':
Turn back on the state panel
John Hoford [Wed, 13 Feb 2013 00:09:44 +0000 (16:09 -0800)]
am
ac75eb40: Merge "fix the draw clear bug" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '
ac75eb409e097ab01622427eabcbb2a3fd2f2c9c':
fix the draw clear bug
nicolasroard [Wed, 13 Feb 2013 00:09:31 +0000 (00:09 +0000)]
Merge "Turn back on the state panel" into gb-ub-photos-bryce
John Hoford [Wed, 13 Feb 2013 00:07:43 +0000 (00:07 +0000)]
Merge "fix the draw clear bug" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:06:15 +0000 (16:06 -0800)]
Turn back on the state panel
Change-Id: I22706078d4026ce4e24917c484a30a56de431983
Tenghui Zhu [Tue, 12 Feb 2013 23:04:07 +0000 (15:04 -0800)]
am
882d3acc: (-s ours) Merge "DO NOT MERGE: Don\'t call requestLayout from onLayout" into gb-ub-photos-bryce
# By Marco Nelissen
# Via Android (Google) Code Review (1) and ztenghui (1)
* commit '
882d3acccc98ec4a1bbe01d19a66d3e3a564a49b':
DO NOT MERGE: Don't call requestLayout from onLayout
Tenghui Zhu [Tue, 12 Feb 2013 22:59:54 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
Marco Nelissen [Wed, 6 Feb 2013 23:35:52 +0000 (15:35 -0800)]
DO NOT MERGE: Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change
209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Note: This has been checked into master, this is just cherry picking into
Bryce branch.
Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
nicolasroard [Tue, 12 Feb 2013 21:46:43 +0000 (13:46 -0800)]
am
a0d689f1: Add null check on the source URI
# Via nicolasroard
* commit '
a0d689f180db4c995d5be39a326b1fb5b21ff5c0':
Add null check on the source URI
John Hoford [Tue, 12 Feb 2013 21:42:19 +0000 (13:42 -0800)]
fix the draw clear bug
Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
nicolasroard [Tue, 12 Feb 2013 21:41:30 +0000 (13:41 -0800)]
Add null check on the source URI
bug:
8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
nicolasroard [Tue, 12 Feb 2013 21:38:32 +0000 (13:38 -0800)]
am
80149cd6: Merge "Limit preview size" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
80149cd62b58b32d5247eb76a6f9e1f3427549d6':
Limit preview size
nicolasroard [Tue, 12 Feb 2013 21:37:18 +0000 (21:37 +0000)]
Merge "Limit preview size" into gb-ub-photos-bryce
Baligh Uddin [Tue, 12 Feb 2013 21:35:24 +0000 (13:35 -0800)]
am
6ed18cb4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
6ed18cb44f09b423b184f836a779f088ea98bd66':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 12 Feb 2013 21:35:23 +0000 (13:35 -0800)]
am
5f8bb818: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
5f8bb818b06a6ddf6232f4da8e3819232562e368':
Import translations. DO NOT MERGE
nicolasroard [Tue, 12 Feb 2013 21:31:15 +0000 (13:31 -0800)]
Limit preview size
Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
Baligh Uddin [Tue, 12 Feb 2013 21:34:46 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 12 Feb 2013 21:33:55 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 12 Feb 2013 21:33:26 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 12 Feb 2013 21:33:08 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 20:42:58 +0000 (12:42 -0800)]
am
f6076047: Refactor FiltersManager
# Via nicolasroard
* commit '
f60760478ec7c78446be0e0c6bc5502d1557974c':
Refactor FiltersManager
Baligh Uddin [Tue, 12 Feb 2013 20:42:43 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c6290e33ba9aa3d2d099c5e0c1c6e286af6cd3f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Feb 2013 20:42:24 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4494f5cb2e1ed520a15a3a8052713559ee48e362
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Feb 2013 20:42:05 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8f68b37684a24695e146f8cd68fc7d2e1716b737
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Feb 2013 20:41:38 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie08f4a95d5662bfb313a851c12a2643997365eeb
Auto-generated-cl: translation import
nicolasroard [Tue, 12 Feb 2013 20:19:19 +0000 (12:19 -0800)]
Refactor FiltersManager
Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
John Hoford [Tue, 12 Feb 2013 20:15:44 +0000 (12:15 -0800)]
am
99baf613: refactor quality to be int
# Via John Hoford
* commit '
99baf61387ab1ef15bb9db5fa3b2b55591e87059':
refactor quality to be int
John Hoford [Tue, 12 Feb 2013 19:55:50 +0000 (11:55 -0800)]
refactor quality to be int
Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
nicolasroard [Tue, 12 Feb 2013 18:52:57 +0000 (10:52 -0800)]
am
b01a3282: Add reset bitmap for RS filters
# Via nicolasroard
* commit '
b01a32825018cfb79f2c965c1c3e3e25b5131229':
Add reset bitmap for RS filters
nicolasroard [Tue, 12 Feb 2013 18:47:34 +0000 (10:47 -0800)]
Add reset bitmap for RS filters
Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
nicolasroard [Tue, 12 Feb 2013 18:30:38 +0000 (10:30 -0800)]
am
4a3c526c: Update thumbnails when the geometry changes
# Via nicolasroard
* commit '
4a3c526cd15979fbbd46c51dbf508747914f683f':
Update thumbnails when the geometry changes
nicolasroard [Tue, 12 Feb 2013 18:26:29 +0000 (10:26 -0800)]
Update thumbnails when the geometry changes
Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
Angus Kong [Tue, 12 Feb 2013 00:28:04 +0000 (16:28 -0800)]
Wait for the previous MosaicPreviewRenderer to end
When changing orientations very fast, there might be 2 MosaicPreviewRenderer
instances accessing the SRI native library at the same time. The library is not
designed so.
bug:
8151753
Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
nicolasroard [Tue, 12 Feb 2013 17:29:17 +0000 (09:29 -0800)]
am
263eb844: Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
263eb84489462e5792406710ddb1a9772135b4e9':
Generate thumbnails asynchronously
nicolasroard [Tue, 12 Feb 2013 17:27:44 +0000 (17:27 +0000)]
Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
John Hoford [Tue, 12 Feb 2013 17:21:07 +0000 (09:21 -0800)]
am
c364d9f2: remove animations if before Jelly Bean
# Via John Hoford
* commit '
c364d9f2de28f79c636fcb145c355da52f52b7ad':
remove animations if before Jelly Bean
nicolasroard [Tue, 12 Feb 2013 17:13:15 +0000 (09:13 -0800)]
Generate thumbnails asynchronously
Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
John Hoford [Tue, 12 Feb 2013 17:05:39 +0000 (09:05 -0800)]
remove animations if before Jelly Bean
Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
John Hoford [Tue, 12 Feb 2013 15:38:25 +0000 (07:38 -0800)]
am
e2c4d033: fixes the draw and clean up the UI
# Via John Hoford
* commit '
e2c4d033de164d886af9d242d8672570730580d6':
fixes the draw and clean up the UI
John Hoford [Tue, 12 Feb 2013 04:55:45 +0000 (20:55 -0800)]
fixes the draw and clean up the UI
Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
nicolasroard [Tue, 12 Feb 2013 02:25:50 +0000 (18:25 -0800)]
am
4b2933f8: Merge "Adding support for ICS" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
4b2933f87acaebc29556cbab244b56840a90425d':
Adding support for ICS
nicolasroard [Tue, 12 Feb 2013 02:24:34 +0000 (02:24 +0000)]
Merge "Adding support for ICS" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 02:15:15 +0000 (18:15 -0800)]
Adding support for ICS
Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
John Hoford [Tue, 12 Feb 2013 01:49:27 +0000 (17:49 -0800)]
am
431f45e1: Merge "fix red eye to use the new system" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '
431f45e14bbfabdd43ba70de47451cc07ab4c949':
fix red eye to use the new system
John Hoford [Tue, 12 Feb 2013 01:47:42 +0000 (01:47 +0000)]
Merge "fix red eye to use the new system" into gb-ub-photos-bryce
Stephen Hines [Tue, 12 Feb 2013 01:29:12 +0000 (17:29 -0800)]
am
46dcad6e: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '
46dcad6e7c0178f58696feb25cdbfc4ce4cbf235':
Switch to GalleryGoogle as default provider for RS files (from Gallery2).
Stephen Hines [Tue, 12 Feb 2013 01:25:31 +0000 (01:25 +0000)]
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce
John Hoford [Sat, 9 Feb 2013 01:30:53 +0000 (17:30 -0800)]
fix red eye to use the new system
Change-Id: If79106dc3144cce374afd410f5f859692e564b83
Tim Murray [Mon, 11 Feb 2013 23:54:28 +0000 (15:54 -0800)]
am
32ee1acb: Merge "Only create one RS context." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Tim Murray (1)
* commit '
32ee1acbd9f9ab0db382f0947a1ca1f3dfe52059':
Only create one RS context.
nicolasroard [Mon, 11 Feb 2013 23:54:27 +0000 (15:54 -0800)]
am
31e52aae: Move useFilterRepresentation to PanelController
# Via nicolasroard
* commit '
31e52aae5eeefd8383cb238e7dd3047e883968ef':
Move useFilterRepresentation to PanelController
Tim Murray [Mon, 11 Feb 2013 23:49:57 +0000 (23:49 +0000)]
Merge "Only create one RS context." into gb-ub-photos-bryce
nicolasroard [Mon, 11 Feb 2013 23:44:04 +0000 (15:44 -0800)]
Move useFilterRepresentation to PanelController
Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
Tim Murray [Mon, 11 Feb 2013 23:29:20 +0000 (15:29 -0800)]
Only create one RS context.
Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
nicolasroard [Mon, 11 Feb 2013 22:31:35 +0000 (14:31 -0800)]
am
2d5cc151: Merge "Cleaning filters" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
2d5cc15139b6509d0328411fbed2f000b8c6343a':
Cleaning filters
nicolasroard [Mon, 11 Feb 2013 22:30:48 +0000 (22:30 +0000)]
Merge "Cleaning filters" into gb-ub-photos-bryce
nicolasroard [Mon, 11 Feb 2013 17:55:33 +0000 (09:55 -0800)]
Cleaning filters
Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
Doris Liu [Mon, 11 Feb 2013 21:41:16 +0000 (13:41 -0800)]
am
61b332d8: Merge "Lock focus during countdown" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '
61b332d8fbed8772d01a08db82d0dc388b649013':
Lock focus during countdown
Doris Liu [Mon, 11 Feb 2013 21:39:41 +0000 (21:39 +0000)]
Merge "Lock focus during countdown" into gb-ub-photos-bryce
Doris Liu [Mon, 11 Feb 2013 21:35:06 +0000 (13:35 -0800)]
am
401756be: Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '
401756be3f741a0ac9255f103b07ccc645ff2252':
Fix camera setting icons appearing in wrong place
Doris Liu [Mon, 11 Feb 2013 21:33:29 +0000 (21:33 +0000)]
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
Stephen Hines [Fri, 8 Feb 2013 02:41:27 +0000 (18:41 -0800)]
Switch to GalleryGoogle as default provider for RS files (from Gallery2).
Bug:
8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
nicolasroard [Sat, 9 Feb 2013 02:19:24 +0000 (18:19 -0800)]
am
cef6ad5d: Move filter type to representations
# Via nicolasroard
* commit '
cef6ad5d4a60a6e2960f7f72de624d5e60b3908a':
Move filter type to representations
nicolasroard [Sat, 9 Feb 2013 02:13:24 +0000 (18:13 -0800)]
Move filter type to representations
Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
nicolasroard [Sat, 9 Feb 2013 01:51:56 +0000 (17:51 -0800)]
am
50ffa175: Fix crash when reset
# Via nicolasroard
* commit '
50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc':
Fix crash when reset
nicolasroard [Sat, 9 Feb 2013 01:48:54 +0000 (17:48 -0800)]
Fix crash when reset
Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
nicolasroard [Sat, 9 Feb 2013 01:05:26 +0000 (17:05 -0800)]
am
4aabe9d1: Merge "Fix loading screen" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
4aabe9d1793ba797324cd7507f8d239d06fb547d':
Fix loading screen
nicolasroard [Sat, 9 Feb 2013 01:03:37 +0000 (01:03 +0000)]
Merge "Fix loading screen" into gb-ub-photos-bryce
Doris Liu [Sat, 9 Feb 2013 01:00:46 +0000 (17:00 -0800)]
Fix camera setting icons appearing in wrong place
Bug:
7956904
Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
nicolasroard [Sat, 9 Feb 2013 01:00:42 +0000 (17:00 -0800)]
Fix loading screen
Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
John Hoford [Sat, 9 Feb 2013 00:21:51 +0000 (16:21 -0800)]
am
44a499a6: Fix tiny planet to work with the new framework
# Via John Hoford
* commit '
44a499a64158cd5a12f8e44655f82b68c33bf3b2':
Fix tiny planet to work with the new framework
John Hoford [Fri, 8 Feb 2013 01:39:06 +0000 (17:39 -0800)]
Fix tiny planet to work with the new framework
Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
John Hoford [Fri, 8 Feb 2013 22:59:54 +0000 (14:59 -0800)]
am
8029c856: remove slider from FX and Border UI
# Via John Hoford
* commit '
8029c8567a162eb66fe54255bdeae264d594278d':
remove slider from FX and Border UI
nicolasroard [Fri, 8 Feb 2013 22:54:44 +0000 (14:54 -0800)]
am
6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
6d088c527485fb098833f8868a93bacd7d372443':
Fix leaks / init
John Hoford [Fri, 8 Feb 2013 22:37:35 +0000 (14:37 -0800)]
remove slider from FX and Border UI
Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
nicolasroard [Fri, 8 Feb 2013 22:52:55 +0000 (22:52 +0000)]
Merge "Fix leaks / init" into gb-ub-photos-bryce
OSDN Git Service
