OSDN Git Service
Sascha Haeberling [Tue, 24 Sep 2013 20:39:59 +0000 (13:39 -0700)]
am
8c17960b: am
4863db01: Remove hideybars from Camera.
* commit '
8c17960b9714d0694530d914a103233bf793ff09':
Remove hideybars from Camera.
Sascha Haeberling [Tue, 24 Sep 2013 20:38:19 +0000 (13:38 -0700)]
am
4863db01: Remove hideybars from Camera.
* commit '
4863db01e3629a0a29c718b94445332ef74441e9':
Remove hideybars from Camera.
Sascha Haeberling [Tue, 24 Sep 2013 19:24:30 +0000 (12:24 -0700)]
Remove hideybars from Camera.
Bug:
10859173
Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
Doris Liu [Tue, 24 Sep 2013 19:01:20 +0000 (12:01 -0700)]
am
5c1c3b38: am
3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
* commit '
5c1c3b3814331302b02a0435e9ae9104f65e8ce4':
Fix SRI UX issues and improve UI efficiency
Doris Liu [Tue, 24 Sep 2013 18:59:37 +0000 (11:59 -0700)]
am
3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
* commit '
3180ac90af3e63ed7d9b487de5a35ba216d9463f':
Fix SRI UX issues and improve UI efficiency
Doris Liu [Tue, 24 Sep 2013 18:58:11 +0000 (18:58 +0000)]
Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
Doris Liu [Tue, 24 Sep 2013 03:43:20 +0000 (20:43 -0700)]
Fix SRI UX issues and improve UI efficiency
Bug:
10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
Angus Kong [Tue, 24 Sep 2013 16:34:12 +0000 (09:34 -0700)]
am
ee011517: am
c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
* commit '
ee0115170c47fde80ed410d753609b7ced377f5b':
Allow user to tap on lock icon from secure camera.
Angus Kong [Tue, 24 Sep 2013 16:31:40 +0000 (09:31 -0700)]
am
c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
* commit '
c74825b1666857cbfd0ad3750f0d509de8e86953':
Allow user to tap on lock icon from secure camera.
Angus Kong [Tue, 24 Sep 2013 16:28:50 +0000 (16:28 +0000)]
Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
Angus Kong [Sat, 21 Sep 2013 21:48:51 +0000 (14:48 -0700)]
Allow user to tap on lock icon from secure camera.
bug:
10857973
Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
Kevin Gabayan [Tue, 24 Sep 2013 02:00:52 +0000 (19:00 -0700)]
am
a014398a: am
d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
* commit '
a014398ae230523cc10696f4c4cdc0f9532cda11':
192x192 icon added to mipmap-xxxhdpi.
Sascha Haeberling [Tue, 24 Sep 2013 02:00:51 +0000 (19:00 -0700)]
am
2377df9a: am
8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
* commit '
2377df9a4e3fe0e6f036e9d885b72456c951fb80':
Localize the numbers in the time laps popup.
ztenghui [Tue, 24 Sep 2013 02:00:03 +0000 (19:00 -0700)]
am
f58ec27a: am
4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
* commit '
f58ec27a63538590fc6eaf87a38c69ca2ae05d2c':
Sort and select the preview fps range for still image.
Ruben Brunk [Tue, 24 Sep 2013 01:59:17 +0000 (18:59 -0700)]
am
a69f785c: am
283beaf6: Fix build: Don\'t build GCam for non-arm targets
* commit '
a69f785c11bd1efce8a94489e6c9ffe06146607d':
Fix build: Don't build GCam for non-arm targets
Kevin Gabayan [Tue, 24 Sep 2013 01:10:58 +0000 (18:10 -0700)]
am
d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
* commit '
d897d5c9048ba96d79b9893d0ebc7eb7e6b84260':
192x192 icon added to mipmap-xxxhdpi.
Kevin Gabayan [Tue, 24 Sep 2013 01:09:06 +0000 (01:09 +0000)]
Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 24 Sep 2013 00:40:37 +0000 (17:40 -0700)]
am
8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
* commit '
8fed926c9f1a3b205165a2f9aad05379c85ececd':
Localize the numbers in the time laps popup.
Sascha Haeberling [Tue, 24 Sep 2013 00:37:29 +0000 (00:37 +0000)]
Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 23 Sep 2013 23:06:24 +0000 (16:06 -0700)]
Localize the numbers in the time laps popup.
Bug:
10889796
Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073
ztenghui [Mon, 23 Sep 2013 21:31:41 +0000 (14:31 -0700)]
am
4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
* commit '
4c478ffe556bff91f9c7574384ab6d482c947627':
Sort and select the preview fps range for still image.
ztenghui [Mon, 23 Sep 2013 21:30:33 +0000 (21:30 +0000)]
Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
ztenghui [Mon, 23 Sep 2013 18:35:36 +0000 (11:35 -0700)]
Sort and select the preview fps range for still image.
bug:
10842868
Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
Ruben Brunk [Mon, 23 Sep 2013 18:34:26 +0000 (11:34 -0700)]
am
283beaf6: Fix build: Don\'t build GCam for non-arm targets
* commit '
283beaf677d0c3235fbb22bfd5cd8338459bed1b':
Fix build: Don't build GCam for non-arm targets
Ruben Brunk [Mon, 23 Sep 2013 17:59:38 +0000 (10:59 -0700)]
Fix build: Don't build GCam for non-arm targets
Bug:
10430748
Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
Angus Kong [Sat, 21 Sep 2013 02:49:34 +0000 (19:49 -0700)]
am
4d017ab2: am
b21215a1: Improve the animation to filmstrip.
* commit '
4d017ab2085d5ade791358a23fca33b974afb4e3':
Improve the animation to filmstrip.
Angus Kong [Sat, 21 Sep 2013 02:47:37 +0000 (19:47 -0700)]
am
b21215a1: Improve the animation to filmstrip.
* commit '
b21215a1a59812592380f31891becedbdec7468b':
Improve the animation to filmstrip.
Angus Kong [Sat, 21 Sep 2013 01:41:46 +0000 (18:41 -0700)]
Improve the animation to filmstrip.
1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.
bug:
10806298
bug:
10864100
Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
Kevin Gabayan [Sat, 21 Sep 2013 00:06:07 +0000 (17:06 -0700)]
192x192 icon added to mipmap-xxxhdpi.
Change-Id: I2531fc226c97f5a3948f9616dc40e269e792b29c
Doris Liu [Fri, 20 Sep 2013 18:28:18 +0000 (11:28 -0700)]
am
00258a68: am
aa874428: Hide action bar after a timeout
* commit '
00258a685922bccf36be7c4938e837ca5d72bcb7':
Hide action bar after a timeout
Doris Liu [Fri, 20 Sep 2013 18:24:34 +0000 (11:24 -0700)]
am
aa874428: Hide action bar after a timeout
* commit '
aa8744284864cda5570e8dfa4eccc2747cee52dc':
Hide action bar after a timeout
Doris Liu [Thu, 19 Sep 2013 02:43:12 +0000 (19:43 -0700)]
Hide action bar after a timeout
Also make sure:
1) Action bar does not go away when the menu is showing
2) Extend the timeout if user swipe to a new image when action bar is visible
3) Hide action bar immediately when double-tap-to-zoom starts
4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode)
Bug:
10750342
Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
Angus Kong [Fri, 20 Sep 2013 01:23:54 +0000 (18:23 -0700)]
am
cb736218: am
cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
* commit '
cb7362183f68428db80a778ec65685526624f4c9':
Refine Filmstrip gesture/position handling.
Angus Kong [Fri, 20 Sep 2013 01:20:40 +0000 (18:20 -0700)]
am
cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
* commit '
cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7':
Refine Filmstrip gesture/position handling.
Angus Kong [Fri, 20 Sep 2013 01:18:33 +0000 (01:18 +0000)]
Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
Angus Kong [Thu, 19 Sep 2013 06:56:01 +0000 (23:56 -0700)]
Refine Filmstrip gesture/position handling.
bug:
10749052
bug:
10802996
bug:
10711578
Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
Baligh Uddin [Thu, 19 Sep 2013 21:42:44 +0000 (14:42 -0700)]
am
1106268f: (-s ours) am
4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
1106268ffb0050b2d52a345b6827954a91f54bae':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:38:47 +0000 (14:38 -0700)]
am
3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3aac79f2a9b67458ff4754c0a37fb4f09e78bfbd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:38:02 +0000 (14:38 -0700)]
am
4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
4821c5418d44d936ca222bfe1fdc1ac367e129f8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:35:41 +0000 (21:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 19 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Ruben Brunk [Thu, 19 Sep 2013 19:37:47 +0000 (12:37 -0700)]
am
75ad0584: am
30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
* commit '
75ad0584a13438fa113e5a9e201c6fe1af4880af':
Fix drawable location.
Ruben Brunk [Thu, 19 Sep 2013 19:35:48 +0000 (12:35 -0700)]
am
30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
* commit '
30a21ea3356e87bdff0e072b840fa73215597326':
Fix drawable location.
Ruben Brunk [Thu, 19 Sep 2013 19:33:09 +0000 (19:33 +0000)]
Merge "Fix drawable location." into gb-ub-photos-carlsbad
nicolasroard [Thu, 19 Sep 2013 19:25:39 +0000 (12:25 -0700)]
am
27d4468f: am
19ab725a: Add crop activity
* commit '
27d4468f90dd478839d864376edd0d40201bd80e':
Add crop activity
Ruben Brunk [Thu, 19 Sep 2013 19:23:39 +0000 (12:23 -0700)]
Fix drawable location.
Bug:
10430748
- Drawable wasn't included when building from klp-dev.
Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974
nicolasroard [Thu, 19 Sep 2013 19:22:35 +0000 (12:22 -0700)]
am
19ab725a: Add crop activity
* commit '
19ab725a5e640a1a20b1a6def083e37d1d1c1e20':
Add crop activity
nicolasroard [Wed, 18 Sep 2013 23:54:05 +0000 (16:54 -0700)]
Add crop activity
bug:
10367125
Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
ztenghui [Thu, 19 Sep 2013 18:17:40 +0000 (11:17 -0700)]
am
9e7cb170: am
064d6000: Use contentObserver to refresh the data when dirty.
* commit '
9e7cb170dfbb9884e2f47e30a8a0e60bded318ad':
Use contentObserver to refresh the data when dirty.
ztenghui [Thu, 19 Sep 2013 18:16:14 +0000 (11:16 -0700)]
am
064d6000: Use contentObserver to refresh the data when dirty.
* commit '
064d6000933354f7bf344a41e0caa7052401c903':
Use contentObserver to refresh the data when dirty.
ztenghui [Thu, 5 Sep 2013 22:47:58 +0000 (15:47 -0700)]
Use contentObserver to refresh the data when dirty.
Handle another setDataSource exception.
Remove the old work around for refreshing after editing.
bug:
10390298
Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
Mangesh Ghiware [Thu, 19 Sep 2013 18:06:10 +0000 (11:06 -0700)]
am
7806200a: am
a5682ab0: Bring back NFC beam support to filmstrip
* commit '
7806200aa5235dc8514411107d1603acea12e6b7':
Bring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 18:03:46 +0000 (11:03 -0700)]
am
a5682ab0: Bring back NFC beam support to filmstrip
* commit '
a5682ab08e1d42fe272ec877929478b4adb769f5':
Bring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 16:24:23 +0000 (09:24 -0700)]
Bring back NFC beam support to filmstrip
Bug:
10805211
Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92
Baligh Uddin [Thu, 19 Sep 2013 10:32:46 +0000 (03:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14087e2afde009daca03e6005fab8043d36c7e0c
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Sep 2013 10:19:58 +0000 (03:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id078acbb97019f81cab8f877aa2939192b099e2f
Auto-generated-cl: translation import
Ruben Brunk [Thu, 19 Sep 2013 07:26:08 +0000 (00:26 -0700)]
am
e784eb4b: am
0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
* commit '
e784eb4b4e14a38c29f6c7af127ac38b73575413':
Adding gcam module to Camera2 app.
Ruben Brunk [Thu, 19 Sep 2013 07:23:11 +0000 (00:23 -0700)]
am
0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
* commit '
0374e092eb6fdb33cb6edcb7724601928283dd47':
Adding gcam module to Camera2 app.
Ruben Brunk [Thu, 19 Sep 2013 07:18:26 +0000 (07:18 +0000)]
Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
Ruben Brunk [Fri, 6 Sep 2013 18:56:32 +0000 (11:56 -0700)]
Adding gcam module to Camera2 app.
Bug:
10430748
Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
Mangesh Ghiware [Thu, 19 Sep 2013 04:31:11 +0000 (21:31 -0700)]
am
247fa7b9: am
9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
* commit '
247fa7b988935e73f41805bb640344ebf2614b25':
Make Up button in filmstrip go to Gallery.
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:35:44 +0000 (19:35 -0700)]
am
485f95e4: am
b2d70d5b: Fix various message issues
* commit '
485f95e4f48ef76587e2b9d5ecf99063a104c6f7':
Fix various message issues
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:08:22 +0000 (15:08 -0700)]
am
f0ec22b7: am
638e6f06: Clean up ApiHelper and remove unused code paths.
* commit '
f0ec22b78a94e34f1136e87f1cff0d348aea9882':
Clean up ApiHelper and remove unused code paths.
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:44:31 +0000 (10:44 -0700)]
am
18dcbd5d: am
4ed20592: Adding Hideybar support for K and up.
* commit '
18dcbd5d7fbe683b3891a05b5ba90babf359a45f':
Adding Hideybar support for K and up.
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:10:17 +0000 (17:10 -0700)]
am
eb0c0d3c: am
e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
* commit '
eb0c0d3cc706a7f63177a55a50ea057e7ecf0232':
Delete the captured video if cancel in review.
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:08:50 +0000 (16:08 -0700)]
am
c008cf33: am
15125661: Fall back to Photo module if stores index is illegal.
* commit '
c008cf3380e2b30cede4ee24e0463fb4f9b12d44':
Fall back to Photo module if stores index is illegal.
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 23:02:25 +0000 (16:02 -0700)]
am
bfb14b9c: am
483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad
* commit '
bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f':
Don't crash the app if camera is not available.
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:55:31 +0000 (15:55 -0700)]
am
e7c77157: am
4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
* commit '
e7c77157c61fb0e09b5a5eec0b977a3b75f7a6eb':
Adding a simple done handler interface.
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:22:36 +0000 (15:22 -0700)]
am
1b3ffde9: am
9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
* commit '
1b3ffde934ceb9247e319d432d61a81dc6a28ecd':
Fix camera controls rotation for secure camera
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:57:40 +0000 (14:57 -0700)]
am
7315a189: am
c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
* commit '
7315a189fc166735ae46261e99e9da81baaa7936':
Show dialog when camera device is not connected.
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:59:40 +0000 (13:59 -0700)]
am
a4c33574: am
828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
* commit '
a4c33574b2bd70a1a04b0aac58ee97c3d022fc5e':
Use a new Intent to work around issues in framework
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:25:55 +0000 (21:25 -0700)]
am
d313b92c: (-s ours) am
53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
d313b92c73257a7427945acdf66a861afb188b0d':
Import translations. DO NOT MERGE
OSDN Git Service
